Merge pull request GoogleCloudPlatform#3039 from justinsb/tests_norma…

…lize_folder_replacement tests: switch placeholder from testFolderId -> folderID
xiaoweim · Oct 31, 2024 · b090f61 · b090f61
2 parents 2f8dd4f + 102f16f
commit b090f61
Show file tree

Hide file tree

Showing 12 changed files with 108 additions and 108 deletions.
diff --git a/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeature/acmfeature/_http.log b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeature/acmfeature/_http.log
@@ -109,7 +109,7 @@ User-Agent: google-api-go-client/0.5 Terraform/ (+https://www.terraform.io) Terr
   "lifecycleState": "ACTIVE",
   "name": "projects/${projectId}",
   "parent": {
-    "id": "${testFolderId}",
+    "id": "${folderID}",
     "type": "folder"
   },
   "projectId": "${projectId}",

diff --git a/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeature/mcsdfeature/_http.log b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeature/mcsdfeature/_http.log
@@ -109,7 +109,7 @@ User-Agent: google-api-go-client/0.5 Terraform/ (+https://www.terraform.io) Terr
   "lifecycleState": "ACTIVE",
   "name": "projects/${projectId}",
   "parent": {
-    "id": "${testFolderId}",
+    "id": "${folderID}",
     "type": "folder"
   },
   "projectId": "${projectId}",

diff --git a/pkg/test/resourcefixture/testdata/basic/kms/v1alpha1/kmsautokeyconfig/_http.log b/pkg/test/resourcefixture/testdata/basic/kms/v1alpha1/kmsautokeyconfig/_http.log
@@ -1,7 +1,7 @@
-GET https://cloudkms.googleapis.com/v1/folders/${testFolderId}/autokeyConfig?%24alt=json%3Benum-encoding%3Dint
+GET https://cloudkms.googleapis.com/v1/folders/${folderID}/autokeyConfig?%24alt=json%3Benum-encoding%3Dint
 Content-Type: application/json
 User-Agent: kcc/controller-manager
-x-goog-request-params: name=folders%2F${testFolderId}%2FautokeyConfig
+x-goog-request-params: name=folders%2F${folderID}%2FautokeyConfig
 
 200 OK
 Cache-Control: private
@@ -20,14 +20,14 @@ X-Xss-Protection: 0
 
 ---
 
-PATCH https://cloudkms.googleapis.com/v1/folders/${testFolderId}/autokeyConfig?%24alt=json%3Benum-encoding%3Dint&updateMask=keyProject
+PATCH https://cloudkms.googleapis.com/v1/folders/${folderID}/autokeyConfig?%24alt=json%3Benum-encoding%3Dint&updateMask=keyProject
 Content-Type: application/json
 User-Agent: kcc/controller-manager
-x-goog-request-params: autokey_config.name=folders%2F${testFolderId}%2FautokeyConfig
+x-goog-request-params: autokey_config.name=folders%2F${folderID}%2FautokeyConfig
 
 {
   "keyProject": "projects/${uniqueId}",
-  "name": "folders/${testFolderId}/autokeyConfig"
+  "name": "folders/${folderID}/autokeyConfig"
 }
 
 200 OK
@@ -43,16 +43,16 @@ X-Xss-Protection: 0
 
 {
   "keyProject": "projects/${uniqueId}",
-  "name": "folders/${testFolderId}/autokeyConfig",
+  "name": "folders/${folderID}/autokeyConfig",
   "state": 1
 }
 
 ---
 
-GET https://cloudkms.googleapis.com/v1/folders/${testFolderId}/autokeyConfig?%24alt=json%3Benum-encoding%3Dint
+GET https://cloudkms.googleapis.com/v1/folders/${folderID}/autokeyConfig?%24alt=json%3Benum-encoding%3Dint
 Content-Type: application/json
 User-Agent: kcc/controller-manager
-x-goog-request-params: name=folders%2F${testFolderId}%2FautokeyConfig
+x-goog-request-params: name=folders%2F${folderID}%2FautokeyConfig
 
 200 OK
 Cache-Control: private
@@ -67,20 +67,20 @@ X-Xss-Protection: 0
 
 {
   "keyProject": "projects/${uniqueId}",
-  "name": "folders/${testFolderId}/autokeyConfig",
+  "name": "folders/${folderID}/autokeyConfig",
   "state": 1
 }
 
 ---
 
-PATCH https://cloudkms.googleapis.com/v1/folders/${testFolderId}/autokeyConfig?%24alt=json%3Benum-encoding%3Dint&updateMask=keyProject
+PATCH https://cloudkms.googleapis.com/v1/folders/${folderID}/autokeyConfig?%24alt=json%3Benum-encoding%3Dint&updateMask=keyProject
 Content-Type: application/json
 User-Agent: kcc/controller-manager
-x-goog-request-params: autokey_config.name=folders%2F${testFolderId}%2FautokeyConfig
+x-goog-request-params: autokey_config.name=folders%2F${folderID}%2FautokeyConfig
 
 {
   "keyProject": "projects/diff-{uniqueId}",
-  "name": "folders/${testFolderId}/autokeyConfig"
+  "name": "folders/${folderID}/autokeyConfig"
 }
 
 200 OK
@@ -96,16 +96,16 @@ X-Xss-Protection: 0
 
 {
   "keyProject": "projects/diff-{uniqueId}",
-  "name": "folders/${testFolderId}/autokeyConfig",
+  "name": "folders/${folderID}/autokeyConfig",
   "state": 1
 }
 
 ---
 
-GET https://cloudkms.googleapis.com/v1/folders/${testFolderId}/autokeyConfig?%24alt=json%3Benum-encoding%3Dint
+GET https://cloudkms.googleapis.com/v1/folders/${folderID}/autokeyConfig?%24alt=json%3Benum-encoding%3Dint
 Content-Type: application/json
 User-Agent: kcc/controller-manager
-x-goog-request-params: name=folders%2F${testFolderId}%2FautokeyConfig
+x-goog-request-params: name=folders%2F${folderID}%2FautokeyConfig
 
 200 OK
 Cache-Control: private
@@ -120,6 +120,6 @@ X-Xss-Protection: 0
 
 {
   "keyProject": "projects/diff-{uniqueId}",
-  "name": "folders/${testFolderId}/autokeyConfig",
+  "name": "folders/${folderID}/autokeyConfig",
   "state": 1
 }
diff --git a/...resourcefixture/testdata/basic/logging/v1beta1/logginglogbucket/folderlogbucket/_http.log b/...resourcefixture/testdata/basic/logging/v1beta1/logginglogbucket/folderlogbucket/_http.log
@@ -1,4 +1,4 @@
-GET https://cloudresourcemanager.googleapis.com/v3/folders:search?alt=json&pageToken=&prettyPrint=false&query=state%3DACTIVE+AND+parent%3Dfolders%2F${testFolderId}+AND+displayName%3D%22Bucket+${uniqueId}%22
+GET https://cloudresourcemanager.googleapis.com/v3/folders:search?alt=json&pageToken=&prettyPrint=false&query=state%3DACTIVE+AND+parent%3Dfolders%2F${folderID}+AND+displayName%3D%22Bucket+${uniqueId}%22
 User-Agent: google-api-go-client/0.5 Terraform/ (+https://www.terraform.io) Terraform-Plugin-SDK/2.10.1 terraform-provider-google-beta/kcc/controller-manager
 
 200 OK
@@ -22,7 +22,7 @@ User-Agent: google-api-go-client/0.5 Terraform/ (+https://www.terraform.io) Terr
 
 {
   "displayName": "Bucket ${uniqueId}",
-  "parent": "folders/${testFolderId}"
+  "parent": "folders/${folderID}"
 }
 
 200 OK
@@ -66,7 +66,7 @@ X-Xss-Protection: 0
     "displayName": "Bucket ${uniqueId}",
     "etag": "abcdef0123A=",
     "name": "folders/${folderID}",
-    "parent": "folders/${testFolderId}",
+    "parent": "folders/${folderID}",
     "state": "ACTIVE",
     "updateTime": "2024-04-01T12:34:56.123456Z"
   }
@@ -97,7 +97,7 @@ X-Xss-Protection: 0
     "displayName": "Bucket ${uniqueId}",
     "etag": "abcdef0123A=",
     "name": "folders/${folderID}",
-    "parent": "folders/${testFolderId}",
+    "parent": "folders/${folderID}",
     "state": "ACTIVE",
     "updateTime": "2024-04-01T12:34:56.123456Z"
   }
@@ -124,7 +124,7 @@ X-Xss-Protection: 0
   "displayName": "Bucket ${uniqueId}",
   "etag": "abcdef0123A=",
   "name": "folders/${folderID}",
-  "parent": "folders/${testFolderId}",
+  "parent": "folders/${folderID}",
   "state": "ACTIVE",
   "updateTime": "2024-04-01T12:34:56.123456Z"
 }
@@ -282,7 +282,7 @@ X-Xss-Protection: 0
   "displayName": "Bucket ${uniqueId}",
   "etag": "abcdef0123A=",
   "name": "folders/${folderID}",
-  "parent": "folders/${testFolderId}",
+  "parent": "folders/${folderID}",
   "state": "ACTIVE",
   "updateTime": "2024-04-01T12:34:56.123456Z"
 }
@@ -311,7 +311,7 @@ X-Xss-Protection: 0
     "displayName": "Bucket ${uniqueId}",
     "etag": "abcdef0123A=",
     "name": "folders/${folderID}",
-    "parent": "folders/${testFolderId}",
+    "parent": "folders/${folderID}",
     "state": "DELETE_REQUESTED",
     "updateTime": "2024-04-01T12:34:56.123456Z"
   }

diff --git a/...e/testdata/basic/monitoring/v1beta1/monitoringdashboard/monitoringdashboardrefs/_http.log b/...e/testdata/basic/monitoring/v1beta1/monitoringdashboard/monitoringdashboardrefs/_http.log
@@ -33,7 +33,7 @@ User-Agent: google-api-go-client/0.5 Terraform/ (+https://www.terraform.io) Terr
   },
   "name": "A monitored project",
   "parent": {
-    "id": "${testFolderId}",
+    "id": "${folderID}",
     "type": "folder"
   },
   "projectId": "other${uniqueId}"
@@ -87,7 +87,7 @@ X-Xss-Protection: 0
       "managed-by-cnrm": "true"
     },
     "name": "projects/${projectNumber}",
-    "parent": "folders/${testFolderId}",
+    "parent": "folders/${folderID}",
     "projectId": "other${uniqueId}",
     "state": "ACTIVE"
   }
@@ -118,7 +118,7 @@ X-Xss-Protection: 0
   "lifecycleState": "ACTIVE",
   "name": "A monitored project",
   "parent": {
-    "id": "${testFolderId}",
+    "id": "${folderID}",
     "type": "folder"
   },
   "projectId": "other${uniqueId}",
@@ -1028,7 +1028,7 @@ X-Xss-Protection: 0
   "lifecycleState": "ACTIVE",
   "name": "A monitored project",
   "parent": {
-    "id": "${testFolderId}",
+    "id": "${folderID}",
     "type": "folder"
   },
   "projectId": "other${uniqueId}",