normalize field that change due to server generated fields. This prev…

…ents tests from failing
GoogleCloudPlatform · Jan 17, 2025 · 9038f77 · 9038f77
1 parent cb9af02
commit 9038f77
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 39 deletions.
diff --git a/...loudidentitymembership/_generated_object_addexpirydatecloudidentitymembership.golden.yaml b/...loudidentitymembership/_generated_object_addexpirydatecloudidentitymembership.golden.yaml
@@ -17,7 +17,7 @@ spec:
     name: cloudidentitygroup-${uniqueId}
   preferredMemberKey:
     id: test2@${ISOLATED_TEST_ORG_NAME}
-  resourceID: 19471824c77
+  resourceID: ${membershipID}
   roles:
   - expiryDetail:
       expireTime: "2222-10-02T15:01:23Z"

diff --git a/...udidentity/v1beta1/cloudidentitymembership/addexpirydatecloudidentitymembership/_http.log b/...udidentity/v1beta1/cloudidentitymembership/addexpirydatecloudidentitymembership/_http.log
@@ -155,7 +155,7 @@ X-Xss-Protection: 0
     "@type": "type.googleapis.com/google.apps.cloudidentity.groups.v1beta1.Membership",
     "createTime": "2024-04-01T12:34:56.123456Z",
     "deliverySetting": "DIGEST",
-    "name": "groups/${groupID}/memberships/19471824c77",
+    "name": "groups/${groupID}/memberships/${membershipID}",
     "preferredMemberKey": {
       "id": "test2@${ISOLATED_TEST_ORG_NAME}"
     },
@@ -171,7 +171,7 @@ X-Xss-Protection: 0
 
 ---
 
-GET https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/19471824c77?alt=json
+GET https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/${membershipID}?alt=json
 Content-Type: application/json
 User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
 
@@ -189,7 +189,7 @@ X-Xss-Protection: 0
 {
   "createTime": "2024-04-01T12:34:56.123456Z",
   "deliverySetting": "DIGEST",
-  "name": "groups/${groupID}/memberships/19471824c77",
+  "name": "groups/${groupID}/memberships/${membershipID}",
   "preferredMemberKey": {
     "id": "test2@${ISOLATED_TEST_ORG_NAME}"
   },
@@ -204,7 +204,7 @@ X-Xss-Protection: 0
 
 ---
 
-POST https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/19471824c77:modifyMembershipRoles?alt=json
+POST https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/${membershipID}:modifyMembershipRoles?alt=json
 Content-Type: application/json
 User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
 
@@ -238,9 +238,9 @@ X-Xss-Protection: 0
 
 {
   "membership": {
-    "createTime": "2025-01-16T23:45:52.247648519Z",
+    "createTime": "2025-01-17T18:51:02.320337735Z",
     "deliverySetting": "DIGEST",
-    "name": "groups/${groupID}/memberships/19471824c77",
+    "name": "groups/${groupID}/memberships/${membershipID}",
     "preferredMemberKey": {
       "id": "test2@${ISOLATED_TEST_ORG_NAME}"
     },
@@ -253,13 +253,13 @@ X-Xss-Protection: 0
       }
     ],
     "type": "USER",
-    "updateTime": "2025-01-16T23:45:52.247648519Z"
+    "updateTime": "2025-01-17T18:51:02.320337735Z"
   }
 }
 
 ---
 
-GET https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/19471824c77?alt=json
+GET https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/${membershipID}?alt=json
 Content-Type: application/json
 User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
 
@@ -277,7 +277,7 @@ X-Xss-Protection: 0
 {
   "createTime": "2024-04-01T12:34:56.123456Z",
   "deliverySetting": "DIGEST",
-  "name": "groups/${groupID}/memberships/19471824c77",
+  "name": "groups/${groupID}/memberships/${membershipID}",
   "preferredMemberKey": {
     "id": "test2@${ISOLATED_TEST_ORG_NAME}"
   },
@@ -295,7 +295,7 @@ X-Xss-Protection: 0
 
 ---
 
-DELETE https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/19471824c77?alt=json
+DELETE https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/${membershipID}?alt=json
 Content-Type: application/json
 User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
 
@@ -316,7 +316,7 @@ X-Xss-Protection: 0
 
 ---
 
-GET https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/19471824c77?alt=json
+GET https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/${membershipID}?alt=json
 Content-Type: application/json
 User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
 
@@ -334,7 +334,7 @@ X-Xss-Protection: 0
 {
   "error": {
     "code": 403,
-    "message": "Error(2017): Permission denied for group resource 'groups/${groupID}/memberships/19471824c77' (or it may not exist).",
+    "message": "Error(2017): Permission denied for group resource 'groups/${groupID}/memberships/${membershipID}' (or it may not exist).",
     "status": "PERMISSION_DENIED"
   }
 }

diff --git a/...drolecloudidentitymembership/_generated_object_addrolecloudidentitymembership.golden.yaml b/...drolecloudidentitymembership/_generated_object_addrolecloudidentitymembership.golden.yaml
@@ -17,7 +17,7 @@ spec:
     name: cloudidentitygroup-${uniqueId}
   preferredMemberKey:
     id: test2@${ISOLATED_TEST_ORG_NAME}
-  resourceID: 19471803a55
+  resourceID: ${membershipID}
   roles:
   - name: MEMBER
   - name: MANAGER

diff --git a/...ic/cloudidentity/v1beta1/cloudidentitymembership/addrolecloudidentitymembership/_http.log b/...ic/cloudidentity/v1beta1/cloudidentitymembership/addrolecloudidentitymembership/_http.log
@@ -155,7 +155,7 @@ X-Xss-Protection: 0
     "@type": "type.googleapis.com/google.apps.cloudidentity.groups.v1beta1.Membership",
     "createTime": "2024-04-01T12:34:56.123456Z",
     "deliverySetting": "DIGEST",
-    "name": "groups/${groupID}/memberships/19471803a55",
+    "name": "groups/${groupID}/memberships/${membershipID}",
     "preferredMemberKey": {
       "id": "test2@${ISOLATED_TEST_ORG_NAME}"
     },
@@ -171,7 +171,7 @@ X-Xss-Protection: 0
 
 ---
 
-GET https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/19471803a55?alt=json
+GET https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/${membershipID}?alt=json
 Content-Type: application/json
 User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
 
@@ -189,7 +189,7 @@ X-Xss-Protection: 0
 {
   "createTime": "2024-04-01T12:34:56.123456Z",
   "deliverySetting": "DIGEST",
-  "name": "groups/${groupID}/memberships/19471803a55",
+  "name": "groups/${groupID}/memberships/${membershipID}",
   "preferredMemberKey": {
     "id": "test2@${ISOLATED_TEST_ORG_NAME}"
   },
@@ -204,7 +204,7 @@ X-Xss-Protection: 0
 
 ---
 
-POST https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/19471803a55:modifyMembershipRoles?alt=json
+POST https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/${membershipID}:modifyMembershipRoles?alt=json
 Content-Type: application/json
 User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
 
@@ -233,9 +233,9 @@ X-Xss-Protection: 0
 
 {
   "membership": {
-    "createTime": "2025-01-16T23:43:36.533190184Z",
+    "createTime": "2025-01-17T18:51:02.320337735Z",
     "deliverySetting": "DIGEST",
-    "name": "groups/${groupID}/memberships/19471803a55",
+    "name": "groups/${groupID}/memberships/${membershipID}",
     "preferredMemberKey": {
       "id": "test2@${ISOLATED_TEST_ORG_NAME}"
     },
@@ -248,13 +248,13 @@ X-Xss-Protection: 0
       }
     ],
     "type": "USER",
-    "updateTime": "2025-01-16T23:43:36.533190184Z"
+    "updateTime": "2025-01-17T18:51:02.320337735Z"
   }
 }
 
 ---
 
-GET https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/19471803a55?alt=json
+GET https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/${membershipID}?alt=json
 Content-Type: application/json
 User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
 
@@ -272,7 +272,7 @@ X-Xss-Protection: 0
 {
   "createTime": "2024-04-01T12:34:56.123456Z",
   "deliverySetting": "DIGEST",
-  "name": "groups/${groupID}/memberships/19471803a55",
+  "name": "groups/${groupID}/memberships/${membershipID}",
   "preferredMemberKey": {
     "id": "test2@${ISOLATED_TEST_ORG_NAME}"
   },
@@ -290,7 +290,7 @@ X-Xss-Protection: 0
 
 ---
 
-DELETE https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/19471803a55?alt=json
+DELETE https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/${membershipID}?alt=json
 Content-Type: application/json
 User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
 
@@ -311,7 +311,7 @@ X-Xss-Protection: 0
 
 ---
 
-GET https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/19471803a55?alt=json
+GET https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/${membershipID}?alt=json
 Content-Type: application/json
 User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
 
@@ -329,7 +329,7 @@ X-Xss-Protection: 0
 {
   "error": {
     "code": 403,
-    "message": "Error(2017): Permission denied for group resource 'groups/${groupID}/memberships/19471803a55' (or it may not exist).",
+    "message": "Error(2017): Permission denied for group resource 'groups/${groupID}/memberships/${membershipID}' (or it may not exist).",
     "status": "PERMISSION_DENIED"
   }
 }

diff --git a/...lecloudidentitymembership/_generated_object_removerolecloudidentitymembership.golden.yaml b/...lecloudidentitymembership/_generated_object_removerolecloudidentitymembership.golden.yaml
@@ -17,7 +17,7 @@ spec:
     name: cloudidentitygroup-${uniqueId}
   preferredMemberKey:
     id: test2@${ISOLATED_TEST_ORG_NAME}
-  resourceID: "19471798744"
+  resourceID: ${membershipID}
   roles:
   - name: MEMBER
 status:

diff --git a/...cloudidentity/v1beta1/cloudidentitymembership/removerolecloudidentitymembership/_http.log b/...cloudidentity/v1beta1/cloudidentitymembership/removerolecloudidentitymembership/_http.log
@@ -158,7 +158,7 @@ X-Xss-Protection: 0
     "@type": "type.googleapis.com/google.apps.cloudidentity.groups.v1beta1.Membership",
     "createTime": "2024-04-01T12:34:56.123456Z",
     "deliverySetting": "DIGEST",
-    "name": "groups/${groupID}/memberships/19471798744",
+    "name": "groups/${groupID}/memberships/${membershipID}",
     "preferredMemberKey": {
       "id": "test2@${ISOLATED_TEST_ORG_NAME}"
     },
@@ -177,7 +177,7 @@ X-Xss-Protection: 0
 
 ---
 
-GET https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/19471798744?alt=json
+GET https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/${membershipID}?alt=json
 Content-Type: application/json
 User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
 
@@ -195,7 +195,7 @@ X-Xss-Protection: 0
 {
   "createTime": "2024-04-01T12:34:56.123456Z",
   "deliverySetting": "DIGEST",
-  "name": "groups/${groupID}/memberships/19471798744",
+  "name": "groups/${groupID}/memberships/${membershipID}",
   "preferredMemberKey": {
     "id": "test2@${ISOLATED_TEST_ORG_NAME}"
   },
@@ -213,7 +213,7 @@ X-Xss-Protection: 0
 
 ---
 
-POST https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/19471798744:modifyMembershipRoles?alt=json
+POST https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/${membershipID}:modifyMembershipRoles?alt=json
 Content-Type: application/json
 User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
 
@@ -238,9 +238,9 @@ X-Xss-Protection: 0
 
 {
   "membership": {
-    "createTime": "2025-01-16T23:36:17.476112624Z",
+    "createTime": "2025-01-17T18:51:02.320337735Z",
     "deliverySetting": "DIGEST",
-    "name": "groups/${groupID}/memberships/19471798744",
+    "name": "groups/${groupID}/memberships/${membershipID}",
     "preferredMemberKey": {
       "id": "test2@${ISOLATED_TEST_ORG_NAME}"
     },
@@ -250,13 +250,13 @@ X-Xss-Protection: 0
       }
     ],
     "type": "USER",
-    "updateTime": "2025-01-16T23:36:17.476112624Z"
+    "updateTime": "2025-01-17T18:51:02.320337735Z"
   }
 }
 
 ---
 
-GET https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/19471798744?alt=json
+GET https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/${membershipID}?alt=json
 Content-Type: application/json
 User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
 
@@ -274,7 +274,7 @@ X-Xss-Protection: 0
 {
   "createTime": "2024-04-01T12:34:56.123456Z",
   "deliverySetting": "DIGEST",
-  "name": "groups/${groupID}/memberships/19471798744",
+  "name": "groups/${groupID}/memberships/${membershipID}",
   "preferredMemberKey": {
     "id": "test2@${ISOLATED_TEST_ORG_NAME}"
   },
@@ -289,7 +289,7 @@ X-Xss-Protection: 0
 
 ---
 
-DELETE https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/19471798744?alt=json
+DELETE https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/${membershipID}?alt=json
 Content-Type: application/json
 User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
 
@@ -310,7 +310,7 @@ X-Xss-Protection: 0
 
 ---
 
-GET https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/19471798744?alt=json
+GET https://cloudidentity.googleapis.com/v1beta1/groups/${groupID}/memberships/${membershipID}?alt=json
 Content-Type: application/json
 User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
 
@@ -328,7 +328,7 @@ X-Xss-Protection: 0
 {
   "error": {
     "code": 403,
-    "message": "Error(2017): Permission denied for group resource 'groups/${groupID}/memberships/19471798744' (or it may not exist).",
+    "message": "Error(2017): Permission denied for group resource 'groups/${groupID}/memberships/${membershipID}' (or it may not exist).",
     "status": "PERMISSION_DENIED"
   }
 }

diff --git a/tests/e2e/normalize.go b/tests/e2e/normalize.go
@@ -185,6 +185,10 @@ func normalizeKRMObject(t *testing.T, u *unstructured.Unstructured, project test
 	// Specific to SecretManager
 	visitor.replacePaths[".expireTime"] = "2024-04-01T12:34:56.123456Z"
 
+	// Specific to CloudIdentityMembership
+	visitor.replacePaths[".membership.createTime"] = "2025-01-17T18:51:02.320337735Z"
+	visitor.replacePaths[".membership.updateTime"] = "2025-01-17T18:51:02.320337735Z"
+
 	// Specific to BigQueryConnectionConnection.
 	visitor.replacePaths[".status.observedState.aws.accessRole.identity"] = "048077221682493034546"
 	visitor.replacePaths[".status.observedState.azure.identity"] = "117243083562690747295"
@@ -340,6 +344,11 @@ func normalizeKRMObject(t *testing.T, u *unstructured.Unstructured, project test
 				visitor.stringTransforms = append(visitor.stringTransforms, func(path string, s string) string {
 					return strings.ReplaceAll(s, resourceID, "${groupID}")
 				})
+
+			case schema.GroupVersionKind{Group: "cloudidentity.cnrm.cloud.google.com", Version: "v1beta1", Kind: "CloudIdentityMembership"}:
+				visitor.stringTransforms = append(visitor.stringTransforms, func(path string, s string) string {
+					return strings.ReplaceAll(s, resourceID, "${membershipID}")
+				})
 			}
 		}
 	}

diff --git a/tests/e2e/replacements.go b/tests/e2e/replacements.go
@@ -134,6 +134,8 @@ func (r *Replacements) placeholderForGCPResource(resource string) string {
 		return "${firewallPolicyID}"
 	case "folders":
 		return "${folderID}"
+	case "memberships":
+		return "${membershipID}"
 	case "sslCertificates":
 		return "${sslCertificateID}"
 	case "serviceAttachments":