Bug Fix - Fix APM Synthetic service vantage points schema

Author: Terraform Team Automation

examples/apm/apm_synthetics/monitors/monitor.tf

@@ -148,8 +148,12 @@ variable "monitor_maintenance_window_schedule_time_started" {
   default = "2024-12-18T22:47:12.654Z"
 }
 
-variable "vantage_points" {
-  default = ["OraclePublic-us-ashburn-1"]
+variable "monitor_vantage_points_name" {
+  default = "OraclePublic-us-ashburn-1"
+}
+
+variable "monitor_vantage_points_param_display_name" {
+  default = "US East (Ashburn)"
 }
 
 provider "oci" {
@@ -166,7 +170,12 @@ resource "oci_apm_synthetics_monitor" "test_monitor" {
   display_name               = var.monitor_display_name
   monitor_type               = var.monitor_monitor_type
   repeat_interval_in_seconds = var.monitor_repeat_interval_in_seconds
-  vantage_points   = var.vantage_points
+  vantage_points {
+    #Required
+    name  = var.monitor_vantage_points_name
+    #Optional
+    display_name = var.monitor_vantage_points_param_display_name
+  }
 
   #Optional
   configuration {
@@ -264,7 +273,7 @@ variable "script_parameters_param_name" {
 }
 
 variable "script_parameters_param_value" {
-  default = "myTest1"
+  default = ""
 }
 
 

internal/integrationtest/apm_synthetics_monitor_test.go

@@ -39,14 +39,12 @@ var (
 	}
 
 	ApmSyntheticsApmSyntheticsmonitorDataSourceRepresentation = map[string]interface{}{
-		"apm_domain_id":                acctest.Representation{RepType: acctest.Required, Create: `${oci_apm_apm_domain.test_apm_domain.id}`},
-		"display_name":                 acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
-		"is_maintenance_window_active": acctest.Representation{RepType: acctest.Optional, Create: `false`},
-		"is_maintenance_window_set":    acctest.Representation{RepType: acctest.Optional, Create: `false`},
-		"monitor_type":                 acctest.Representation{RepType: acctest.Optional, Create: `SCRIPTED_BROWSER`},
-		"script_id":                    acctest.Representation{RepType: acctest.Optional, Create: `${oci_apm_synthetics_script.test_script.id}`},
-		"status":                       acctest.Representation{RepType: acctest.Optional, Create: `ENABLED`, Update: `DISABLED`},
-		"filter":                       acctest.RepresentationGroup{RepType: acctest.Required, Group: ApmSyntheticsmonitorDataSourceFilterRepresentation}}
+		"apm_domain_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_apm_apm_domain.test_apm_domain.id}`},
+		"display_name":  acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
+		"monitor_type":  acctest.Representation{RepType: acctest.Optional, Create: `SCRIPTED_BROWSER`},
+		"script_id":     acctest.Representation{RepType: acctest.Optional, Create: `${oci_apm_synthetics_script.test_script.id}`},
+		"status":        acctest.Representation{RepType: acctest.Optional, Create: `ENABLED`, Update: `DISABLED`},
+		"filter":        acctest.RepresentationGroup{RepType: acctest.Required, Group: ApmSyntheticsmonitorDataSourceFilterRepresentation}}
 	ApmSyntheticsmonitorDataSourceFilterRepresentation = map[string]interface{}{
 		"name":   acctest.Representation{RepType: acctest.Required, Create: `display_name`},
 		"values": acctest.Representation{RepType: acctest.Required, Create: []string{`${oci_apm_synthetics_monitor.test_monitor.display_name}`}},
@@ -57,7 +55,7 @@ var (
 		"display_name":                acctest.Representation{RepType: acctest.Required, Create: `displayName`, Update: `displayName2`},
 		"monitor_type":                acctest.Representation{RepType: acctest.Required, Create: `SCRIPTED_BROWSER`},
 		"repeat_interval_in_seconds":  acctest.Representation{RepType: acctest.Required, Create: `600`, Update: `1200`},
-		"vantage_points":              acctest.Representation{RepType: acctest.Required, Create: []string{`OraclePublic-us-ashburn-1`}},
+		"vantage_points":              acctest.RepresentationGroup{RepType: acctest.Required, Group: monitorVantagePointsRepresentation},
 		"availability_configuration":  acctest.RepresentationGroup{RepType: acctest.Optional, Group: ApmSyntheticsMonitorAvailabilityConfigurationRepresentation},
 		"defined_tags":                acctest.Representation{RepType: acctest.Optional, Create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, Update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
 		"freeform_tags":               acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
@@ -72,6 +70,10 @@ var (
 		"configuration":               acctest.RepresentationGroup{RepType: acctest.Optional, Group: ApmSyntheticsmonitorConfigurationRepresentation},
 		"script_parameters":           acctest.RepresentationGroup{RepType: acctest.Optional, Group: ApmSyntheticsmonitorScriptParametersRepresentation},
 	}
+	monitorVantagePointsRepresentation = map[string]interface{}{
+		"name":         acctest.Representation{RepType: acctest.Required, Create: `OraclePublic-us-ashburn-1`},
+		"display_name": acctest.Representation{RepType: acctest.Optional, Create: `US East (Ashburn)`},
+	}
 
 	ApmSyntheticsmonitorConfigurationRepresentation = map[string]interface{}{
 		"dns_configuration":                 acctest.RepresentationGroup{RepType: acctest.Optional, Group: ApmSyntheticsmonitorConfigurationDnsConfigurationRepresentation},
@@ -182,7 +184,7 @@ func TestApmSyntheticsMonitorResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(resourceName, "timeout_in_seconds", "60"),
 				resource.TestCheckResourceAttrSet(resourceName, "vantage_point_count"),
 				resource.TestCheckResourceAttr(resourceName, "vantage_points.#", "1"),
-				resource.TestCheckResourceAttrSet(resourceName, "vantage_points.0"),
+				resource.TestCheckResourceAttrSet(resourceName, "vantage_points.0.name"),
 
 				func(s *terraform.State) (err error) {
 					resId, err = acctest.FromInstanceState(s, resourceName, "id")
@@ -242,7 +244,7 @@ func TestApmSyntheticsMonitorResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(resourceName, "timeout_in_seconds", "120"),
 				resource.TestCheckResourceAttrSet(resourceName, "vantage_point_count"),
 				resource.TestCheckResourceAttr(resourceName, "vantage_points.#", "1"),
-				resource.TestCheckResourceAttrSet(resourceName, "vantage_points.0"),
+				resource.TestCheckResourceAttrSet(resourceName, "vantage_points.0.name"),
 
 				func(s *terraform.State) (err error) {
 					resId2, err = acctest.FromInstanceState(s, resourceName, "id")
@@ -262,8 +264,6 @@ func TestApmSyntheticsMonitorResource_basic(t *testing.T) {
 			Check: resource.ComposeAggregateTestCheckFunc(
 				resource.TestCheckResourceAttrSet(datasourceName, "apm_domain_id"),
 				resource.TestCheckResourceAttr(datasourceName, "display_name", "displayName2"),
-				resource.TestCheckResourceAttr(datasourceName, "is_maintenance_window_active", "false"),
-				resource.TestCheckResourceAttr(datasourceName, "is_maintenance_window_set", "false"),
 				resource.TestCheckResourceAttr(datasourceName, "monitor_type", "SCRIPTED_BROWSER"),
 				resource.TestCheckResourceAttrSet(datasourceName, "script_id"),
 				resource.TestCheckResourceAttr(datasourceName, "status", "DISABLED"),
@@ -320,7 +320,7 @@ func TestApmSyntheticsMonitorResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(singularDatasourceName, "timeout_in_seconds", "120"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "vantage_point_count"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "vantage_points.#", "1"),
-				resource.TestCheckResourceAttrSet(singularDatasourceName, "vantage_points.0"),
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "vantage_points.0.name"),
 			),
 		},
 		// verify resource import

internal/service/apm_synthetics/apm_synthetics_monitor_data_source.go

@@ -173,7 +173,7 @@ func (s *ApmSyntheticsMonitorDataSourceCrud) SetData() error {
 
 	vantagePoints := []interface{}{}
 	for _, item := range s.Res.VantagePoints {
-		vantagePoints = append(vantagePoints, item.Name)
+		vantagePoints = append(vantagePoints, VantagePointInfoToMap(item))
 	}
 	s.D.Set("vantage_points", vantagePoints)
 

internal/service/apm_synthetics/apm_synthetics_monitor_resource.go

@@ -56,8 +56,20 @@ func ApmSyntheticsMonitorResource() *schema.Resource {
 				Required: true,
 				MaxItems: 50,
 				MinItems: 1,
-				Elem: &schema.Schema{
-					Type: schema.TypeString,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						// Required
+						"name": {
+							Type:     schema.TypeString,
+							Required: true,
+						},
+
+						// Optional
+						"display_name": {
+							Type:     schema.TypeString,
+							Optional: true,
+						},
+					},
 				},
 			},
 
@@ -701,9 +713,14 @@ func (s *ApmSyntheticsMonitorResourceCrud) Create() error {
 		interfaces := vantagePoints.([]interface{})
 		tmp := make([]string, len(interfaces))
 		for i := range interfaces {
-			if interfaces[i] != nil {
-				tmp[i] = interfaces[i].(string)
+			stateDataIndex := i
+			fieldKeyFormat := fmt.Sprintf("%s.%d.%%s", "vantage_points", stateDataIndex)
+			converted, err := s.mapToVantagePointInfo(fieldKeyFormat)
+			if err != nil {
+				return err
 			}
+			name := converted.Name
+			tmp[i] = *name
 		}
 		if len(tmp) != 0 || s.D.HasChange("vantage_points") {
 			request.VantagePoints = tmp
@@ -879,9 +896,14 @@ func (s *ApmSyntheticsMonitorResourceCrud) Update() error {
 		interfaces := vantagePoints.([]interface{})
 		tmp := make([]string, len(interfaces))
 		for i := range interfaces {
-			if interfaces[i] != nil {
-				tmp[i] = interfaces[i].(string)
+			stateDataIndex := i
+			fieldKeyFormat := fmt.Sprintf("%s.%d.%%s", "vantage_points", stateDataIndex)
+			converted, err := s.mapToVantagePointInfo(fieldKeyFormat)
+			if err != nil {
+				return err
 			}
+			name := converted.Name
+			tmp[i] = *name
 		}
 		if len(tmp) != 0 || s.D.HasChange("vantage_points") {
 			request.VantagePoints = tmp
@@ -1021,7 +1043,7 @@ func (s *ApmSyntheticsMonitorResourceCrud) SetData() error {
 
 	vantagePoints := []interface{}{}
 	for _, item := range s.Res.VantagePoints {
-		vantagePoints = append(vantagePoints, item.Name)
+		vantagePoints = append(vantagePoints, VantagePointInfoToMap(item))
 	}
 	s.D.Set("vantage_points", vantagePoints)
 
@@ -1606,7 +1628,7 @@ func MonitorSummaryToMap(obj oci_apm_synthetics.MonitorSummary) map[string]inter
 
 	vantagePoints := []interface{}{}
 	for _, item := range obj.VantagePoints {
-		vantagePoints = append(vantagePoints, item.Name)
+		vantagePoints = append(vantagePoints, VantagePointInfoToMap(item))
 	}
 	result["vantage_points"] = vantagePoints
 
@@ -1859,3 +1881,19 @@ func MonitorScriptParameterInfoToMap(obj oci_apm_synthetics.MonitorScriptParamet
 
 	return result
 }
+
+func (s *ApmSyntheticsMonitorResourceCrud) mapToVantagePointInfo(fieldKeyFormat string) (oci_apm_synthetics.VantagePointInfo, error) {
+	result := oci_apm_synthetics.VantagePointInfo{}
+
+	if name, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "name")); ok {
+		tmp := name.(string)
+		result.Name = &tmp
+	}
+
+	if displayName, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "display_name")); ok {
+		tmp := displayName.(string)
+		result.DisplayName = &tmp
+	}
+
+	return result, nil
+}

internal/service/apm_synthetics/apm_synthetics_script_resource.go

@@ -590,7 +590,9 @@ func ScriptParameterInfoToMap(obj oci_apm_synthetics.ScriptParameterInfo) map[st
 		result["script_parameter"] = ScriptParameters
 		result["is_secret"] = bool(*obj.ScriptParameter.IsSecret)
 		result["param_name"] = string(*obj.ScriptParameter.ParamName)
-		result["param_value"] = string(*obj.ScriptParameter.ParamValue)
+		if obj.ScriptParameter.ParamValue != nil {
+			result["param_value"] = string(*obj.ScriptParameter.ParamValue)
+		}
 
 	}
 

website/docs/r/apm_synthetics_monitor.html.markdown

@@ -22,7 +22,12 @@ resource "oci_apm_synthetics_monitor" "test_monitor" {
 	display_name = var.monitor_display_name
 	monitor_type = var.monitor_monitor_type
 	repeat_interval_in_seconds = var.monitor_repeat_interval_in_seconds
-	vantage_points = var.vantage_points
+        vantage_points {
+          #Required
+          name  = var.monitor_vantage_points_name
+          #Optional
+          display_name = var.monitor_vantage_points_param_display_name
+        }
 
 	#Optional
 	availability_configuration {
@@ -131,6 +136,8 @@ The following arguments are supported:
 * `monitor_type` - (Required) Type of monitor.
 * `repeat_interval_in_seconds` - (Required) (Updatable) Interval in seconds after the start time when the job should be repeated. Minimum repeatIntervalInSeconds should be 300 seconds.
 * `vantage_points` - (Required) (Updatable) A list of vantage points from which to execute the monitor. Use /publicVantagePoints to fetch public vantage points.
+	* `display_name` - Unique name that can be edited. The name should not contain any confidential information.
+	* `name` - Name of the vantage point.
 * `configuration` - (Optional) (Updatable) Details of monitor configuration.
 	* `config_type` - (Optional) (Updatable) Type of configuration.
 	* `dns_configuration` - (Optional) (Updatable) Dns settings.