Merge pull request #2092 from yuwenma/stricter-test-resourceID

fix: replace mockgcp dynamic resourceID to id marker
GoogleCloudPlatform · Jun 22, 2024 · 8edc244 · 8edc244
2 parents 93d018f + dc02bee
commit 8edc244
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/...monitoringnotificationchannel/_generated_object_monitoringnotificationchannel.golden.yaml b/...monitoringnotificationchannel/_generated_object_monitoringnotificationchannel.golden.yaml
@@ -26,7 +26,7 @@ spec:
   labels:
     url: http://hooks.example.com/notification
     username: user
-  resourceID: "1718837116591979324"
+  resourceID: ${notificationChannelID}
   sensitiveLabels:
     password:
       valueFrom:
@@ -41,5 +41,5 @@ status:
     reason: UpToDate
     status: "True"
     type: Ready
-  name: projects/${projectId}/notificationChannels/1718837116591979324
+  name: projects/${projectId}/notificationChannels/${notificationChannelID}
   observedGeneration: 3
diff --git a/...c/vertexai/v1alpha1/vertexaitensorboard/_generated_object_vertexaitensorboard.golden.yaml b/...c/vertexai/v1alpha1/vertexaitensorboard/_generated_object_vertexaitensorboard.golden.yaml
@@ -18,7 +18,7 @@ spec:
   projectRef:
     external: ${projectId}
   region: us-central1
-  resourceID: projects/${projectNumber}/locations/us-central1/tensorboards/1718837895702041590
+  resourceID: projects/${projectNumber}/locations/us-central1/tensorboards/${tensorboardId}
 status:
   blobStoragePathPrefix: cloud-ai-platform-4c7152f6-07a9-47d6-8f51-4299e2fdff92
   conditions:
@@ -28,6 +28,6 @@ status:
     status: "True"
     type: Ready
   createTime: "1970-01-01T00:00:00Z"
-  name: projects/${projectNumber}/locations/us-central1/tensorboards/1718837895702041590
+  name: projects/${projectNumber}/locations/us-central1/tensorboards/${tensorboardId}
   observedGeneration: 3
   updateTime: "1970-01-01T00:00:00Z"
diff --git a/tests/e2e/normalize.go b/tests/e2e/normalize.go
@@ -156,6 +156,16 @@ func normalizeKRMObject(u *unstructured.Unstructured, project testgcp.GCPProject
 					return strings.ReplaceAll(s, id, "${alertPolicyId}")
 				})
 			}
+			if typeName == "tensorboards" {
+				visitor.stringTransforms = append(visitor.stringTransforms, func(path string, s string) string {
+					return strings.ReplaceAll(s, id, "${tensorboardId}")
+				})
+			}
+			if typeName == "notificationChannels" {
+				visitor.stringTransforms = append(visitor.stringTransforms, func(path string, s string) string {
+					return strings.ReplaceAll(s, id, "${notificationChannelID}")
+				})
+			}
 		}
 	}