Bug Fix : Remove system tags from SZ requests

Terraform Team Automation · sagarp337 · commit f029f7cc573f · 2023-05-19T15:22:29.000-05:00
diff --git a/examples/cloudguard/security_zone/security_zone.tf b/examples/cloudguard/security_zone/security_zone.tf
@@ -77,8 +77,4 @@ resource "oci_cloud_guard_security_zone" "test_security_zone" {
   #Optional
   description   = "${var.security_zone_description}"
 
-  //Added only because we are testing this in a splat-disabled env
-  lifecycle {
-    ignore_changes = [system_tags]
-  }
 }
diff --git a/examples/cloudguard/security_zone_recipe/security_zone_recipe.tf b/examples/cloudguard/security_zone_recipe/security_zone_recipe.tf
@@ -66,8 +66,4 @@ resource "oci_cloud_guard_security_recipe" "test_security_recipe" {
   #Optional
   description       = "${var.security_recipe_description}"
 
-  //Added only because we are testing this in a splat-disabled env
-  lifecycle {
-    ignore_changes = [system_tags]
-  }
 }
diff --git a/internal/integrationtest/cloud_guard_security_recipe_test.go b/internal/integrationtest/cloud_guard_security_recipe_test.go
@@ -53,11 +53,6 @@ var (
 		"defined_tags":      acctest.Representation{RepType: acctest.Optional, Create: `${tomap({"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "value"})}`, Update: `${tomap({"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "updatedValue"})}`},
 		"description":       acctest.Representation{RepType: acctest.Optional, Create: `description`, Update: `description2`},
 		"freeform_tags":     acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
-		"lifecycle":         acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreSecurityRecipeSystemTagsChangesRep},
-	}
-
-	ignoreSecurityRecipeSystemTagsChangesRep = map[string]interface{}{
-		"ignore_changes": acctest.Representation{RepType: acctest.Required, Create: []string{`system_tags`}},
 	}
 
 	CloudGuardSecurityRecipeResourceDependencies = DefinedTagsDependencies + SecurityPolicyResourceDependencies
diff --git a/internal/integrationtest/cloud_guard_security_zone_test.go b/internal/integrationtest/cloud_guard_security_zone_test.go
@@ -55,11 +55,6 @@ var (
 		"defined_tags":            acctest.Representation{RepType: acctest.Optional, Create: `${tomap({"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "value"})}`, Update: `${tomap({"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "updatedValue"})}`},
 		"description":             acctest.Representation{RepType: acctest.Optional, Create: `description`, Update: `description2`},
 		"freeform_tags":           acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
-		"lifecycle":               acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreSecurityZoneSystemTagsChangesRep},
-	}
-
-	ignoreSecurityZoneSystemTagsChangesRep = map[string]interface{}{
-		"ignore_changes": acctest.Representation{RepType: acctest.Required, Create: []string{`system_tags`}},
 	}
 
 	CloudGuardSecurityZoneResourceDependencies = acctest.GenerateResourceFromRepresentationMap("oci_cloud_guard_security_recipe", "test_security_recipe", acctest.Required, acctest.Create, CloudGuardSecurityRecipeRepresentation) +
diff --git a/internal/service/cloud_guard/cloud_guard_security_policies_data_source.go b/internal/service/cloud_guard/cloud_guard_security_policies_data_source.go
@@ -102,11 +102,6 @@ func CloudGuardSecurityPoliciesDataSource() *schema.Resource {
 										Type:     schema.TypeString,
 										Computed: true,
 									},
-									"system_tags": {
-										Type:     schema.TypeMap,
-										Computed: true,
-										Elem:     schema.TypeString,
-									},
 									"time_created": {
 										Type:     schema.TypeString,
 										Computed: true,
@@ -259,10 +254,6 @@ func SecurityPolicySummaryToMap(obj oci_cloud_guard.SecurityPolicySummary) map[s
 
 	result["state"] = string(obj.LifecycleState)
 
-	if obj.SystemTags != nil {
-		result["system_tags"] = tfresource.SystemTagsToMap(obj.SystemTags)
-	}
-
 	if obj.TimeCreated != nil {
 		result["time_created"] = obj.TimeCreated.String()
 	}
diff --git a/internal/service/cloud_guard/cloud_guard_security_policy_data_source.go b/internal/service/cloud_guard/cloud_guard_security_policy_data_source.go
@@ -71,11 +71,6 @@ func CloudGuardSecurityPolicyDataSource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"system_tags": {
-				Type:     schema.TypeMap,
-				Computed: true,
-				Elem:     schema.TypeString,
-			},
 			"time_created": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -168,10 +163,6 @@ func (s *CloudGuardSecurityPolicyDataSourceCrud) SetData() error {
 
 	s.D.Set("state", s.Res.LifecycleState)
 
-	if s.Res.SystemTags != nil {
-		s.D.Set("system_tags", tfresource.SystemTagsToMap(s.Res.SystemTags))
-	}
-
 	if s.Res.TimeCreated != nil {
 		s.D.Set("time_created", s.Res.TimeCreated.String())
 	}
@@ -226,10 +217,6 @@ func CloudGuardSecurityPolicySummaryToMap(obj oci_cloud_guard.SecurityPolicySumm
 
 	result["state"] = string(obj.LifecycleState)
 
-	if obj.SystemTags != nil {
-		result["system_tags"] = tfresource.SystemTagsToMap(obj.SystemTags)
-	}
-
 	if obj.TimeCreated != nil {
 		result["time_created"] = obj.TimeCreated.String()
 	}
diff --git a/internal/service/cloud_guard/cloud_guard_security_recipe_data_source.go b/internal/service/cloud_guard/cloud_guard_security_recipe_data_source.go
@@ -94,10 +94,6 @@ func (s *CloudGuardSecurityRecipeDataSourceCrud) SetData() error {
 
 	s.D.Set("state", s.Res.LifecycleState)
 
-	if s.Res.SystemTags != nil {
-		s.D.Set("system_tags", tfresource.SystemTagsToMap(s.Res.SystemTags))
-	}
-
 	if s.Res.TimeCreated != nil {
 		s.D.Set("time_created", s.Res.TimeCreated.String())
 	}
diff --git a/internal/service/cloud_guard/cloud_guard_security_recipe_resource.go b/internal/service/cloud_guard/cloud_guard_security_recipe_resource.go
@@ -75,11 +75,6 @@ func CloudGuardSecurityRecipeResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"system_tags": {
-				Type:     schema.TypeMap,
-				Computed: true,
-				Elem:     schema.TypeString,
-			},
 			"time_created": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -333,10 +328,6 @@ func (s *CloudGuardSecurityRecipeResourceCrud) SetData() error {
 
 	s.D.Set("state", s.Res.LifecycleState)
 
-	if s.Res.SystemTags != nil {
-		s.D.Set("system_tags", tfresource.SystemTagsToMap(s.Res.SystemTags))
-	}
-
 	if s.Res.TimeCreated != nil {
 		s.D.Set("time_created", s.Res.TimeCreated.String())
 	}
@@ -383,10 +374,6 @@ func SecurityRecipeSummaryToMap(obj oci_cloud_guard.SecurityRecipeSummary) map[s
 
 	result["state"] = string(obj.LifecycleState)
 
-	if obj.SystemTags != nil {
-		result["system_tags"] = tfresource.SystemTagsToMap(obj.SystemTags)
-	}
-
 	if obj.TimeCreated != nil {
 		result["time_created"] = obj.TimeCreated.String()
 	}
diff --git a/internal/service/cloud_guard/cloud_guard_security_zone_data_source.go b/internal/service/cloud_guard/cloud_guard_security_zone_data_source.go
@@ -100,10 +100,6 @@ func (s *CloudGuardSecurityZoneDataSourceCrud) SetData() error {
 
 	s.D.Set("state", s.Res.LifecycleState)
 
-	if s.Res.SystemTags != nil {
-		s.D.Set("system_tags", tfresource.SystemTagsToMap(s.Res.SystemTags))
-	}
-
 	if s.Res.TimeCreated != nil {
 		s.D.Set("time_created", s.Res.TimeCreated.String())
 	}
diff --git a/internal/service/cloud_guard/cloud_guard_security_zone_resource.go b/internal/service/cloud_guard/cloud_guard_security_zone_resource.go
@@ -79,11 +79,6 @@ func CloudGuardSecurityZoneResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"system_tags": {
-				Type:     schema.TypeMap,
-				Computed: true,
-				Elem:     schema.TypeString,
-			},
 			"time_created": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -327,10 +322,6 @@ func (s *CloudGuardSecurityZoneResourceCrud) SetData() error {
 
 	s.D.Set("state", s.Res.LifecycleState)
 
-	if s.Res.SystemTags != nil {
-		s.D.Set("system_tags", tfresource.SystemTagsToMap(s.Res.SystemTags))
-	}
-
 	if s.Res.TimeCreated != nil {
 		s.D.Set("time_created", s.Res.TimeCreated.String())
 	}
@@ -377,10 +368,6 @@ func SecurityZoneSummaryToMap(obj oci_cloud_guard.SecurityZoneSummary) map[strin
 
 	result["state"] = string(obj.LifecycleState)
 
-	if obj.SystemTags != nil {
-		result["system_tags"] = tfresource.SystemTagsToMap(obj.SystemTags)
-	}
-
 	if obj.TimeCreated != nil {
 		result["time_created"] = obj.TimeCreated.String()
 	}
diff --git a/website/docs/d/cloud_guard_security_policies.html.markdown b/website/docs/d/cloud_guard_security_policies.html.markdown
@@ -61,7 +61,6 @@ The following attributes are exported:
 * `owner` - The owner of the security policy
 * `services` - The list of services that the security policy protects
 * `state` - The current state of the security policy
-* `system_tags` - System tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). System tags can be viewed by users, but can only be created by the system.  Example: `{"orcl-cloud.free-tier-retained": "true"}` 
 * `time_created` - The time the security policy was created. An RFC3339 formatted datetime string.
 * `time_updated` - The time the security policy was last updated. An RFC3339 formatted datetime string.
 
diff --git a/website/docs/d/cloud_guard_security_policy.html.markdown b/website/docs/d/cloud_guard_security_policy.html.markdown
@@ -46,7 +46,6 @@ The following attributes are exported:
 * `owner` - The owner of the security policy
 * `services` - The list of services that the security policy protects
 * `state` - The current state of the security policy
-* `system_tags` - System tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). System tags can be viewed by users, but can only be created by the system.  Example: `{"orcl-cloud.free-tier-retained": "true"}` 
 * `time_created` - The time the security policy was created. An RFC3339 formatted datetime string.
 * `time_updated` - The time the security policy was last updated. An RFC3339 formatted datetime string.
 
diff --git a/website/docs/d/cloud_guard_security_recipe.html.markdown b/website/docs/d/cloud_guard_security_recipe.html.markdown
@@ -44,7 +44,6 @@ The following attributes are exported:
 * `owner` - The owner of the recipe
 * `security_policies` - The list of `SecurityPolicy` ids that are included in the recipe
 * `state` - The current state of the recipe
-* `system_tags` - System tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). System tags can be viewed by users, but can only be created by the system.  Example: `{"orcl-cloud.free-tier-retained": "true"}` 
 * `time_created` - The time the recipe was created. An RFC3339 formatted datetime string.
 * `time_updated` - The time the recipe was last updated. An RFC3339 formatted datetime string.
 
diff --git a/website/docs/d/cloud_guard_security_recipes.html.markdown b/website/docs/d/cloud_guard_security_recipes.html.markdown
@@ -59,7 +59,6 @@ The following attributes are exported:
 * `owner` - The owner of the recipe
 * `security_policies` - The list of `SecurityPolicy` ids that are included in the recipe
 * `state` - The current state of the recipe
-* `system_tags` - System tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). System tags can be viewed by users, but can only be created by the system.  Example: `{"orcl-cloud.free-tier-retained": "true"}` 
 * `time_created` - The time the recipe was created. An RFC3339 formatted datetime string.
 * `time_updated` - The time the recipe was last updated. An RFC3339 formatted datetime string.
 
diff --git a/website/docs/d/cloud_guard_security_zone.html.markdown b/website/docs/d/cloud_guard_security_zone.html.markdown
@@ -45,7 +45,6 @@ The following attributes are exported:
 * `security_zone_recipe_id` - The OCID of the recipe (`SecurityRecipe`) for the security zone
 * `security_zone_target_id` - The OCID of the target associated with the security zone
 * `state` - The current state of the security zone
-* `system_tags` - System tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). System tags can be viewed by users, but can only be created by the system.  Example: `{"orcl-cloud.free-tier-retained": "true"}` 
 * `time_created` - The time the security zone was created. An RFC3339 formatted datetime string.
 * `time_updated` - The time the security zone was last updated. An RFC3339 formatted datetime string.
 
diff --git a/website/docs/d/cloud_guard_security_zones.html.markdown b/website/docs/d/cloud_guard_security_zones.html.markdown
@@ -64,7 +64,6 @@ The following attributes are exported:
 * `security_zone_recipe_id` - The OCID of the recipe (`SecurityRecipe`) for the security zone
 * `security_zone_target_id` - The OCID of the target associated with the security zone
 * `state` - The current state of the security zone
-* `system_tags` - System tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). System tags can be viewed by users, but can only be created by the system.  Example: `{"orcl-cloud.free-tier-retained": "true"}` 
 * `time_created` - The time the security zone was created. An RFC3339 formatted datetime string.
 * `time_updated` - The time the security zone was last updated. An RFC3339 formatted datetime string.
 
diff --git a/website/docs/r/cloud_guard_security_recipe.html.markdown b/website/docs/r/cloud_guard_security_recipe.html.markdown
@@ -62,7 +62,6 @@ The following attributes are exported:
 * `owner` - The owner of the recipe
 * `security_policies` - The list of `SecurityPolicy` ids that are included in the recipe
 * `state` - The current state of the recipe
-* `system_tags` - System tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). System tags can be viewed by users, but can only be created by the system.  Example: `{"orcl-cloud.free-tier-retained": "true"}` 
 * `time_created` - The time the recipe was created. An RFC3339 formatted datetime string.
 * `time_updated` - The time the recipe was last updated. An RFC3339 formatted datetime string.
 
diff --git a/website/docs/r/cloud_guard_security_zone.html.markdown b/website/docs/r/cloud_guard_security_zone.html.markdown
@@ -63,7 +63,6 @@ The following attributes are exported:
 * `security_zone_recipe_id` - The OCID of the recipe (`SecurityRecipe`) for the security zone
 * `security_zone_target_id` - The OCID of the target associated with the security zone
 * `state` - The current state of the security zone
-* `system_tags` - System tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). System tags can be viewed by users, but can only be created by the system.  Example: `{"orcl-cloud.free-tier-retained": "true"}` 
 * `time_created` - The time the security zone was created. An RFC3339 formatted datetime string.
 * `time_updated` - The time the security zone was last updated. An RFC3339 formatted datetime string.
 

Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,4 @@ resource "oci_cloud_guard_security_zone" "test_security_zone" {`
`77`	`77`	`#Optional`
`78`	`78`	`description = "${var.security_zone_description}"`
`79`	`79`
`80`		`- //Added only because we are testing this in a splat-disabled env`
`81`		`- lifecycle {`
`82`		`- ignore_changes = [system_tags]`
`83`		`- }`
`84`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,4 @@ resource "oci_cloud_guard_security_recipe" "test_security_recipe" {`
`66`	`66`	`#Optional`
`67`	`67`	`description = "${var.security_recipe_description}"`
`68`	`68`
`69`		`- //Added only because we are testing this in a splat-disabled env`
`70`		`- lifecycle {`
`71`		`- ignore_changes = [system_tags]`
`72`		`- }`
`73`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,10 +94,6 @@ func (s *CloudGuardSecurityRecipeDataSourceCrud) SetData() error {`
`94`	`94`
`95`	`95`	`s.D.Set("state", s.Res.LifecycleState)`
`96`	`96`
`97`		`- if s.Res.SystemTags != nil {`
`98`		`- s.D.Set("system_tags", tfresource.SystemTagsToMap(s.Res.SystemTags))`
`99`		`- }`
`100`		`-`
`101`	`97`	`if s.Res.TimeCreated != nil {`
`102`	`98`	`s.D.Set("time_created", s.Res.TimeCreated.String())`
`103`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,10 +100,6 @@ func (s *CloudGuardSecurityZoneDataSourceCrud) SetData() error {`
`100`	`100`
`101`	`101`	`s.D.Set("state", s.Res.LifecycleState)`
`102`	`102`
`103`		`- if s.Res.SystemTags != nil {`
`104`		`- s.D.Set("system_tags", tfresource.SystemTagsToMap(s.Res.SystemTags))`
`105`		`- }`
`106`		`-`
`107`	`103`	`if s.Res.TimeCreated != nil {`
`108`	`104`	`s.D.Set("time_created", s.Res.TimeCreated.String())`
`109`	`105`	`}`