Merge pull request GoogleCloudPlatform#2835 from acpana/acpana/bqahde-name

refactor: name field is output only

Author: google-oss-prow[bot]

apis/bigqueryanalyticshub/v1alpha1/bigqueryanalyticshubdataexchange_types.go

@@ -26,10 +26,6 @@ var BigQueryAnalyticsHubDataExchangeGVK = GroupVersion.WithKind("BigQueryAnalyti
 // BigQueryAnalyticsHubDataExchangeSpec defines the desired state of BigQueryAnalyticsHubDataExchange
 // +kcc:proto=google.cloud.bigquery.analyticshub.v1.DataExchange
 type BigQueryAnalyticsHubDataExchangeSpec struct {
-	// Output only. The resource name of the data exchange.
-	//  e.g. `projects/myproject/locations/US/dataExchanges/123`.
-	Name *string `json:"name,omitempty"`
-
 	// Required. Human-readable display name of the data exchange. The display
 	//  name must contain only Unicode letters, numbers (0-9), underscores (_),
 	//  dashes (-), spaces ( ), ampersands (&) and must not start or end with
@@ -100,6 +96,11 @@ type BigQueryAnalyticsHubDataExchangeStatus struct {
 // BigQueryAnalyticsHubDataExchangeSpec defines the desired state of BigQueryAnalyticsHubDataExchange
 // +kcc:proto=google.cloud.bigquery.analyticshub.v1.DataExchange
 type BigQueryAnalyticsHubDataExchangeObservedState struct {
+	// This field is in the same format as our externalRef! So it's redundant.
+	// // Output only. The resource name of the data exchange.
+	// //  e.g. `projects/myproject/locations/US/dataExchanges/123`.
+	// Name *string `json:"name,omitempty"`
+
 	/* Number of listings contained in the data exchange. */
 	// +optional
 	ListingCount *int64 `json:"listingCount,omitempty"`

apis/bigqueryanalyticshub/v1alpha1/zz_generated.deepcopy.go

@@ -85,10 +85,6 @@ spec:
               location:
                 description: Immutable. The name of the location this data exchange.
                 type: string
-              name:
-                description: Output only. The resource name of the data exchange.
-                  e.g. `projects/myproject/locations/US/dataExchanges/123`.
-                type: string
               primaryContact:
                 description: 'Optional. Email or URL of the primary point of contact
                   of the data exchange. Max Length: 1000 bytes.'

config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_bigqueryanalyticshubdataexchanges.bigqueryanalyticshub.cnrm.cloud.google.com.yaml

@@ -233,6 +233,7 @@ func (a *Adapter) Update(ctx context.Context, updateOp *directbase.UpdateOperati
 	if mapCtx.Err() != nil {
 		return mapCtx.Err()
 	}
+	resource.Name = a.actual.Name
 
 	req := &bigqueryanalyticshubpb.UpdateDataExchangeRequest{
 		UpdateMask:   updateMask,

pkg/clients/generated/apis/bigqueryanalyticshub/v1alpha1/bigqueryanalyticshubdataexchange_types.go

@@ -35,7 +35,6 @@ func BigQueryAnalyticsHubDataExchangeSpec_FromProto(mapCtx *direct.MapContext, i
 		return nil
 	}
 	out := &krm.BigQueryAnalyticsHubDataExchangeSpec{}
-	out.Name = direct.LazyPtr(in.GetName())
 	out.DisplayName = direct.LazyPtr(in.GetDisplayName())
 	out.Description = direct.LazyPtr(in.GetDescription())
 	out.PrimaryContact = direct.LazyPtr(in.GetPrimaryContact())
@@ -52,7 +51,6 @@ func BigQueryAnalyticsHubDataExchangeSpec_ToProto(mapCtx *direct.MapContext, in
 	}
 
 	out := &pb.DataExchange{}
-	out.Name = direct.ValueOf(in.Name)
 	out.DisplayName = direct.ValueOf(in.DisplayName)
 	out.Description = direct.ValueOf(in.Description)
 	out.PrimaryContact = direct.ValueOf(in.PrimaryContact)

pkg/clients/generated/apis/bigqueryanalyticshub/v1alpha1/zz_generated.deepcopy.go

@@ -17,7 +17,6 @@ kind: BigQueryAnalyticsHubDataExchange
 metadata:
   name: bigqueryanalyticshubdataexchange${uniqueId}
 spec:
-  description: example data exchange
   displayName: my_data_exchange
   location: US
   projectRef:

pkg/controller/direct/bigqueryanalyticshub/dataexchange_controller.go

@@ -0,0 +1,28 @@
+# Copyright 2024 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: bigqueryanalyticshub.cnrm.cloud.google.com/v1alpha1
+kind: BigQueryAnalyticsHubDataExchange
+metadata:
+  name: bigqueryanalyticshubdataexchange${uniqueId}
+spec:
+  displayName: my_data_exchange
+  description: example data exchange
+  primaryContact: [email protected]
+  documentation: a documentation
+  discoveryType: DISCOVERY_TYPE_UNSPECIFIED
+  location: US
+  projectRef:
+    external: ${projectId}
+  resourceID: bigqueryanalyticshubdataexchange${uniqueId}

pkg/controller/direct/bigqueryanalyticshub/mapper.go

@@ -0,0 +1,28 @@
+# Copyright 2024 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: bigqueryanalyticshub.cnrm.cloud.google.com/v1alpha1
+kind: BigQueryAnalyticsHubDataExchange
+metadata:
+  name: bigqueryanalyticshubdataexchange${uniqueId}
+spec:
+  displayName: my_data_exchange
+  description: example data exchange
+  primaryContact: [email protected]
+  documentation: an updated documentation
+  discoveryType: DISCOVERY_TYPE_PRIVATE
+  location: US
+  projectRef:
+    external: ${projectId}
+  resourceID: bigqueryanalyticshubdataexchange${uniqueId}