-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use regular string sorting for custom access context manager ingress …
…and egress flatteners (#12288) Co-authored-by: Charlesleonius <charlesleon@google.com>
- Loading branch information
1 parent
5fc717a
commit 0616a35
Showing
2 changed files
with
16 additions
and
14 deletions.
There are no files selected for viewing
15 changes: 8 additions & 7 deletions
15
...raform/custom_flatten/accesscontextmanager_egress_policy_resources_custom_flatten.go.tmpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,26 @@ | ||
| func flatten{{$.GetPrefix}}{{$.TitlelizeProperty}}(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 | ||
| } |
15 changes: 8 additions & 7 deletions
15
...aform/custom_flatten/accesscontextmanager_ingress_policy_resources_custom_flatten.go.tmpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,26 @@ | ||
| func flatten{{$.GetPrefix}}{{$.TitlelizeProperty}}(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 | ||
| } |