Merge pull request #2096 from yuwenma/stricter-test-string-order

fix: sort mockgcp string slice fields
GoogleCloudPlatform · Jun 21, 2024 · 404ed0a · 404ed0a
2 parents cb4024e + a0617a6
commit 404ed0a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/...basic/container/v1beta1/containernodepool/_generated_object_containernodepool.golden.yaml b/...basic/container/v1beta1/containernodepool/_generated_object_containernodepool.golden.yaml
@@ -35,12 +35,12 @@ spec:
     metadata:
       disable-legacy-endpoints: "true"
     oauthScopes:
+    - https://www.googleapis.com/auth/devstorage.read_only
+    - https://www.googleapis.com/auth/logging.write
     - https://www.googleapis.com/auth/monitoring
     - https://www.googleapis.com/auth/service.management.readonly
     - https://www.googleapis.com/auth/servicecontrol
     - https://www.googleapis.com/auth/trace.append
-    - https://www.googleapis.com/auth/devstorage.read_only
-    - https://www.googleapis.com/auth/logging.write
     serviceAccountRef:
       external: default
     shieldedInstanceConfig:

diff --git a/...data/directives/removedefaultnodepool/_generated_object_removedefaultnodepool.golden.yaml b/...data/directives/removedefaultnodepool/_generated_object_removedefaultnodepool.golden.yaml
@@ -53,12 +53,12 @@ spec:
   nodeConfig:
     loggingVariant: DEFAULT
     oauthScopes:
-    - https://www.googleapis.com/auth/trace.append
     - https://www.googleapis.com/auth/devstorage.read_only
     - https://www.googleapis.com/auth/logging.write
     - https://www.googleapis.com/auth/monitoring
     - https://www.googleapis.com/auth/service.management.readonly
     - https://www.googleapis.com/auth/servicecontrol
+    - https://www.googleapis.com/auth/trace.append
   nodeLocations:
   - us-central1-a
   nodeVersion: ""

diff --git a/tests/e2e/normalize.go b/tests/e2e/normalize.go
@@ -100,6 +100,7 @@ func normalizeKRMObject(u *unstructured.Unstructured, project testgcp.GCPProject
 	visitor.sortSlices = sets.New[string]()
 	// TODO: This should not be needed, we want to avoid churning the kube objects
 	visitor.sortSlices.Insert(".spec.access")
+	visitor.sortSlices.Insert(".spec.nodeConfig.oauthScopes")
 
 	visitor.stringTransforms = append(visitor.stringTransforms, func(path string, s string) string {
 		return strings.ReplaceAll(s, project.ProjectID, "${projectId}")