Skip to content

Commit f33c14d

Browse files
Merge pull request GoogleCloudPlatform#2833 from jasonvigil/fix-optional-tag
fix: Fix ResourceID field optional tag format
2 parents 2ea1320 + d75ce11 commit f33c14d

File tree

12 files changed

+12
-12
lines changed

12 files changed

+12
-12
lines changed

apis/bigquery/v1beta1/bigquerydataset_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var BigQueryDatasetGVK = GroupVersion.WithKind("BigQueryDataset")
2828
// +kcc:proto=google.cloud.bigquery.v2.dataset
2929
type BigQueryDatasetSpec struct {
3030
// The BigQueryDataset name. If not given, the metadata.name will be used.
31-
// + optional
31+
// +optional
3232
ResourceID *string `json:"resourceID,omitempty"`
3333

3434
// An array of objects that define dataset access for one or more entities.

apis/bigqueryconnection/v1alpha1/connection_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ type BigQueryConnectionConnectionSpec struct {
3939

4040
// The BigQuery ConnectionID. This is a server-generated ID in the UUID format.
4141
// If not provided, ConfigConnector will create a new Connection and store the UUID in `status.serviceGeneratedID` field.
42-
// + optional
42+
// +optional
4343
ResourceID *string `json:"resourceID,omitempty"`
4444

4545
// User provided display name for the connection.

apis/bigquerydatatransfer/v1alpha1/bigquerydatatransferconfig_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ type BigQueryDataTransferConfigSpec struct {
8585
// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="ResourceID field is immutable"
8686
// Immutable.
8787
// The BigQueryDataTransferConfig name. If not given, the metadata.name will be used.
88-
// + optional
88+
// +optional
8989
ResourceID *string `json:"resourceID,omitempty"`
9090

9191
// Data transfer schedule.

apis/bigtable/v1beta1/bigtableinstance_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var (
2828
// +kcc:proto=google.bigtable.admin.v2.Instance
2929
type BigtableInstanceSpec struct {
3030
// The Instance name. If not given, the metadata.name will be used.
31-
// + optional
31+
// +optional
3232
ResourceID *string `json:"resourceID,omitempty"`
3333

3434
// // The unique name of the instance. Values are of the form

apis/cloudbuild/v1beta1/workerpool_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ type CloudBuildWorkerPoolSpec struct {
3232
DisplayName string `json:"displayName,omitempty"`
3333

3434
// The `WorkerPool` name. If not given, the metadata.name will be used.
35-
// + optional
35+
// +optional
3636
ResourceID *string `json:"resourceID,omitempty"`
3737

3838
// +required

apis/firestore/v1alpha1/firestoredatabase_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ type FirestoreDatabaseSpec struct {
3232
ProjectRef v1beta1.ProjectRef `json:"projectRef"`
3333

3434
// The FirestoreDatabase name. If not given, the metadata.name will be used.
35-
// + optional
35+
// +optional
3636
ResourceID *string `json:"resourceID,omitempty"`
3737

3838
// The location of the database. Available locations are listed at

apis/networkconnectivity/v1alpha1/networkconnectivityserviceconnectionpolicy_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ type NetworkConnectivityServiceConnectionPolicySpec struct {
4040
Location *string `json:"location"`
4141

4242
// The NetworkConnectivityServiceConnectionPolicy name. If not given, the metadata.name will be used.
43-
// + optional
43+
// +optional
4444
ResourceID *string `json:"resourceID,omitempty"`
4545

4646
// A description of this resource.

apis/redis/v1alpha1/rediscluster_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ type RedisClusterSpec struct {
3333
Location *string `json:"location"`
3434

3535
// The RedisCluster name. If not given, the metadata.name will be used.
36-
// + optional
36+
// +optional
3737
ResourceID *string `json:"resourceID,omitempty"`
3838

3939
// Optional. The authorization mode of the Redis cluster.

apis/secretmanager/v1beta1/secretmanagersecret_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ type SecretManagerSecretSpec struct {
3131
// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="ResourceID field is immutable"
3232
// Immutable.
3333
// The SecretManagerSecret name. If not given, the metadata.name will be used.
34-
// + optional
34+
// +optional
3535
ResourceID *string `json:"resourceID,omitempty"`
3636

3737
// Optional. Immutable. The replication policy of the secret data attached to

apis/workstations/v1alpha1/workstationcluster_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ type WorkstationClusterSpec struct {
3939
// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="ResourceID field is immutable"
4040
// Immutable.
4141
// The WorkstationCluster name. If not given, the metadata.name will be used.
42-
// + optional
42+
// +optional
4343
ResourceID *string `json:"resourceID,omitempty"`
4444

4545
// Optional. Human-readable name for this workstation cluster.

dev/tools/controllerbuilder/template/apis/types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ type {{ .Kind }}Spec struct {
4343
// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="ResourceID field is immutable"
4444
// Immutable.
4545
// The {{ .Kind }} name. If not given, the metadata.name will be used.
46-
// + optional
46+
// +optional
4747
ResourceID *string ` + "`" + `json:"resourceID,omitempty"` + "`" + `
4848
}
4949

pkg/apis/common/v1alpha1/types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
type CommonSpec struct {
2323
// The GCP resource identifier. If not given, the metadata.name will be used.
24-
// + optional
24+
// +optional
2525
ResourceID *string `json:"resourceID,omitempty"`
2626

2727
// TODO: Do we still need a CommonSpec for resources that do not need project dependency? Those seems to be exceptional any ways.

0 commit comments

Comments
 (0)