Use regular string sorting for custom access context manager ingress …

…and egress flatteners (#12288) (#20294) [upstream:0616a35f4dddbca1857fbc0c1330bc5ea93cc7e5] Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · Nov 11, 2024 · 6a6aa09 · 6a6aa09
1 parent b7367a3
commit 6a6aa09
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 28 deletions.
diff --git a/.changelog/12288.txt b/.changelog/12288.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+accesscontextmanager: Fix permadiff in perimeter ingress / egress rules when there are duplicate resources in the rules
+```
diff --git a/...contextmanager/resource_access_context_manager_service_perimeter_dry_run_egress_policy.go b/...contextmanager/resource_access_context_manager_service_perimeter_dry_run_egress_policy.go
@@ -556,28 +556,29 @@ func flattenNestedAccessContextManagerServicePerimeterDryRunEgressPolicyEgressTo
 }
 func flattenNestedAccessContextManagerServicePerimeterDryRunEgressPolicyEgressToResources(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	rawConfigValue := d.Get("egress_to.0.resources")
-
 	// Convert config value to []string
 	configValue, err := tpgresource.InterfaceSliceToStringSlice(rawConfigValue)
 	if err != nil {
 		log.Printf("[ERROR] Failed to convert config value: %s", err)
 		return v
 	}
+	sortedConfigValue := append([]string{}, configValue...)
+	sort.Strings(sortedConfigValue)
 
 	// Convert v to []string
-	apiStringValue, err := tpgresource.InterfaceSliceToStringSlice(v)
+	apiValue, err := tpgresource.InterfaceSliceToStringSlice(v)
 	if err != nil {
 		log.Printf("[ERROR] Failed to convert API value: %s", err)
 		return v
 	}
+	sortedApiValue := append([]string{}, apiValue...)
+	sort.Strings(sortedApiValue)
 
-	sortedStrings, err := tpgresource.SortStringsByConfigOrder(configValue, apiStringValue)
-	if err != nil {
-		log.Printf("[ERROR] Could not sort API response value: %s", err)
-		return v
+	if slices.Equal(sortedApiValue, sortedConfigValue) {
+		return configValue
 	}
 
-	return sortedStrings
+	return apiValue
 }
 
 func flattenNestedAccessContextManagerServicePerimeterDryRunEgressPolicyEgressToExternalResources(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {

diff --git a/...ontextmanager/resource_access_context_manager_service_perimeter_dry_run_ingress_policy.go b/...ontextmanager/resource_access_context_manager_service_perimeter_dry_run_ingress_policy.go
@@ -557,28 +557,29 @@ func flattenNestedAccessContextManagerServicePerimeterDryRunIngressPolicyIngress
 }
 func flattenNestedAccessContextManagerServicePerimeterDryRunIngressPolicyIngressToResources(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	rawConfigValue := d.Get("ingress_to.0.resources")
-
 	// Convert config value to []string
 	configValue, err := tpgresource.InterfaceSliceToStringSlice(rawConfigValue)
 	if err != nil {
 		log.Printf("[ERROR] Failed to convert config value: %s", err)
 		return v
 	}
+	sortedConfigValue := append([]string{}, configValue...)
+	sort.Strings(sortedConfigValue)
 
 	// Convert v to []string
-	apiStringValue, err := tpgresource.InterfaceSliceToStringSlice(v)
+	apiValue, err := tpgresource.InterfaceSliceToStringSlice(v)
 	if err != nil {
 		log.Printf("[ERROR] Failed to convert API value: %s", err)
 		return v
 	}
+	sortedApiValue := append([]string{}, apiValue...)
+	sort.Strings(sortedApiValue)
 
-	sortedStrings, err := tpgresource.SortStringsByConfigOrder(configValue, apiStringValue)
-	if err != nil {
-		log.Printf("[ERROR] Could not sort API response value: %s", err)
-		return v
+	if slices.Equal(sortedApiValue, sortedConfigValue) {
+		return configValue
 	}
 
-	return sortedStrings
+	return apiValue
 }
 
 func flattenNestedAccessContextManagerServicePerimeterDryRunIngressPolicyIngressToOperations(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {

diff --git a/...s/accesscontextmanager/resource_access_context_manager_service_perimeter_egress_policy.go b/...s/accesscontextmanager/resource_access_context_manager_service_perimeter_egress_policy.go
@@ -554,28 +554,29 @@ func flattenNestedAccessContextManagerServicePerimeterEgressPolicyEgressTo(v int
 }
 func flattenNestedAccessContextManagerServicePerimeterEgressPolicyEgressToResources(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	rawConfigValue := d.Get("egress_to.0.resources")
-
 	// Convert config value to []string
 	configValue, err := tpgresource.InterfaceSliceToStringSlice(rawConfigValue)
 	if err != nil {
 		log.Printf("[ERROR] Failed to convert config value: %s", err)
 		return v
 	}
+	sortedConfigValue := append([]string{}, configValue...)
+	sort.Strings(sortedConfigValue)
 
 	// Convert v to []string
-	apiStringValue, err := tpgresource.InterfaceSliceToStringSlice(v)
+	apiValue, err := tpgresource.InterfaceSliceToStringSlice(v)
 	if err != nil {
 		log.Printf("[ERROR] Failed to convert API value: %s", err)
 		return v
 	}
+	sortedApiValue := append([]string{}, apiValue...)
+	sort.Strings(sortedApiValue)
 
-	sortedStrings, err := tpgresource.SortStringsByConfigOrder(configValue, apiStringValue)
-	if err != nil {
-		log.Printf("[ERROR] Could not sort API response value: %s", err)
-		return v
+	if slices.Equal(sortedApiValue, sortedConfigValue) {
+		return configValue
 	}
 
-	return sortedStrings
+	return apiValue
 }
 
 func flattenNestedAccessContextManagerServicePerimeterEgressPolicyEgressToExternalResources(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {

diff --git a/.../accesscontextmanager/resource_access_context_manager_service_perimeter_ingress_policy.go b/.../accesscontextmanager/resource_access_context_manager_service_perimeter_ingress_policy.go
@@ -558,28 +558,29 @@ func flattenNestedAccessContextManagerServicePerimeterIngressPolicyIngressTo(v i
 }
 func flattenNestedAccessContextManagerServicePerimeterIngressPolicyIngressToResources(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	rawConfigValue := d.Get("ingress_to.0.resources")
-
 	// Convert config value to []string
 	configValue, err := tpgresource.InterfaceSliceToStringSlice(rawConfigValue)
 	if err != nil {
 		log.Printf("[ERROR] Failed to convert config value: %s", err)
 		return v
 	}
+	sortedConfigValue := append([]string{}, configValue...)
+	sort.Strings(sortedConfigValue)
 
 	// Convert v to []string
-	apiStringValue, err := tpgresource.InterfaceSliceToStringSlice(v)
+	apiValue, err := tpgresource.InterfaceSliceToStringSlice(v)
 	if err != nil {
 		log.Printf("[ERROR] Failed to convert API value: %s", err)
 		return v
 	}
+	sortedApiValue := append([]string{}, apiValue...)
+	sort.Strings(sortedApiValue)
 
-	sortedStrings, err := tpgresource.SortStringsByConfigOrder(configValue, apiStringValue)
-	if err != nil {
-		log.Printf("[ERROR] Could not sort API response value: %s", err)
-		return v
+	if slices.Equal(sortedApiValue, sortedConfigValue) {
+		return configValue
 	}
 
-	return sortedStrings
+	return apiValue
 }
 
 func flattenNestedAccessContextManagerServicePerimeterIngressPolicyIngressToOperations(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {