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 index ba959abc33..f579e67305 100644 --- 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 index 44ceea58f2..414e885dfa 100644 --- 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 index 480cea25e7..b5b72ddf38 100644 --- 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 } \ No newline at end of file diff --git a/pkg/test/resourcefixture/testdata/basic/logging/v1beta1/logginglogbucket/folderlogbucket/_http.log b/pkg/test/resourcefixture/testdata/basic/logging/v1beta1/logginglogbucket/folderlogbucket/_http.log index d9063092b9..89069097d1 100644 --- a/pkg/test/resourcefixture/testdata/basic/logging/v1beta1/logginglogbucket/folderlogbucket/_http.log +++ b/pkg/test/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/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringdashboard/monitoringdashboardrefs/_http.log b/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringdashboard/monitoringdashboardrefs/_http.log index 4d86ceace5..c055117bfe 100644 --- a/pkg/test/resourcefixture/testdata/basic/monitoring/v1beta1/monitoringdashboard/monitoringdashboardrefs/_http.log +++ b/pkg/test/resourcefixture/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}", diff --git a/pkg/test/resourcefixture/testdata/basic/privilegedaccessmanager/v1alpha1/privilegedaccessmanagerentitlement/privilegedaccessmanagerentitlementfullfolder/_http.log b/pkg/test/resourcefixture/testdata/basic/privilegedaccessmanager/v1alpha1/privilegedaccessmanagerentitlement/privilegedaccessmanagerentitlementfullfolder/_http.log index 1706aeef78..1d9cb80441 100644 --- a/pkg/test/resourcefixture/testdata/basic/privilegedaccessmanager/v1alpha1/privilegedaccessmanagerentitlement/privilegedaccessmanagerentitlementfullfolder/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/privilegedaccessmanager/v1alpha1/privilegedaccessmanagerentitlement/privilegedaccessmanagerentitlementfullfolder/_http.log @@ -175,7 +175,7 @@ X-Xss-Protection: 0 GET https://privilegedaccessmanager.googleapis.com/v1/folders/${folderID}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json User-Agent: kcc/controller-manager -x-goog-request-params: name=folders%2F${testFolderId}%2Flocations%2Fglobal%2Fentitlements%2Fprivilegedaccessmanagerentitlement-${uniqueId} +x-goog-request-params: name=folders%2F${folderID}%2Flocations%2Fglobal%2Fentitlements%2Fprivilegedaccessmanagerentitlement-${uniqueId} 404 Not Found Cache-Control: private @@ -191,7 +191,7 @@ X-Xss-Protection: 0 { "error": { "code": 404, - "message": "Resource 'folders/${testFolderId}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}' was not found", + "message": "Resource 'folders/${folderID}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}' was not found", "status": "NOT_FOUND" } } @@ -201,7 +201,7 @@ X-Xss-Protection: 0 POST https://privilegedaccessmanager.googleapis.com/v1/folders/${folderID}/locations/global/entitlements?%24alt=json%3Benum-encoding%3Dint&entitlementId=privilegedaccessmanagerentitlement-${uniqueId} Content-Type: application/json User-Agent: kcc/controller-manager -x-goog-request-params: parent=folders%2F${testFolderId}%2Flocations%2Fglobal +x-goog-request-params: parent=folders%2F${folderID}%2Flocations%2Fglobal { "additionalNotificationTargets": { @@ -242,7 +242,7 @@ x-goog-request-params: parent=folders%2F${testFolderId}%2Flocations%2Fglobal "maxRequestDuration": "1800s", "privilegedAccess": { "gcpIamAccess": { - "resource": "//cloudresourcemanager.googleapis.com/folders/${testFolderId}", + "resource": "//cloudresourcemanager.googleapis.com/folders/${folderID}", "resourceType": "cloudresourcemanager.googleapis.com/Folder", "roleBindings": [ { @@ -275,10 +275,10 @@ X-Xss-Protection: 0 "apiVersion": "v1", "createTime": "2024-04-01T12:34:56.123456Z", "requestedCancellation": false, - "target": "folders/${testFolderId}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}", + "target": "folders/${folderID}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}", "verb": "create" }, - "name": "folders/${testFolderId}/locations/global/operations/${operationID}" + "name": "folders/${folderID}/locations/global/operations/${operationID}" } --- @@ -286,7 +286,7 @@ X-Xss-Protection: 0 GET https://privilegedaccessmanager.googleapis.com/v1/folders/${folderID}/locations/global/operations/${operationID} Content-Type: application/json User-Agent: kcc/controller-manager -x-goog-request-params: name=folders%2F${testFolderId}%2Flocations%2Fglobal%2Foperations%2F${operationID} +x-goog-request-params: name=folders%2F${folderID}%2Flocations%2Fglobal%2Foperations%2F${operationID} 200 OK Cache-Control: private @@ -307,10 +307,10 @@ X-Xss-Protection: 0 "createTime": "2024-04-01T12:34:56.123456Z", "endTime": "2024-04-01T12:34:56.123456Z", "requestedCancellation": false, - "target": "folders/${testFolderId}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}", + "target": "folders/${folderID}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}", "verb": "create" }, - "name": "folders/${testFolderId}/locations/global/operations/${operationID}", + "name": "folders/${folderID}/locations/global/operations/${operationID}", "response": { "@type": "type.googleapis.com/google.cloud.privilegedaccessmanager.v1.Entitlement", "additionalNotificationTargets": { @@ -351,10 +351,10 @@ X-Xss-Protection: 0 ], "etag": "abcdef0123A=", "maxRequestDuration": "1800s", - "name": "folders/${testFolderId}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}", + "name": "folders/${folderID}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}", "privilegedAccess": { "gcpIamAccess": { - "resource": "//cloudresourcemanager.googleapis.com/folders/${testFolderId}", + "resource": "//cloudresourcemanager.googleapis.com/folders/${folderID}", "resourceType": "cloudresourcemanager.googleapis.com/Folder", "roleBindings": [ { @@ -377,7 +377,7 @@ X-Xss-Protection: 0 GET https://privilegedaccessmanager.googleapis.com/v1/folders/${folderID}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json User-Agent: kcc/controller-manager -x-goog-request-params: name=folders%2F${testFolderId}%2Flocations%2Fglobal%2Fentitlements%2Fprivilegedaccessmanagerentitlement-${uniqueId} +x-goog-request-params: name=folders%2F${folderID}%2Flocations%2Fglobal%2Fentitlements%2Fprivilegedaccessmanagerentitlement-${uniqueId} 200 OK Cache-Control: private @@ -429,10 +429,10 @@ X-Xss-Protection: 0 ], "etag": "abcdef0123A=", "maxRequestDuration": "1800s", - "name": "folders/${testFolderId}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}", + "name": "folders/${folderID}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}", "privilegedAccess": { "gcpIamAccess": { - "resource": "//cloudresourcemanager.googleapis.com/folders/${testFolderId}", + "resource": "//cloudresourcemanager.googleapis.com/folders/${folderID}", "resourceType": "cloudresourcemanager.googleapis.com/Folder", "roleBindings": [ { @@ -454,7 +454,7 @@ X-Xss-Protection: 0 PATCH https://privilegedaccessmanager.googleapis.com/v1/folders/${folderID}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}?%24alt=json%3Benum-encoding%3Dint&updateMask=additionalNotificationTargets%2CapprovalWorkflow%2CeligibleUsers%2CmaxRequestDuration%2CprivilegedAccess Content-Type: application/json User-Agent: kcc/controller-manager -x-goog-request-params: entitlement.name=folders%2F${testFolderId}%2Flocations%2Fglobal%2Fentitlements%2Fprivilegedaccessmanagerentitlement-${uniqueId} +x-goog-request-params: entitlement.name=folders%2F${folderID}%2Flocations%2Fglobal%2Fentitlements%2Fprivilegedaccessmanagerentitlement-${uniqueId} { "additionalNotificationTargets": { @@ -495,10 +495,10 @@ x-goog-request-params: entitlement.name=folders%2F${testFolderId}%2Flocations%2F ], "etag": "abcdef0123A=", "maxRequestDuration": "3600s", - "name": "folders/${testFolderId}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}", + "name": "folders/${folderID}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}", "privilegedAccess": { "gcpIamAccess": { - "resource": "//cloudresourcemanager.googleapis.com/folders/${testFolderId}", + "resource": "//cloudresourcemanager.googleapis.com/folders/${folderID}", "resourceType": "cloudresourcemanager.googleapis.com/Folder", "roleBindings": [ { @@ -531,10 +531,10 @@ X-Xss-Protection: 0 "apiVersion": "v1", "createTime": "2024-04-01T12:34:56.123456Z", "requestedCancellation": false, - "target": "folders/${testFolderId}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}", + "target": "folders/${folderID}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}", "verb": "update" }, - "name": "folders/${testFolderId}/locations/global/operations/${operationID}" + "name": "folders/${folderID}/locations/global/operations/${operationID}" } --- @@ -542,7 +542,7 @@ X-Xss-Protection: 0 GET https://privilegedaccessmanager.googleapis.com/v1/folders/${folderID}/locations/global/operations/${operationID} Content-Type: application/json User-Agent: kcc/controller-manager -x-goog-request-params: name=folders%2F${testFolderId}%2Flocations%2Fglobal%2Foperations%2F${operationID} +x-goog-request-params: name=folders%2F${folderID}%2Flocations%2Fglobal%2Foperations%2F${operationID} 200 OK Cache-Control: private @@ -563,10 +563,10 @@ X-Xss-Protection: 0 "createTime": "2024-04-01T12:34:56.123456Z", "endTime": "2024-04-01T12:34:56.123456Z", "requestedCancellation": false, - "target": "folders/${testFolderId}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}", + "target": "folders/${folderID}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}", "verb": "update" }, - "name": "folders/${testFolderId}/locations/global/operations/${operationID}", + "name": "folders/${folderID}/locations/global/operations/${operationID}", "response": { "@type": "type.googleapis.com/google.cloud.privilegedaccessmanager.v1.Entitlement", "additionalNotificationTargets": { @@ -608,10 +608,10 @@ X-Xss-Protection: 0 ], "etag": "abcdef0123A=", "maxRequestDuration": "3600s", - "name": "folders/${testFolderId}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}", + "name": "folders/${folderID}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}", "privilegedAccess": { "gcpIamAccess": { - "resource": "//cloudresourcemanager.googleapis.com/folders/${testFolderId}", + "resource": "//cloudresourcemanager.googleapis.com/folders/${folderID}", "resourceType": "cloudresourcemanager.googleapis.com/Folder", "roleBindings": [ { @@ -634,7 +634,7 @@ X-Xss-Protection: 0 GET https://privilegedaccessmanager.googleapis.com/v1/folders/${folderID}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json User-Agent: kcc/controller-manager -x-goog-request-params: name=folders%2F${testFolderId}%2Flocations%2Fglobal%2Fentitlements%2Fprivilegedaccessmanagerentitlement-${uniqueId} +x-goog-request-params: name=folders%2F${folderID}%2Flocations%2Fglobal%2Fentitlements%2Fprivilegedaccessmanagerentitlement-${uniqueId} 200 OK Cache-Control: private @@ -687,10 +687,10 @@ X-Xss-Protection: 0 ], "etag": "abcdef0123A=", "maxRequestDuration": "3600s", - "name": "folders/${testFolderId}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}", + "name": "folders/${folderID}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}", "privilegedAccess": { "gcpIamAccess": { - "resource": "//cloudresourcemanager.googleapis.com/folders/${testFolderId}", + "resource": "//cloudresourcemanager.googleapis.com/folders/${folderID}", "resourceType": "cloudresourcemanager.googleapis.com/Folder", "roleBindings": [ { @@ -712,7 +712,7 @@ X-Xss-Protection: 0 DELETE https://privilegedaccessmanager.googleapis.com/v1/folders/${folderID}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}?%24alt=json%3Benum-encoding%3Dint Content-Type: application/json User-Agent: kcc/controller-manager -x-goog-request-params: name=folders%2F${testFolderId}%2Flocations%2Fglobal%2Fentitlements%2Fprivilegedaccessmanagerentitlement-${uniqueId} +x-goog-request-params: name=folders%2F${folderID}%2Flocations%2Fglobal%2Fentitlements%2Fprivilegedaccessmanagerentitlement-${uniqueId} 200 OK Cache-Control: private @@ -732,10 +732,10 @@ X-Xss-Protection: 0 "apiVersion": "v1", "createTime": "2024-04-01T12:34:56.123456Z", "requestedCancellation": false, - "target": "folders/${testFolderId}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}", + "target": "folders/${folderID}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}", "verb": "delete" }, - "name": "folders/${testFolderId}/locations/global/operations/${operationID}" + "name": "folders/${folderID}/locations/global/operations/${operationID}" } --- @@ -743,7 +743,7 @@ X-Xss-Protection: 0 GET https://privilegedaccessmanager.googleapis.com/v1/folders/${folderID}/locations/global/operations/${operationID} Content-Type: application/json User-Agent: kcc/controller-manager -x-goog-request-params: name=folders%2F${testFolderId}%2Flocations%2Fglobal%2Foperations%2F${operationID} +x-goog-request-params: name=folders%2F${folderID}%2Flocations%2Fglobal%2Foperations%2F${operationID} 200 OK Cache-Control: private @@ -764,10 +764,10 @@ X-Xss-Protection: 0 "createTime": "2024-04-01T12:34:56.123456Z", "endTime": "2024-04-01T12:34:56.123456Z", "requestedCancellation": false, - "target": "folders/${testFolderId}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}", + "target": "folders/${folderID}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}", "verb": "delete" }, - "name": "folders/${testFolderId}/locations/global/operations/${operationID}", + "name": "folders/${folderID}/locations/global/operations/${operationID}", "response": { "@type": "type.googleapis.com/google.cloud.privilegedaccessmanager.v1.Entitlement", "additionalNotificationTargets": { @@ -809,10 +809,10 @@ X-Xss-Protection: 0 ], "etag": "abcdef0123A=", "maxRequestDuration": "3600s", - "name": "folders/${testFolderId}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}", + "name": "folders/${folderID}/locations/global/entitlements/privilegedaccessmanagerentitlement-${uniqueId}", "privilegedAccess": { "gcpIamAccess": { - "resource": "//cloudresourcemanager.googleapis.com/folders/${testFolderId}", + "resource": "//cloudresourcemanager.googleapis.com/folders/${folderID}", "resourceType": "cloudresourcemanager.googleapis.com/Folder", "roleBindings": [ { diff --git a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/folder/folderinfolder/_http.log b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/folder/folderinfolder/_http.log index 143e920b14..99bc4df5ae 100644 --- a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/folder/folderinfolder/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/folder/folderinfolder/_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%22KCC+${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%22KCC+${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": "KCC ${uniqueId}", - "parent": "folders/${testFolderId}" + "parent": "folders/${folderID}" } 200 OK @@ -66,7 +66,7 @@ X-Xss-Protection: 0 "displayName": "KCC ${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": "KCC ${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": "KCC ${uniqueId}", "etag": "abcdef0123A=", "name": "folders/${folderID}", - "parent": "folders/${testFolderId}", + "parent": "folders/${folderID}", "state": "ACTIVE", "updateTime": "2024-04-01T12:34:56.123456Z" } @@ -178,7 +178,7 @@ X-Xss-Protection: 0 "displayName": "KCC-2 ${uniqueId}", "etag": "abcdef0123A=", "name": "folders/${folderID}", - "parent": "folders/${testFolderId}", + "parent": "folders/${folderID}", "state": "ACTIVE", "updateTime": "2024-04-01T12:34:56.123456Z" } @@ -207,7 +207,7 @@ X-Xss-Protection: 0 "displayName": "KCC-2 ${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/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/folder/foldermovedfoldertofolder/_http.log b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/folder/foldermovedfoldertofolder/_http.log index cb56b36a61..78d2156e00 100644 --- a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/folder/foldermovedfoldertofolder/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/folder/foldermovedfoldertofolder/_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%22KCC+${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%22KCC+${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": "KCC ${uniqueId}", - "parent": "folders/${testFolderId}" + "parent": "folders/${folderID}" } 200 OK @@ -66,7 +66,7 @@ X-Xss-Protection: 0 "displayName": "KCC ${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": "KCC ${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": "KCC ${uniqueId}", "etag": "abcdef0123A=", "name": "folders/${folderID}", - "parent": "folders/${testFolderId}", + "parent": "folders/${folderID}", "state": "ACTIVE", "updateTime": "2024-04-01T12:34:56.123456Z" } diff --git a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinfolder/_http.log b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinfolder/_http.log index b6c1576e13..3f86fb9237 100644 --- a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinfolder/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinfolder/_http.log @@ -33,7 +33,7 @@ User-Agent: google-api-go-client/0.5 Terraform/ (+https://www.terraform.io) Terr }, "name": "KCC ${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}" @@ -87,7 +87,7 @@ X-Xss-Protection: 0 "managed-by-cnrm": "true" }, "name": "projects/${projectNumber}", - "parent": "folders/${testFolderId}", + "parent": "folders/${folderID}", "projectId": "project-${uniqueId}", "state": "ACTIVE" } @@ -118,7 +118,7 @@ X-Xss-Protection: 0 "lifecycleState": "ACTIVE", "name": "KCC ${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}", @@ -173,7 +173,7 @@ X-Xss-Protection: 0 "lifecycleState": "ACTIVE", "name": "KCC ${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}", @@ -228,7 +228,7 @@ X-Xss-Protection: 0 "lifecycleState": "ACTIVE", "name": "KCC ${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}", @@ -283,7 +283,7 @@ X-Xss-Protection: 0 "lifecycleState": "ACTIVE", "name": "KCC ${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}", @@ -305,7 +305,7 @@ User-Agent: google-api-go-client/0.5 Terraform/ (+https://www.terraform.io) Terr "lifecycleState": "ACTIVE", "name": "KCC-2 ${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}", @@ -332,7 +332,7 @@ X-Xss-Protection: 0 "lifecycleState": "ACTIVE", "name": "projects/project-${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}", @@ -355,7 +355,7 @@ User-Agent: google-api-go-client/0.5 Terraform/ (+https://www.terraform.io) Terr "lifecycleState": "ACTIVE", "name": "projects/project-${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}", @@ -383,7 +383,7 @@ X-Xss-Protection: 0 "lifecycleState": "ACTIVE", "name": "projects/project-${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}", @@ -416,7 +416,7 @@ X-Xss-Protection: 0 "lifecycleState": "ACTIVE", "name": "projects/project-${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}", @@ -472,7 +472,7 @@ X-Xss-Protection: 0 "lifecycleState": "ACTIVE", "name": "projects/project-${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}", diff --git a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectmovedfoldertofolder/_http.log b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectmovedfoldertofolder/_http.log index eb3f58b115..4ef8d5f579 100644 --- a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectmovedfoldertofolder/_http.log +++ b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectmovedfoldertofolder/_http.log @@ -33,7 +33,7 @@ User-Agent: google-api-go-client/0.5 Terraform/ (+https://www.terraform.io) Terr }, "name": "KCC ${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}" @@ -87,7 +87,7 @@ X-Xss-Protection: 0 "managed-by-cnrm": "true" }, "name": "projects/${projectNumber}", - "parent": "folders/${testFolderId}", + "parent": "folders/${folderID}", "projectId": "project-${uniqueId}", "state": "ACTIVE" } @@ -118,7 +118,7 @@ X-Xss-Protection: 0 "lifecycleState": "ACTIVE", "name": "KCC ${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}", @@ -173,7 +173,7 @@ X-Xss-Protection: 0 "lifecycleState": "ACTIVE", "name": "KCC ${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}", @@ -228,7 +228,7 @@ X-Xss-Protection: 0 "lifecycleState": "ACTIVE", "name": "KCC ${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}", @@ -283,7 +283,7 @@ X-Xss-Protection: 0 "lifecycleState": "ACTIVE", "name": "KCC ${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}", @@ -332,7 +332,7 @@ X-Xss-Protection: 0 "lifecycleState": "ACTIVE", "name": "projects/project-${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}", @@ -364,7 +364,7 @@ X-Xss-Protection: 0 "lifecycleState": "ACTIVE", "name": "projects/project-${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}", @@ -419,7 +419,7 @@ X-Xss-Protection: 0 "lifecycleState": "ACTIVE", "name": "projects/project-${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}", diff --git a/pkg/test/resourcefixture/testdata/containerannotations/folderid/_http.log b/pkg/test/resourcefixture/testdata/containerannotations/folderid/_http.log index b69fe65d26..29016a0786 100644 --- a/pkg/test/resourcefixture/testdata/containerannotations/folderid/_http.log +++ b/pkg/test/resourcefixture/testdata/containerannotations/folderid/_http.log @@ -33,7 +33,7 @@ User-Agent: google-api-go-client/0.5 Terraform/ (+https://www.terraform.io) Terr }, "name": "KCC ${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}" @@ -87,7 +87,7 @@ X-Xss-Protection: 0 "managed-by-cnrm": "true" }, "name": "projects/${projectNumber}", - "parent": "folders/${testFolderId}", + "parent": "folders/${folderID}", "projectId": "project-${uniqueId}", "state": "ACTIVE" } @@ -118,7 +118,7 @@ X-Xss-Protection: 0 "lifecycleState": "ACTIVE", "name": "KCC ${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}", @@ -173,7 +173,7 @@ X-Xss-Protection: 0 "lifecycleState": "ACTIVE", "name": "KCC ${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}", @@ -228,7 +228,7 @@ X-Xss-Protection: 0 "lifecycleState": "ACTIVE", "name": "KCC ${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}", @@ -283,7 +283,7 @@ X-Xss-Protection: 0 "lifecycleState": "ACTIVE", "name": "KCC ${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}", @@ -305,7 +305,7 @@ User-Agent: google-api-go-client/0.5 Terraform/ (+https://www.terraform.io) Terr "lifecycleState": "ACTIVE", "name": "KCC-2 ${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}", @@ -332,7 +332,7 @@ X-Xss-Protection: 0 "lifecycleState": "ACTIVE", "name": "projects/project-${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}", @@ -364,7 +364,7 @@ X-Xss-Protection: 0 "lifecycleState": "ACTIVE", "name": "projects/project-${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}", @@ -419,7 +419,7 @@ X-Xss-Protection: 0 "lifecycleState": "ACTIVE", "name": "projects/project-${uniqueId}", "parent": { - "id": "${testFolderId}", + "id": "${folderID}", "type": "folder" }, "projectId": "project-${uniqueId}", diff --git a/tests/e2e/unified_test.go b/tests/e2e/unified_test.go index f43adbcef5..3436857df5 100644 --- a/tests/e2e/unified_test.go +++ b/tests/e2e/unified_test.go @@ -901,7 +901,7 @@ func runScenario(ctx context.Context, t *testing.T, testPause bool, fixture reso normalizers = append(normalizers, ReplaceString(project.ProjectID, "${projectId}")) normalizers = append(normalizers, ReplaceString(fmt.Sprintf("%d", project.ProjectNumber), "${projectNumber}")) if testgcp.TestFolderID.Get() != "" { - normalizers = append(normalizers, ReplaceString(testgcp.TestFolderID.Get(), "${testFolderId}")) + normalizers = append(normalizers, ReplaceString(testgcp.TestFolderID.Get(), "${folderID}")) } if organizationID := testgcp.TestOrgID.Get(); organizationID != "" { normalizers = append(normalizers, ReplaceString("organizations/"+organizationID, "organizations/${organizationID}"))