Merge pull request #2341 from maqiuyujoyce/202407-bqcc-ignore-features

Remove aws and azure support for BigQueryConnectionConnection
GoogleCloudPlatform · Jul 24, 2024 · 7d5aaa8 · 7d5aaa8
2 parents 80cd23e + 96064f5
commit 7d5aaa8
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 207 deletions.
diff --git a/...rcedefinition_bigqueryconnectionconnections.bigqueryconnection.cnrm.cloud.google.com.yaml b/...rcedefinition_bigqueryconnectionconnections.bigqueryconnection.cnrm.cloud.google.com.yaml
@@ -58,59 +58,6 @@ spec:
             type: object
           spec:
             properties:
-              aws:
-                description: Connection properties specific to Amazon Web Services.
-                properties:
-                  accessRole:
-                    description: Authentication using Google owned service account
-                      to assume into customer's AWS IAM Role.
-                    properties:
-                      iamRoleId:
-                        description: The user’s AWS IAM Role that trusts the Google-owned
-                          AWS IAM user Connection.
-                        type: string
-                      identity:
-                        description: A unique Google-owned and Google-generated identity
-                          for the Connection. This identity will be used to access
-                          the user's AWS IAM Role.
-                        type: string
-                    required:
-                    - iamRoleId
-                    type: object
-                required:
-                - accessRole
-                type: object
-              azure:
-                description: Container for connection properties specific to Azure.
-                properties:
-                  application:
-                    description: The name of the Azure Active Directory Application.
-                    type: string
-                  clientId:
-                    description: The client id of the Azure Active Directory Application.
-                    type: string
-                  customerTenantId:
-                    description: The id of customer's directory that host the data.
-                    type: string
-                  federatedApplicationClientId:
-                    description: The Azure Application (client) ID where the federated
-                      credentials will be hosted.
-                    type: string
-                  identity:
-                    description: A unique Google-owned and Google-generated identity
-                      for the Connection. This identity will be used to access the
-                      user's Azure Active Directory Application.
-                    type: string
-                  objectId:
-                    description: The object id of the Azure Active Directory Application.
-                    type: string
-                  redirectUri:
-                    description: The URL user will be redirected to after granting
-                      consent during connection setup.
-                    type: string
-                required:
-                - customerTenantId
-                type: object
               cloudResource:
                 description: Container for connection properties for delegation of
                   access to GCP resources.

diff --git a/pkg/clients/generated/apis/bigqueryconnection/v1alpha1/bigqueryconnectionconnection_types.go b/pkg/clients/generated/apis/bigqueryconnection/v1alpha1/bigqueryconnectionconnection_types.go
diff --git a/pkg/clients/generated/apis/bigqueryconnection/v1alpha1/zz_generated.deepcopy.go b/pkg/clients/generated/apis/bigqueryconnection/v1alpha1/zz_generated.deepcopy.go
diff --git a/scripts/resource-autogen/generated/servicemappings/bigqueryconnection.yaml b/scripts/resource-autogen/generated/servicemappings/bigqueryconnection.yaml
@@ -37,8 +37,11 @@ spec:
       resourceAvailableInAssetInventory: false
       ignoredFields:
         # TODO: https://github.com/GoogleCloudPlatform/k8s-config-connector/issues/2149
-         - cloud_sql
-         - cloud_spanner
+        - cloud_sql
+        - cloud_spanner
+        # TODO: https://github.com/GoogleCloudPlatform/k8s-config-connector/issues/2340
+        - aws
+        - azure
       observedFields:
         - cloud_resource.service_account_id
       metadataMapping:

diff --git a/scripts/resource-autogen/servicemapping/embed/generated/assets_vfsdata.go b/scripts/resource-autogen/servicemapping/embed/generated/assets_vfsdata.go
diff --git a/tests/apichecks/testdata/exceptions/acronyms.txt b/tests/apichecks/testdata/exceptions/acronyms.txt
@@ -37,11 +37,6 @@
 [acronyms] crd=appenginestandardappversions.appengine.cnrm.cloud.google.com version=v1alpha1: field ".spec.handlers[].redirectHttpResponseCode" should be ".spec.handlers[].redirectHTTPResponseCode"
 [acronyms] crd=appenginestandardappversions.appengine.cnrm.cloud.google.com version=v1alpha1: field ".spec.runtimeApiVersion" should be ".spec.runtimeAPIVersion"
 [acronyms] crd=bigqueryanalyticshublistings.bigqueryanalyticshub.cnrm.cloud.google.com version=v1alpha1: field ".spec.dataExchangeId" should be ".spec.dataExchangeID"
-[acronyms] crd=bigqueryconnectionconnections.bigqueryconnection.cnrm.cloud.google.com version=v1alpha1: field ".spec.aws.accessRole.iamRoleId" should be ".spec.aws.accessRole.iamRoleID"
-[acronyms] crd=bigqueryconnectionconnections.bigqueryconnection.cnrm.cloud.google.com version=v1alpha1: field ".spec.azure.clientId" should be ".spec.azure.clientID"
-[acronyms] crd=bigqueryconnectionconnections.bigqueryconnection.cnrm.cloud.google.com version=v1alpha1: field ".spec.azure.customerTenantId" should be ".spec.azure.customerTenantID"
-[acronyms] crd=bigqueryconnectionconnections.bigqueryconnection.cnrm.cloud.google.com version=v1alpha1: field ".spec.azure.federatedApplicationClientId" should be ".spec.azure.federatedApplicationClientID"
-[acronyms] crd=bigqueryconnectionconnections.bigqueryconnection.cnrm.cloud.google.com version=v1alpha1: field ".spec.azure.objectId" should be ".spec.azure.objectID"
 [acronyms] crd=bigqueryconnectionconnections.bigqueryconnection.cnrm.cloud.google.com version=v1alpha1: field ".spec.cloudResource.serviceAccountId" should be ".spec.cloudResource.serviceAccountID"
 [acronyms] crd=bigqueryconnectionconnections.bigqueryconnection.cnrm.cloud.google.com version=v1alpha1: field ".status.observedState.cloudResource.serviceAccountId" should be ".status.observedState.cloudResource.serviceAccountID"
 [acronyms] crd=bigquerydatasetaccesses.bigquery.cnrm.cloud.google.com version=v1alpha1: field ".spec.dataset.dataset.datasetId" should be ".spec.dataset.dataset.datasetID"