fix for http/tcp monitor produces inconsistent result after apply (#801)

* fix: synthetics http monitor creations produced inconsistent result after apply for #800 fix for the fileds: http.locations, http.proxy_url, http.ssl_supported_protocols, http.ssl_verification_mode, tcp.proxy_url, tcp.ssl_supported_protocols, tcp.ssl_verification_mode * make lint happy * update change log * cr comments - reuse utls
elastic · Sep 30, 2024 · 26c124b · 26c124b
1 parent 534352e
commit 26c124b
Show file tree

Hide file tree

Showing 7 changed files with 184 additions and 129 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 - Fix handling of `sys_monitoring` in `elasticstack_fleet_agent_policy` ([#792](https://github.com/elastic/terraform-provider-elasticstack/pull/792))
 - Migrate `elasticstack_fleet_agent_policy`, `elasticstack_fleet_integration` (both), and `elasticstack_fleet_server_host` to terraform-plugin-framework ([#785](https://github.com/elastic/terraform-provider-elasticstack/pull/785))
+- Fix for synthetics http/tcp monitor produces inconsistent result after apply ([#801](https://github.com/elastic/terraform-provider-elasticstack/pull/801))
 
 ## [0.11.7] - 2024-09-20
 

diff --git a/internal/kibana/synthetics/acc_test.go b/internal/kibana/synthetics/acc_test.go
@@ -37,12 +37,9 @@ resource "elasticstack_kibana_synthetics_monitor" "%s" {
 	timeout = 30
 	http = {
 		url = "http://localhost:5601"
-		ssl_verification_mode = "full"
-		ssl_supported_protocols = ["TLSv1.0", "TLSv1.1", "TLSv1.2"]
 		mode = "any"
 		ipv4 = true
 		ipv6 = false
-		proxy_url = "http://localhost:8080"
 	}
 }
 `
@@ -128,9 +125,6 @@ resource "elasticstack_kibana_synthetics_monitor" "%s" {
 	timeout = 30
 	tcp = {
 		host = "http://localhost:5601"
-		ssl_verification_mode = "full"
-		ssl_supported_protocols = ["TLSv1.0", "TLSv1.1", "TLSv1.2"]
-		proxy_url = "http://localhost:8080"
 		proxy_use_local_resolver = true
 	}
 }
@@ -302,14 +296,14 @@ func TestSyntheticMonitorHTTPResource(t *testing.T) {
 					resource.TestCheckResourceAttr(httpMonitorId, "http.url", "http://localhost:5601"),
 					resource.TestCheckResourceAttr(httpMonitorId, "http.ssl_verification_mode", "full"),
 					resource.TestCheckResourceAttr(httpMonitorId, "http.ssl_supported_protocols.#", "3"),
-					resource.TestCheckResourceAttr(httpMonitorId, "http.ssl_supported_protocols.0", "TLSv1.0"),
-					resource.TestCheckResourceAttr(httpMonitorId, "http.ssl_supported_protocols.1", "TLSv1.1"),
-					resource.TestCheckResourceAttr(httpMonitorId, "http.ssl_supported_protocols.2", "TLSv1.2"),
+					resource.TestCheckResourceAttr(httpMonitorId, "http.ssl_supported_protocols.0", "TLSv1.1"),
+					resource.TestCheckResourceAttr(httpMonitorId, "http.ssl_supported_protocols.1", "TLSv1.2"),
+					resource.TestCheckResourceAttr(httpMonitorId, "http.ssl_supported_protocols.2", "TLSv1.3"),
 					resource.TestCheckResourceAttr(httpMonitorId, "http.max_redirects", "0"),
 					resource.TestCheckResourceAttr(httpMonitorId, "http.mode", "any"),
 					resource.TestCheckResourceAttr(httpMonitorId, "http.ipv4", "true"),
 					resource.TestCheckResourceAttr(httpMonitorId, "http.ipv6", "false"),
-					resource.TestCheckResourceAttr(httpMonitorId, "http.proxy_url", "http://localhost:8080"),
+					resource.TestCheckResourceAttr(httpMonitorId, "http.proxy_url", ""),
 				),
 			},
 			// ImportState testing
@@ -402,10 +396,10 @@ func TestSyntheticMonitorTCPResource(t *testing.T) {
 					resource.TestCheckResourceAttr(tcpMonitorId, "tcp.host", "http://localhost:5601"),
 					resource.TestCheckResourceAttr(tcpMonitorId, "tcp.ssl_verification_mode", "full"),
 					resource.TestCheckResourceAttr(tcpMonitorId, "tcp.ssl_supported_protocols.#", "3"),
-					resource.TestCheckResourceAttr(tcpMonitorId, "tcp.ssl_supported_protocols.0", "TLSv1.0"),
-					resource.TestCheckResourceAttr(tcpMonitorId, "tcp.ssl_supported_protocols.1", "TLSv1.1"),
-					resource.TestCheckResourceAttr(tcpMonitorId, "tcp.ssl_supported_protocols.2", "TLSv1.2"),
-					resource.TestCheckResourceAttr(tcpMonitorId, "tcp.proxy_url", "http://localhost:8080"),
+					resource.TestCheckResourceAttr(tcpMonitorId, "tcp.ssl_supported_protocols.0", "TLSv1.1"),
+					resource.TestCheckResourceAttr(tcpMonitorId, "tcp.ssl_supported_protocols.1", "TLSv1.2"),
+					resource.TestCheckResourceAttr(tcpMonitorId, "tcp.ssl_supported_protocols.2", "TLSv1.3"),
+					resource.TestCheckResourceAttr(tcpMonitorId, "tcp.proxy_url", ""),
 					resource.TestCheckResourceAttr(tcpMonitorId, "tcp.proxy_use_local_resolver", "true"),
 				),
 			},

diff --git a/internal/kibana/synthetics/create.go b/internal/kibana/synthetics/create.go
@@ -20,7 +20,7 @@ func (r *Resource) Create(ctx context.Context, request resource.CreateRequest, r
 		return
 	}
 
-	input, diags := plan.toKibanaAPIRequest()
+	input, diags := plan.toKibanaAPIRequest(ctx)
 	response.Diagnostics.Append(diags...)
 	if response.Diagnostics.HasError() {
 		return
@@ -33,9 +33,9 @@ func (r *Resource) Create(ctx context.Context, request resource.CreateRequest, r
 		return
 	}
 
-	plan, err = plan.toModelV0(result)
-	if err != nil {
-		response.Diagnostics.AddError("Failed to convert Kibana monitor API to TF state", err.Error())
+	plan, diags = plan.toModelV0(ctx, result)
+	response.Diagnostics.Append(diags...)
+	if response.Diagnostics.HasError() {
 		return
 	}
 

diff --git a/internal/kibana/synthetics/read.go b/internal/kibana/synthetics/read.go
@@ -42,9 +42,9 @@ func (r *Resource) Read(ctx context.Context, request resource.ReadRequest, respo
 		return
 	}
 
-	state, err = state.toModelV0(result)
-	if err != nil {
-		response.Diagnostics.AddError("Failed to convert Kibana monitor API to TF state", err.Error())
+	state, diags = state.toModelV0(ctx, result)
+	response.Diagnostics.Append(diags...)
+	if response.Diagnostics.HasError() {
 		return
 	}