From de7252ddc58b51780174a2fc6da5dbac2591c4cc Mon Sep 17 00:00:00 2001 From: Gemma Hou Date: Wed, 31 Jan 2024 03:16:34 +0000 Subject: [PATCH 1/2] recover disabled integration test-update test yaml --- .../compute_v1beta1_computesubnetwork.yaml | 2 +- pkg/test/controller/k8s.go | 2 ++ pkg/test/gcp/gcp.go | 6 +++++ .../apigeeorganization/dependencies.yaml | 7 +++++- .../dependencies.yaml | 5 ++++- .../create.yaml | 2 +- .../dependencies.yaml | 11 ++++++---- .../update.yaml | 2 +- .../create.yaml | 2 +- .../dependencies.yaml | 11 ++++++---- .../update.yaml | 2 +- .../computeprojectmetadata/create.yaml | 2 +- .../computeprojectmetadata/dependencies.yaml | 12 ++++++---- .../computeprojectmetadata/update.yaml | 2 +- .../create.yaml | 4 ++-- .../dependencies.yaml | 17 ++++++++------ .../dependencies.yaml | 17 ++++++++------ .../create.yaml | 2 +- .../dependencies.yaml | 22 ++++++++++++++----- .../dependencies.yaml | 7 ++++-- .../bigqueryjobtrigger/dependencies.yaml | 5 ++++- .../acmfeature/dependencies.yaml | 13 ++++++----- .../mcsdfeature/dependencies.yaml | 13 ++++++----- .../basic/iap/v1beta1/iapbrand/create.yaml | 2 +- .../iap/v1beta1/iapbrand/dependencies.yaml | 8 ++++--- .../project/projectinfolder/create.yaml | 2 -- .../project/projectinfolder/update.yaml | 2 -- .../v1beta1/project/projectinorg/create.yaml | 2 -- .../v1beta1/project/projectinorg/update.yaml | 2 -- .../projectmovedfoldertofolder/create.yaml | 2 -- .../projectmovedfoldertofolder/update.yaml | 2 -- .../projectorgpolicy/dependencies.yaml | 5 ++++- .../containerannotations/folderid/create.yaml | 2 -- .../containerannotations/folderid/update.yaml | 2 -- .../create.yaml | 2 -- .../update.yaml | 2 -- .../dependencies.yaml | 2 -- .../computeregionnetworkendpointgroup.md | 2 +- 38 files changed, 122 insertions(+), 85 deletions(-) diff --git a/config/samples/resources/computeregionnetworkendpointgroup/private-service-connection-region-network-endpoint-group/compute_v1beta1_computesubnetwork.yaml b/config/samples/resources/computeregionnetworkendpointgroup/private-service-connection-region-network-endpoint-group/compute_v1beta1_computesubnetwork.yaml index ab6f735c1e..6d390c57bb 100644 --- a/config/samples/resources/computeregionnetworkendpointgroup/private-service-connection-region-network-endpoint-group/compute_v1beta1_computesubnetwork.yaml +++ b/config/samples/resources/computeregionnetworkendpointgroup/private-service-connection-region-network-endpoint-group/compute_v1beta1_computesubnetwork.yaml @@ -21,7 +21,7 @@ metadata: cnrm.cloud.google.com/project-id: ${PROJECT_ID?} spec: region: us-west3 - ipCidrRange: 10.2.0.0/16 + ipCidrRange: 10.180.0.0/10 networkRef: name: computeregionnetworkendpointgroup-dep-psc purpose: PRIVATE_SERVICE_CONNECT diff --git a/pkg/test/controller/k8s.go b/pkg/test/controller/k8s.go index 012035d26a..57b57447c4 100644 --- a/pkg/test/controller/k8s.go +++ b/pkg/test/controller/k8s.go @@ -160,7 +160,9 @@ func ReplaceTestVars(t *testing.T, b []byte, uniqueId string, project testgcp.GC s = strings.Replace(s, fmt.Sprintf("projects/${%s}", testgcp.TestDependentOrgProjectId), fmt.Sprintf("projects/%s", testgcp.GetDependentOrgProjectID(t)), -1) s = strings.Replace(s, fmt.Sprintf("${%s}", testgcp.TestDependentOrgProjectId), fmt.Sprintf("\"%s\"", testgcp.GetDependentOrgProjectID(t)), -1) s = strings.Replace(s, fmt.Sprintf("projects/${%s}", testgcp.TestDependentFolderProjectId), fmt.Sprintf("projects/%s", testgcp.GetDependentFolderProjectID(t)), -1) + s = strings.Replace(s, fmt.Sprintf("projects/${%s}", testgcp.TestDependentFolder2ProjectId), fmt.Sprintf("projects/%s", testgcp.GetDependentFolder2ProjectID(t)), -1) s = strings.Replace(s, fmt.Sprintf("${%s}", testgcp.TestDependentFolderProjectId), fmt.Sprintf("\"%s\"", testgcp.GetDependentFolderProjectID(t)), -1) + s = strings.Replace(s, fmt.Sprintf("${%s}", testgcp.TestDependentFolder2ProjectId), fmt.Sprintf("\"%s\"", testgcp.GetDependentFolder2ProjectID(t)), -1) s = strings.Replace(s, fmt.Sprintf("projects/${%s}", testgcp.TestDependentNoNetworkProjectId), fmt.Sprintf("projects/%s", testgcp.GetDependentNoNetworkProjectID(t)), -1) s = strings.Replace(s, fmt.Sprintf("${%s}", testgcp.TestDependentNoNetworkProjectId), fmt.Sprintf("\"%s\"", testgcp.GetDependentNoNetworkProjectID(t)), -1) s = strings.Replace(s, fmt.Sprintf("organizations/${%s}", testgcp.IAMIntegrationTestsOrganizationID.Key), fmt.Sprintf("organizations/%s", testgcp.IAMIntegrationTestsOrganizationID.Get()), -1) diff --git a/pkg/test/gcp/gcp.go b/pkg/test/gcp/gcp.go index c2b5d0036b..d14e7d8d55 100644 --- a/pkg/test/gcp/gcp.go +++ b/pkg/test/gcp/gcp.go @@ -65,6 +65,7 @@ var ( const ( TestDependentOrgProjectId = "TEST_DEPENDENT_ORG_PROJECT_ID" TestDependentFolderProjectId = "TEST_DEPENDENT_FOLDER_PROJECT_ID" + TestDependentFolder2ProjectId = "TEST_DEPENDENT_FOLDER_2_PROJECT_ID" TestDependentNoNetworkProjectId = "TEST_DEPENDENT_NO_NETWORK_PROJECT_ID" // A dependent project with default network disabled IsolatedTestOrgName = "ISOLATED_TEST_ORG_NAME" TestBillingAccountIDForBillingResources = "BILLING_ACCOUNT_ID_FOR_BILLING_RESOURCES" @@ -80,6 +81,7 @@ const ( var ( testDependentOrgProjectId = os.Getenv(TestDependentOrgProjectId) testDependentFolderProjectId = os.Getenv(TestDependentFolderProjectId) + testDependentFolder2ProjectId = os.Getenv(TestDependentFolder2ProjectId) testDependentNoNetworkProjectId = os.Getenv(TestDependentNoNetworkProjectId) isolatedTestOrgName = os.Getenv(IsolatedTestOrgName) testBillingAccountIDForBillingResources = os.Getenv(TestBillingAccountIDForBillingResources) @@ -171,6 +173,10 @@ func GetDependentFolderProjectID(t *testing.T) string { return testDependentFolderProjectId } +func GetDependentFolder2ProjectID(t *testing.T) string { + return testDependentFolder2ProjectId +} + func GetDependentNoNetworkProjectID(t *testing.T) string { return testDependentNoNetworkProjectId } diff --git a/pkg/test/resourcefixture/testdata/basic/apigee/v1beta1/apigeeorganization/dependencies.yaml b/pkg/test/resourcefixture/testdata/basic/apigee/v1beta1/apigeeorganization/dependencies.yaml index ded721cbce..6d936a9890 100644 --- a/pkg/test/resourcefixture/testdata/basic/apigee/v1beta1/apigeeorganization/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/basic/apigee/v1beta1/apigeeorganization/dependencies.yaml @@ -15,9 +15,12 @@ apiVersion: resourcemanager.cnrm.cloud.google.com/v1beta1 kind: Project metadata: + annotations: + cnrm.cloud.google.com/deletion-policy: "abandon" name: project-${uniqueId} spec: - name: project-${uniqueId} + resourceID: ${TEST_DEPENDENT_ORG_PROJECT_ID} + name: "Dependent Project" organizationRef: external: ${TEST_ORG_ID} billingAccountRef: @@ -35,6 +38,8 @@ apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1 kind: Service metadata: name: compute.googleapis.com + annotations: + cnrm.cloud.google.com/deletion-policy: "abandon" spec: projectRef: name: "project-${uniqueId}" diff --git a/pkg/test/resourcefixture/testdata/basic/binaryauthorization/v1beta1/binaryauthorizationpolicy/serviceidentitypolicytoserviceaccountpolicy/dependencies.yaml b/pkg/test/resourcefixture/testdata/basic/binaryauthorization/v1beta1/binaryauthorizationpolicy/serviceidentitypolicytoserviceaccountpolicy/dependencies.yaml index 78bcd56128..001c1153d2 100644 --- a/pkg/test/resourcefixture/testdata/basic/binaryauthorization/v1beta1/binaryauthorizationpolicy/serviceidentitypolicytoserviceaccountpolicy/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/basic/binaryauthorization/v1beta1/binaryauthorizationpolicy/serviceidentitypolicytoserviceaccountpolicy/dependencies.yaml @@ -15,9 +15,12 @@ apiVersion: resourcemanager.cnrm.cloud.google.com/v1beta1 kind: Project metadata: + annotations: + cnrm.cloud.google.com/deletion-policy: "abandon" name: project-${uniqueId} spec: - name: project-${uniqueId} + resourceID: ${TEST_DEPENDENT_ORG_PROJECT_ID} + name: "Dependent Project" organizationRef: external: ${TEST_ORG_ID} billingAccountRef: diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/globalcomputebackendserviceiap/create.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/globalcomputebackendserviceiap/create.yaml index 621259900a..1e14ef12c7 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/globalcomputebackendserviceiap/create.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/globalcomputebackendserviceiap/create.yaml @@ -28,7 +28,7 @@ spec: location: global iap: oauth2ClientIdRef: - external: iapidentityawareproxyclient-${uniqueId} + name: iapidentityawareproxyclient-${uniqueId} oauth2ClientSecret: valueFrom: secretKeyRef: diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/globalcomputebackendserviceiap/dependencies.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/globalcomputebackendserviceiap/dependencies.yaml index ce7d12fc04..9109a3b523 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/globalcomputebackendserviceiap/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/globalcomputebackendserviceiap/dependencies.yaml @@ -62,9 +62,12 @@ metadata: apiVersion: resourcemanager.cnrm.cloud.google.com/v1beta1 kind: Project metadata: + annotations: + cnrm.cloud.google.com/deletion-policy: "abandon" name: iapclient-${uniqueId} spec: - name: ComputeProjectMetadata + resourceID: ${TEST_DEPENDENT_ORG_PROJECT_ID} + name: "Dependent Project" organizationRef: external: ${TEST_ORG_ID} billingAccountRef: @@ -74,7 +77,7 @@ apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1 kind: Service metadata: annotations: - cnrm.cloud.google.com/project-id: iapclient-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} name: iap.googleapis.com --- apiVersion: iap.cnrm.cloud.google.com/v1beta1 @@ -82,7 +85,7 @@ kind: IAPBrand metadata: name: iapbrand-${uniqueId} annotations: - cnrm.cloud.google.com/project-id: iapclient-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} spec: applicationTitle: "test brand" # This is not a valid support email, but works from testing perspective @@ -93,7 +96,7 @@ kind: IAPIdentityAwareProxyClient metadata: name: iapidentityawareproxyclient-${uniqueId} annotations: - cnrm.cloud.google.com/project-id: iapclient-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} spec: displayName: "Test Client" brandRef: diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/globalcomputebackendserviceiap/update.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/globalcomputebackendserviceiap/update.yaml index f33420d4de..c56a66456c 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/globalcomputebackendserviceiap/update.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/globalcomputebackendserviceiap/update.yaml @@ -28,7 +28,7 @@ spec: location: global iap: oauth2ClientIdRef: - external: iapidentityawareproxyclient-${uniqueId} + name: iapidentityawareproxyclient-${uniqueId} oauth2ClientSecret: valueFrom: secretKeyRef: diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/regionalcomputebackendserviceiap/create.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/regionalcomputebackendserviceiap/create.yaml index 1f3d55c9eb..77f8472968 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/regionalcomputebackendserviceiap/create.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/regionalcomputebackendserviceiap/create.yaml @@ -26,7 +26,7 @@ spec: protocol: HTTP iap: oauth2ClientIdRef: - external: iapidentityawareproxyclient-${uniqueId} + name: iapidentityawareproxyclient-${uniqueId} oauth2ClientSecret: valueFrom: secretKeyRef: diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/regionalcomputebackendserviceiap/dependencies.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/regionalcomputebackendserviceiap/dependencies.yaml index 766c32a185..a0004896e6 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/regionalcomputebackendserviceiap/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/regionalcomputebackendserviceiap/dependencies.yaml @@ -26,9 +26,12 @@ spec: apiVersion: resourcemanager.cnrm.cloud.google.com/v1beta1 kind: Project metadata: + annotations: + cnrm.cloud.google.com/deletion-policy: "abandon" name: iapclient-${uniqueId} spec: - name: ComputeProjectMetadata + resourceID: ${TEST_DEPENDENT_ORG_PROJECT_ID} + name: "Dependent Project" organizationRef: external: ${TEST_ORG_ID} billingAccountRef: @@ -38,7 +41,7 @@ apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1 kind: Service metadata: annotations: - cnrm.cloud.google.com/project-id: iapclient-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} name: iap.googleapis.com --- apiVersion: iap.cnrm.cloud.google.com/v1beta1 @@ -46,7 +49,7 @@ kind: IAPBrand metadata: name: iapbrand-${uniqueId} annotations: - cnrm.cloud.google.com/project-id: iapclient-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} spec: applicationTitle: "test brand" # This is not a valid support email, but works from testing perspective @@ -57,7 +60,7 @@ kind: IAPIdentityAwareProxyClient metadata: name: iapidentityawareproxyclient-${uniqueId} annotations: - cnrm.cloud.google.com/project-id: iapclient-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} spec: displayName: "Test Client" brandRef: diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/regionalcomputebackendserviceiap/update.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/regionalcomputebackendserviceiap/update.yaml index dca65708cc..80f8fa20ef 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/regionalcomputebackendserviceiap/update.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/regionalcomputebackendserviceiap/update.yaml @@ -26,7 +26,7 @@ spec: protocol: HTTP iap: oauth2ClientIdRef: - external: iapidentityawareproxyclient-${uniqueId} + name: iapidentityawareproxyclient-${uniqueId} oauth2ClientSecret: valueFrom: secretKeyRef: diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeprojectmetadata/create.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeprojectmetadata/create.yaml index 90149b87a5..6f84e7a6d0 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeprojectmetadata/create.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeprojectmetadata/create.yaml @@ -16,7 +16,7 @@ apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeProjectMetadata metadata: annotations: - cnrm.cloud.google.com/project-id: metadata-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} name: computeprojectmetadata-${uniqueId} spec: metadata: diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeprojectmetadata/dependencies.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeprojectmetadata/dependencies.yaml index feb633fe7f..f2388fa3f9 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeprojectmetadata/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeprojectmetadata/dependencies.yaml @@ -16,12 +16,14 @@ apiVersion: resourcemanager.cnrm.cloud.google.com/v1beta1 kind: Project metadata: - labels: + annotations: + cnrm.cloud.google.com/deletion-policy: "abandon" name: metadata-${uniqueId} spec: + resourceID: ${TEST_DEPENDENT_ORG_PROJECT_ID} + name: "Dependent Project" organizationRef: external: ${TEST_ORG_ID} - name: ComputeProjectMetadata billingAccountRef: external: ${TEST_BILLING_ACCOUNT_ID} --- @@ -29,5 +31,7 @@ apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1 kind: Service metadata: annotations: - cnrm.cloud.google.com/project-id: metadata-${uniqueId} - name: compute.googleapis.com \ No newline at end of file + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} + cnrm.cloud.google.com/deletion-policy: "abandon" + name: compute.googleapis.com + diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeprojectmetadata/update.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeprojectmetadata/update.yaml index bf33fd0f57..abcf9e57b4 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeprojectmetadata/update.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeprojectmetadata/update.yaml @@ -16,7 +16,7 @@ apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeProjectMetadata metadata: annotations: - cnrm.cloud.google.com/project-id: metadata-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} name: computeprojectmetadata-${uniqueId} spec: metadata: diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeregionnetworkendpointgroup/privateserviceconnectioncomputeregionnetworkendpointgroup/create.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeregionnetworkendpointgroup/privateserviceconnectioncomputeregionnetworkendpointgroup/create.yaml index 670949e7c7..2c7ff5e3fa 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeregionnetworkendpointgroup/privateserviceconnectioncomputeregionnetworkendpointgroup/create.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeregionnetworkendpointgroup/privateserviceconnectioncomputeregionnetworkendpointgroup/create.yaml @@ -17,11 +17,11 @@ kind: ComputeRegionNetworkEndpointGroup metadata: name: computeregionnetworkendpointgroup-${uniqueId} annotations: - cnrm.cloud.google.com/project-id: project-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} spec: region: us-west3 networkEndpointType: PRIVATE_SERVICE_CONNECT - pscTargetService: https://www.googleapis.com/compute/v1/projects/project-${uniqueId}/regions/us-west3/serviceAttachments/computeserviceattachment-${uniqueId} + pscTargetService: "us-west3-cloudkms.googleapis.com" networkRef: name: default subnetworkRef: diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeregionnetworkendpointgroup/privateserviceconnectioncomputeregionnetworkendpointgroup/dependencies.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeregionnetworkendpointgroup/privateserviceconnectioncomputeregionnetworkendpointgroup/dependencies.yaml index 7f29e0cee3..49a6cf8fee 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeregionnetworkendpointgroup/privateserviceconnectioncomputeregionnetworkendpointgroup/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeregionnetworkendpointgroup/privateserviceconnectioncomputeregionnetworkendpointgroup/dependencies.yaml @@ -15,11 +15,14 @@ apiVersion: resourcemanager.cnrm.cloud.google.com/v1beta1 kind: Project metadata: + annotations: + cnrm.cloud.google.com/deletion-policy: "abandon" name: project-${uniqueId} spec: + resourceID: ${TEST_DEPENDENT_ORG_PROJECT_ID} + name: "Dependent Project" organizationRef: external: ${TEST_ORG_ID} - name: project-${uniqueId} billingAccountRef: external: ${TEST_BILLING_ACCOUNT_ID} --- @@ -38,7 +41,7 @@ kind: ComputeNetwork metadata: name: default annotations: - cnrm.cloud.google.com/project-id: project-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} cnrm.cloud.google.com/deletion-policy: "abandon" cnrm.cloud.google.com/management-conflict-prevention-policy: "none" spec: @@ -48,11 +51,11 @@ apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeSubnetwork metadata: annotations: - cnrm.cloud.google.com/project-id: project-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} name: computesubnetwork-${uniqueId} spec: region: us-west3 - ipCidrRange: 10.2.0.0/16 + ipCidrRange: 10.180.0.0/10 networkRef: name: default purpose: PRIVATE_SERVICE_CONNECT @@ -62,7 +65,7 @@ kind: ComputeSubnetwork metadata: name: default annotations: - cnrm.cloud.google.com/project-id: project-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} cnrm.cloud.google.com/deletion-policy: "abandon" cnrm.cloud.google.com/management-conflict-prevention-policy: "none" spec: @@ -75,7 +78,7 @@ apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeBackendService metadata: annotations: - cnrm.cloud.google.com/project-id: project-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} name: computebackendservice-${uniqueId} spec: location: us-west3 @@ -87,7 +90,7 @@ apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeForwardingRule metadata: annotations: - cnrm.cloud.google.com/project-id: project-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} name: computeforwardingrule-${uniqueId} spec: location: us-west3 diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeserviceattachment/dependencies.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeserviceattachment/dependencies.yaml index 6e16df962f..abc81a9333 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeserviceattachment/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeserviceattachment/dependencies.yaml @@ -15,11 +15,14 @@ apiVersion: resourcemanager.cnrm.cloud.google.com/v1beta1 kind: Project metadata: + annotations: + cnrm.cloud.google.com/deletion-policy: "abandon" name: project-3-${uniqueId} spec: + resourceID: ${TEST_DEPENDENT_ORG_PROJECT_ID} + name: "Dependent Project" organizationRef: external: ${TEST_ORG_ID} - name: "project-3-${uniqueId}" billingAccountRef: external: ${TEST_BILLING_ACCOUNT_ID} --- @@ -39,7 +42,7 @@ metadata: name: default annotations: cnrm.cloud.google.com/deletion-policy: "abandon" - cnrm.cloud.google.com/project-id: "project-3-${uniqueId}" + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} spec: description: Default network for the project --- @@ -47,7 +50,7 @@ apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeBackendService metadata: annotations: - cnrm.cloud.google.com/project-id: project-3-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} name: computebackendservice-${uniqueId} spec: location: "us-west1" @@ -59,7 +62,7 @@ apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeSubnetwork metadata: annotations: - cnrm.cloud.google.com/project-id: project-3-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} name: computesubnetwork-1-${uniqueId} spec: region: "us-west1" @@ -72,7 +75,7 @@ apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeSubnetwork metadata: annotations: - cnrm.cloud.google.com/project-id: project-3-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} name: computesubnetwork-2-${uniqueId} spec: region: "us-west1" @@ -85,7 +88,7 @@ apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeSubnetwork metadata: annotations: - cnrm.cloud.google.com/project-id: project-3-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} name: computesubnetwork-3-${uniqueId} spec: region: "us-west1" @@ -98,7 +101,7 @@ apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeForwardingRule metadata: annotations: - cnrm.cloud.google.com/project-id: project-3-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} name: computeforwardingrule-${uniqueId} spec: location: "us-west1" diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computesharedvpcserviceproject/create.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computesharedvpcserviceproject/create.yaml index dc2e27cb06..a602b3f8a1 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computesharedvpcserviceproject/create.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computesharedvpcserviceproject/create.yaml @@ -16,7 +16,7 @@ apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeSharedVPCServiceProject metadata: annotations: - cnrm.cloud.google.com/project-id: vpchost-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_FOLDER_PROJECT_ID} name: computesharedvpcserviceproject-${uniqueId} spec: projectRef: diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computesharedvpcserviceproject/dependencies.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computesharedvpcserviceproject/dependencies.yaml index 7cb08775da..d436b19cc1 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computesharedvpcserviceproject/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computesharedvpcserviceproject/dependencies.yaml @@ -17,11 +17,15 @@ kind: Project metadata: labels: label-one: "value-one" + annotations: + cnrm.cloud.google.com/deletion-policy: "abandon" name: vpchost-${uniqueId} spec: + resourceID: ${TEST_DEPENDENT_FOLDER_PROJECT_ID} + # Dependent project name for VPC host project + name: "VPC Host Dependent Project" folderRef: external: ${TEST_FOLDER_ID} - name: VPC Host ${uniqueId} billingAccountRef: external: ${TEST_BILLING_ACCOUNT_ID} --- @@ -29,14 +33,15 @@ apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1 kind: Service metadata: annotations: - cnrm.cloud.google.com/project-id: vpchost-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_FOLDER_PROJECT_ID} + cnrm.cloud.google.com/deletion-policy: "abandon" name: compute.googleapis.com --- apiVersion: compute.cnrm.cloud.google.com/v1beta1 kind: ComputeSharedVPCHostProject metadata: annotations: - cnrm.cloud.google.com/project-id: vpchost-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_FOLDER_PROJECT_ID} name: computesharedvpchostproject-${uniqueId} --- apiVersion: resourcemanager.cnrm.cloud.google.com/v1beta1 @@ -44,11 +49,15 @@ kind: Project metadata: labels: label-one: "value-one" + annotations: + cnrm.cloud.google.com/deletion-policy: "abandon" name: vpcsvc-${uniqueId} spec: + resourceID: ${TEST_DEPENDENT_FOLDER_2_PROJECT_ID} + # Dependent project name for VPC SVC project + name: "VPC SVC Dependent Project" folderRef: external: ${TEST_FOLDER_ID} - name: VPC SVC ${uniqueId} billingAccountRef: external: ${TEST_BILLING_ACCOUNT_ID} --- @@ -56,6 +65,7 @@ apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1 kind: Service metadata: annotations: - cnrm.cloud.google.com/project-id: vpcsvc-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_FOLDER_2_PROJECT_ID} + cnrm.cloud.google.com/deletion-policy: "abandon" name: compute.googleapis.com - namespace: ${uniqueId}-2 \ No newline at end of file + namespace: ${uniqueId}-2 diff --git a/pkg/test/resourcefixture/testdata/basic/dlp/v1beta1/dlpdeidentifytemplate/infotypedeidentifytemplate/dependencies.yaml b/pkg/test/resourcefixture/testdata/basic/dlp/v1beta1/dlpdeidentifytemplate/infotypedeidentifytemplate/dependencies.yaml index 315bc04565..8383ddb290 100644 --- a/pkg/test/resourcefixture/testdata/basic/dlp/v1beta1/dlpdeidentifytemplate/infotypedeidentifytemplate/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/basic/dlp/v1beta1/dlpdeidentifytemplate/infotypedeidentifytemplate/dependencies.yaml @@ -15,13 +15,16 @@ apiVersion: resourcemanager.cnrm.cloud.google.com/v1beta1 kind: Project metadata: + annotations: + cnrm.cloud.google.com/deletion-policy: "abandon" name: project-${uniqueId} spec: + resourceID: ${TEST_DEPENDENT_ORG_PROJECT_ID} + name: "Dependent Project" organizationRef: external: "${TEST_ORG_ID}" billingAccountRef: external: "${TEST_BILLING_ACCOUNT_ID}" - name: "project-${uniqueId}" --- apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1 kind: Service @@ -35,7 +38,7 @@ apiVersion: kms.cnrm.cloud.google.com/v1beta1 kind: KMSKeyRing metadata: annotations: - cnrm.cloud.google.com/project-id: "project-${uniqueId}" + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} name: kmskeyring-${uniqueId} spec: location: "global" diff --git a/pkg/test/resourcefixture/testdata/basic/dlp/v1beta1/dlpjobtrigger/bigqueryjobtrigger/dependencies.yaml b/pkg/test/resourcefixture/testdata/basic/dlp/v1beta1/dlpjobtrigger/bigqueryjobtrigger/dependencies.yaml index 98bc1c1dcf..d8cc352f27 100644 --- a/pkg/test/resourcefixture/testdata/basic/dlp/v1beta1/dlpjobtrigger/bigqueryjobtrigger/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/basic/dlp/v1beta1/dlpjobtrigger/bigqueryjobtrigger/dependencies.yaml @@ -31,13 +31,16 @@ spec: apiVersion: resourcemanager.cnrm.cloud.google.com/v1beta1 kind: Project metadata: + annotations: + cnrm.cloud.google.com/deletion-policy: "abandon" name: project-${uniqueId} spec: + resourceID: ${TEST_DEPENDENT_ORG_PROJECT_ID} + name: "Dependent Project" organizationRef: external: "${TEST_ORG_ID}" billingAccountRef: external: "${TEST_BILLING_ACCOUNT_ID}" - name: "project-${uniqueId}" --- apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1 kind: Service diff --git a/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeature/acmfeature/dependencies.yaml b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeature/acmfeature/dependencies.yaml index 35f229ecce..e7ce7cb515 100644 --- a/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeature/acmfeature/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeature/acmfeature/dependencies.yaml @@ -17,11 +17,13 @@ kind: Project metadata: annotations: cnrm.cloud.google.com/auto-create-network: "false" + cnrm.cloud.google.com/deletion-policy: "abandon" name: acm-${uniqueId} spec: - name: acm-${uniqueId} - organizationRef: - external: ${TEST_ORG_ID} + resourceID: ${TEST_DEPENDENT_NO_NETWORK_PROJECT_ID} + name: "Dependent Project" + folderRef: + external: ${TEST_FOLDER_ID} billingAccountRef: external: ${TEST_BILLING_ACCOUNT_ID} --- @@ -29,7 +31,7 @@ apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1 kind: Service metadata: annotations: - cnrm.cloud.google.com/project-id: acm-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_NO_NETWORK_PROJECT_ID} # Without disabling the dependent service, gkeconnect.googleapis.com, gkehub.googleapis.com # can't be cleaned up. So "disable-dependent-services" should be true. cnrm.cloud.google.com/disable-dependent-services: "true" @@ -39,6 +41,7 @@ apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1 kind: Service metadata: annotations: - cnrm.cloud.google.com/project-id: acm-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_NO_NETWORK_PROJECT_ID} cnrm.cloud.google.com/disable-dependent-services: "false" + cnrm.cloud.google.com/deletion-policy: "abandon" name: anthosconfigmanagement.googleapis.com diff --git a/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeature/mcsdfeature/dependencies.yaml b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeature/mcsdfeature/dependencies.yaml index 9dbc60ef13..fef1e6c4e3 100644 --- a/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeature/mcsdfeature/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/basic/gkehub/v1beta1/gkehubfeature/mcsdfeature/dependencies.yaml @@ -17,11 +17,13 @@ kind: Project metadata: annotations: cnrm.cloud.google.com/auto-create-network: "false" + cnrm.cloud.google.com/deletion-policy: "abandon" name: mcsd-${uniqueId} spec: - name: mcsd-${uniqueId} - organizationRef: - external: ${TEST_ORG_ID} + resourceID: ${TEST_DEPENDENT_NO_NETWORK_PROJECT_ID} + name: "Dependent Project" + folderRef: + external: ${TEST_FOLDER_ID} billingAccountRef: external: ${TEST_BILLING_ACCOUNT_ID} --- @@ -29,7 +31,7 @@ apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1 kind: Service metadata: annotations: - cnrm.cloud.google.com/project-id: mcsd-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_NO_NETWORK_PROJECT_ID} # Without disabling the dependent service, gkeconnect.googleapis.com, gkehub.googleapis.com # can't be cleaned up. So "disable-dependent-services" should be true. cnrm.cloud.google.com/disable-dependent-services: "true" @@ -39,6 +41,7 @@ apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1 kind: Service metadata: annotations: - cnrm.cloud.google.com/project-id: mcsd-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_NO_NETWORK_PROJECT_ID} cnrm.cloud.google.com/disable-dependent-services: "false" + cnrm.cloud.google.com/deletion-policy: "abandon" name: multiclusterservicediscovery.googleapis.com diff --git a/pkg/test/resourcefixture/testdata/basic/iap/v1beta1/iapbrand/create.yaml b/pkg/test/resourcefixture/testdata/basic/iap/v1beta1/iapbrand/create.yaml index 082426668b..eb7e4616d0 100644 --- a/pkg/test/resourcefixture/testdata/basic/iap/v1beta1/iapbrand/create.yaml +++ b/pkg/test/resourcefixture/testdata/basic/iap/v1beta1/iapbrand/create.yaml @@ -16,7 +16,7 @@ apiVersion: iap.cnrm.cloud.google.com/v1beta1 kind: IAPBrand metadata: annotations: - cnrm.cloud.google.com/project-id: iapbrand-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} name: iapbrand-${uniqueId} spec: applicationTitle: "test brand" diff --git a/pkg/test/resourcefixture/testdata/basic/iap/v1beta1/iapbrand/dependencies.yaml b/pkg/test/resourcefixture/testdata/basic/iap/v1beta1/iapbrand/dependencies.yaml index 2a2086c427..d19296074b 100644 --- a/pkg/test/resourcefixture/testdata/basic/iap/v1beta1/iapbrand/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/basic/iap/v1beta1/iapbrand/dependencies.yaml @@ -16,10 +16,12 @@ apiVersion: resourcemanager.cnrm.cloud.google.com/v1beta1 kind: Project metadata: - labels: + annotations: + cnrm.cloud.google.com/deletion-policy: "abandon" name: iapbrand-${uniqueId} spec: - name: ComputeProjectMetadata + resourceID: ${TEST_DEPENDENT_ORG_PROJECT_ID} + name: "Dependent Project" organizationRef: external: ${TEST_ORG_ID} billingAccountRef: @@ -29,5 +31,5 @@ apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1 kind: Service metadata: annotations: - cnrm.cloud.google.com/project-id: iapbrand-${uniqueId} + cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} name: iap.googleapis.com \ No newline at end of file diff --git a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinfolder/create.yaml b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinfolder/create.yaml index 2921634f6a..e68a632f0e 100644 --- a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinfolder/create.yaml +++ b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinfolder/create.yaml @@ -20,5 +20,3 @@ spec: name: KCC ${uniqueId} folderRef: external: ${TEST_FOLDER_ID} - billingAccountRef: - external: ${TEST_BILLING_ACCOUNT_ID} diff --git a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinfolder/update.yaml b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinfolder/update.yaml index 65b17a054b..70b5251e25 100644 --- a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinfolder/update.yaml +++ b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinfolder/update.yaml @@ -22,5 +22,3 @@ spec: name: KCC-2 ${uniqueId} folderRef: external: ${TEST_FOLDER_ID} - billingAccountRef: - external: ${TEST_BILLING_ACCOUNT_ID} diff --git a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinorg/create.yaml b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinorg/create.yaml index ad9c489937..cae1b37012 100644 --- a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinorg/create.yaml +++ b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinorg/create.yaml @@ -20,5 +20,3 @@ spec: name: KCC ${uniqueId} organizationRef: external: ${TEST_ORG_ID} - billingAccountRef: - external: ${TEST_BILLING_ACCOUNT_ID} diff --git a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinorg/update.yaml b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinorg/update.yaml index 7631cee544..3401331d74 100644 --- a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinorg/update.yaml +++ b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectinorg/update.yaml @@ -22,5 +22,3 @@ spec: name: KCC-2 ${uniqueId} organizationRef: external: ${TEST_ORG_ID} - billingAccountRef: - external: ${TEST_BILLING_ACCOUNT_ID} diff --git a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectmovedfoldertofolder/create.yaml b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectmovedfoldertofolder/create.yaml index 2921634f6a..e68a632f0e 100644 --- a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectmovedfoldertofolder/create.yaml +++ b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectmovedfoldertofolder/create.yaml @@ -20,5 +20,3 @@ spec: name: KCC ${uniqueId} folderRef: external: ${TEST_FOLDER_ID} - billingAccountRef: - external: ${TEST_BILLING_ACCOUNT_ID} diff --git a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectmovedfoldertofolder/update.yaml b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectmovedfoldertofolder/update.yaml index af881df0d9..99a7023844 100644 --- a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectmovedfoldertofolder/update.yaml +++ b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/project/projectmovedfoldertofolder/update.yaml @@ -20,5 +20,3 @@ spec: name: KCC ${uniqueId} folderRef: external: ${TEST_FOLDER_2_ID} - billingAccountRef: - external: ${TEST_BILLING_ACCOUNT_ID} diff --git a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/resourcemanagerpolicy/projectorgpolicy/dependencies.yaml b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/resourcemanagerpolicy/projectorgpolicy/dependencies.yaml index 47f358ed3e..557d7e3cd5 100644 --- a/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/resourcemanagerpolicy/projectorgpolicy/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/basic/resourcemanager/v1beta1/resourcemanagerpolicy/projectorgpolicy/dependencies.yaml @@ -15,9 +15,12 @@ apiVersion: resourcemanager.cnrm.cloud.google.com/v1beta1 kind: Project metadata: + annotations: + cnrm.cloud.google.com/deletion-policy: "abandon" name: orgpolicy-${uniqueId} spec: - name: Policy ${uniqueId} + resourceID: ${TEST_DEPENDENT_ORG_PROJECT_ID} + name: "Dependent Project" organizationRef: external: ${TEST_ORG_ID} billingAccountRef: diff --git a/pkg/test/resourcefixture/testdata/containerannotations/folderid/create.yaml b/pkg/test/resourcefixture/testdata/containerannotations/folderid/create.yaml index ca2149be7f..00a32b4105 100644 --- a/pkg/test/resourcefixture/testdata/containerannotations/folderid/create.yaml +++ b/pkg/test/resourcefixture/testdata/containerannotations/folderid/create.yaml @@ -20,5 +20,3 @@ metadata: name: project-${uniqueId} spec: name: KCC ${uniqueId} - billingAccountRef: - external: ${TEST_BILLING_ACCOUNT_ID} diff --git a/pkg/test/resourcefixture/testdata/containerannotations/folderid/update.yaml b/pkg/test/resourcefixture/testdata/containerannotations/folderid/update.yaml index 73a8373148..dc0d09ba63 100644 --- a/pkg/test/resourcefixture/testdata/containerannotations/folderid/update.yaml +++ b/pkg/test/resourcefixture/testdata/containerannotations/folderid/update.yaml @@ -20,5 +20,3 @@ metadata: name: project-${uniqueId} spec: name: KCC-2 ${uniqueId} - billingAccountRef: - external: ${TEST_BILLING_ACCOUNT_ID} diff --git a/pkg/test/resourcefixture/testdata/resourceid/userspecifiedresourceidandservergeneratedid/create.yaml b/pkg/test/resourcefixture/testdata/resourceid/userspecifiedresourceidandservergeneratedid/create.yaml index d4ffc0f406..0bd0dd7962 100644 --- a/pkg/test/resourcefixture/testdata/resourceid/userspecifiedresourceidandservergeneratedid/create.yaml +++ b/pkg/test/resourcefixture/testdata/resourceid/userspecifiedresourceidandservergeneratedid/create.yaml @@ -21,5 +21,3 @@ spec: name: KCC ${uniqueId} organizationRef: external: ${TEST_ORG_ID} - billingAccountRef: - external: ${TEST_BILLING_ACCOUNT_ID} diff --git a/pkg/test/resourcefixture/testdata/resourceid/userspecifiedresourceidandservergeneratedid/update.yaml b/pkg/test/resourcefixture/testdata/resourceid/userspecifiedresourceidandservergeneratedid/update.yaml index 1f8d4fa798..63f6468140 100644 --- a/pkg/test/resourcefixture/testdata/resourceid/userspecifiedresourceidandservergeneratedid/update.yaml +++ b/pkg/test/resourcefixture/testdata/resourceid/userspecifiedresourceidandservergeneratedid/update.yaml @@ -23,5 +23,3 @@ spec: name: KCC-2 ${uniqueId} organizationRef: external: ${TEST_ORG_ID} - billingAccountRef: - external: ${TEST_BILLING_ACCOUNT_ID} diff --git a/pkg/test/resourcefixture/testdata/resourceoverrides/computebackendservice/oauth2clientidcomputebackendservice/dependencies.yaml b/pkg/test/resourcefixture/testdata/resourceoverrides/computebackendservice/oauth2clientidcomputebackendservice/dependencies.yaml index 5f1b581ccd..b0c43796e3 100644 --- a/pkg/test/resourcefixture/testdata/resourceoverrides/computebackendservice/oauth2clientidcomputebackendservice/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/resourceoverrides/computebackendservice/oauth2clientidcomputebackendservice/dependencies.yaml @@ -67,8 +67,6 @@ spec: name: ComputeProjectMetadata organizationRef: external: ${TEST_ORG_ID} - billingAccountRef: - external: ${TEST_BILLING_ACCOUNT_ID} --- apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1 kind: Service diff --git a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/compute/computeregionnetworkendpointgroup.md b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/compute/computeregionnetworkendpointgroup.md index 878cee9924..6d30e831b9 100644 --- a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/compute/computeregionnetworkendpointgroup.md +++ b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/compute/computeregionnetworkendpointgroup.md @@ -696,7 +696,7 @@ metadata: cnrm.cloud.google.com/project-id: ${PROJECT_ID?} spec: region: us-west3 - ipCidrRange: 10.2.0.0/16 + ipCidrRange: 10.180.0.0/10 networkRef: name: computeregionnetworkendpointgroup-dep-psc purpose: PRIVATE_SERVICE_CONNECT From 48ae3d8b336ec33f07e721ec3f2e085c5ff34459 Mon Sep 17 00:00:00 2001 From: Gemma Hou Date: Fri, 2 Feb 2024 18:14:06 +0000 Subject: [PATCH 2/2] add deletion policy: abandon --- .../basic/apigee/v1beta1/apigeeorganization/dependencies.yaml | 2 ++ .../globalcomputebackendserviceiap/dependencies.yaml | 1 + .../regionalcomputebackendserviceiap/dependencies.yaml | 1 + .../v1beta1/computesharedvpcserviceproject/dependencies.yaml | 4 ++-- .../infotypedeidentifytemplate/dependencies.yaml | 2 ++ .../dlpjobtrigger/bigqueryjobtrigger/dependencies.yaml | 2 ++ .../testdata/basic/iap/v1beta1/iapbrand/dependencies.yaml | 1 + 7 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pkg/test/resourcefixture/testdata/basic/apigee/v1beta1/apigeeorganization/dependencies.yaml b/pkg/test/resourcefixture/testdata/basic/apigee/v1beta1/apigeeorganization/dependencies.yaml index 6d936a9890..60d4348b03 100644 --- a/pkg/test/resourcefixture/testdata/basic/apigee/v1beta1/apigeeorganization/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/basic/apigee/v1beta1/apigeeorganization/dependencies.yaml @@ -30,6 +30,8 @@ apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1 kind: Service metadata: name: apigee.googleapis.com + annotations: + cnrm.cloud.google.com/deletion-policy: "abandon" spec: projectRef: name: "project-${uniqueId}" diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/globalcomputebackendserviceiap/dependencies.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/globalcomputebackendserviceiap/dependencies.yaml index 9109a3b523..6326c6643c 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/globalcomputebackendserviceiap/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/globalcomputebackendserviceiap/dependencies.yaml @@ -78,6 +78,7 @@ kind: Service metadata: annotations: cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} + cnrm.cloud.google.com/deletion-policy: "abandon" name: iap.googleapis.com --- apiVersion: iap.cnrm.cloud.google.com/v1beta1 diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/regionalcomputebackendserviceiap/dependencies.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/regionalcomputebackendserviceiap/dependencies.yaml index a0004896e6..bc006e1f0a 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/regionalcomputebackendserviceiap/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computebackendservice/regionalcomputebackendserviceiap/dependencies.yaml @@ -42,6 +42,7 @@ kind: Service metadata: annotations: cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} + cnrm.cloud.google.com/deletion-policy: "abandon" name: iap.googleapis.com --- apiVersion: iap.cnrm.cloud.google.com/v1beta1 diff --git a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computesharedvpcserviceproject/dependencies.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computesharedvpcserviceproject/dependencies.yaml index d436b19cc1..ab894adddf 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computesharedvpcserviceproject/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computesharedvpcserviceproject/dependencies.yaml @@ -54,8 +54,8 @@ metadata: name: vpcsvc-${uniqueId} spec: resourceID: ${TEST_DEPENDENT_FOLDER_2_PROJECT_ID} - # Dependent project name for VPC SVC project - name: "VPC SVC Dependent Project" + # Dependent project name for VPC service project + name: "VPC Service Dependent Project" folderRef: external: ${TEST_FOLDER_ID} billingAccountRef: diff --git a/pkg/test/resourcefixture/testdata/basic/dlp/v1beta1/dlpdeidentifytemplate/infotypedeidentifytemplate/dependencies.yaml b/pkg/test/resourcefixture/testdata/basic/dlp/v1beta1/dlpdeidentifytemplate/infotypedeidentifytemplate/dependencies.yaml index 8383ddb290..e178489754 100644 --- a/pkg/test/resourcefixture/testdata/basic/dlp/v1beta1/dlpdeidentifytemplate/infotypedeidentifytemplate/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/basic/dlp/v1beta1/dlpdeidentifytemplate/infotypedeidentifytemplate/dependencies.yaml @@ -30,6 +30,8 @@ apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1 kind: Service metadata: name: cloudkms.googleapis.com + annotations: + cnrm.cloud.google.com/deletion-policy: "abandon" spec: projectRef: name: "project-${uniqueId}" diff --git a/pkg/test/resourcefixture/testdata/basic/dlp/v1beta1/dlpjobtrigger/bigqueryjobtrigger/dependencies.yaml b/pkg/test/resourcefixture/testdata/basic/dlp/v1beta1/dlpjobtrigger/bigqueryjobtrigger/dependencies.yaml index d8cc352f27..5a553a49e0 100644 --- a/pkg/test/resourcefixture/testdata/basic/dlp/v1beta1/dlpjobtrigger/bigqueryjobtrigger/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/basic/dlp/v1beta1/dlpjobtrigger/bigqueryjobtrigger/dependencies.yaml @@ -46,6 +46,8 @@ apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1 kind: Service metadata: name: bigquery.googleapis.com + annotations: + cnrm.cloud.google.com/deletion-policy: "abandon" spec: projectRef: name: "project-${uniqueId}" diff --git a/pkg/test/resourcefixture/testdata/basic/iap/v1beta1/iapbrand/dependencies.yaml b/pkg/test/resourcefixture/testdata/basic/iap/v1beta1/iapbrand/dependencies.yaml index d19296074b..7c590e8004 100644 --- a/pkg/test/resourcefixture/testdata/basic/iap/v1beta1/iapbrand/dependencies.yaml +++ b/pkg/test/resourcefixture/testdata/basic/iap/v1beta1/iapbrand/dependencies.yaml @@ -32,4 +32,5 @@ kind: Service metadata: annotations: cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID} + cnrm.cloud.google.com/deletion-policy: "abandon" name: iap.googleapis.com \ No newline at end of file