diff --git a/apis/pubsub/v1alpha1/subscription_types.go b/apis/pubsub/v1alpha1/subscription_types.go index 86923f54d..c5fd08367 100644 --- a/apis/pubsub/v1alpha1/subscription_types.go +++ b/apis/pubsub/v1alpha1/subscription_types.go @@ -87,9 +87,9 @@ type SubscriptionParameters struct { // +optional PushConfig *PushConfig `json:"pushConfig,omitempty"` - // BigQueryConfig is a parameter which configures bigquery delivery. + // BigqueryConfig is a parameter which configures bigquery delivery. // +optional - BigQueryConfig *BigQueryConfig `json:"bigQueryConfig,omitempty"` + BigqueryConfig *BigqueryConfig `json:"bigqueryConfig,omitempty"` // RetainAckedMessages is a message which indicates whether to retain acknowledged // messages. If true, then messages are not expunged from the @@ -147,8 +147,8 @@ type PushConfig struct { PushEndpoint string `json:"pushEndpoint,omitempty"` } -// BigQueryConfig contains configuration for a bigquery delivery endpoint. -type BigQueryConfig struct { +// BigqueryConfig contains configuration for a bigquery delivery endpoint. +type BigqueryConfig struct { // Bigquery table to deliver messages to. Table string `json:"table,omitempty"` diff --git a/apis/pubsub/v1alpha1/zz_generated.deepcopy.go b/apis/pubsub/v1alpha1/zz_generated.deepcopy.go index 50ace383a..9463bfd3f 100644 --- a/apis/pubsub/v1alpha1/zz_generated.deepcopy.go +++ b/apis/pubsub/v1alpha1/zz_generated.deepcopy.go @@ -27,16 +27,16 @@ import ( ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *BigQueryConfig) DeepCopyInto(out *BigQueryConfig) { +func (in *BigqueryConfig) DeepCopyInto(out *BigqueryConfig) { *out = *in } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BigQueryConfig. -func (in *BigQueryConfig) DeepCopy() *BigQueryConfig { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BigqueryConfig. +func (in *BigqueryConfig) DeepCopy() *BigqueryConfig { if in == nil { return nil } - out := new(BigQueryConfig) + out := new(BigqueryConfig) in.DeepCopyInto(out) return out } @@ -232,9 +232,9 @@ func (in *SubscriptionParameters) DeepCopyInto(out *SubscriptionParameters) { *out = new(PushConfig) (*in).DeepCopyInto(*out) } - if in.BigQueryConfig != nil { - in, out := &in.BigQueryConfig, &out.BigQueryConfig - *out = new(BigQueryConfig) + if in.BigqueryConfig != nil { + in, out := &in.BigqueryConfig, &out.BigqueryConfig + *out = new(BigqueryConfig) **out = **in } if in.RetryPolicy != nil { diff --git a/package/crds/pubsub.gcp.crossplane.io_subscriptions.yaml b/package/crds/pubsub.gcp.crossplane.io_subscriptions.yaml index 63d42e499..2be89b8bc 100644 --- a/package/crds/pubsub.gcp.crossplane.io_subscriptions.yaml +++ b/package/crds/pubsub.gcp.crossplane.io_subscriptions.yaml @@ -65,8 +65,8 @@ spec: value of 10 seconds is used. format: int64 type: integer - bigQueryConfig: - description: BigQueryConfig is a parameter which configures bigquery + bigqueryConfig: + description: BigqueryConfig is a parameter which configures bigquery delivery. properties: dropUnknownFields: diff --git a/pkg/clients/subscription/subscription.go b/pkg/clients/subscription/subscription.go index 78e377749..f6473aaed 100644 --- a/pkg/clients/subscription/subscription.go +++ b/pkg/clients/subscription/subscription.go @@ -53,7 +53,7 @@ func GenerateSubscription(projectID, name string, p v1alpha1.SubscriptionParamet setDeadLetterPolicy(projectID, p, s) setExpirationPolicy(p, s) setPushConfig(p, s) - setBigQueryConfig(p, s) + setBigqueryConfig(p, s) setRetryPolicy(p, s) return s @@ -86,14 +86,14 @@ func setPushConfig(p v1alpha1.SubscriptionParameters, s *pubsub.Subscription) { } } -// setBigQueryConfig sets BigQueryConfig of subscription based on SubscriptionParameters. -func setBigQueryConfig(p v1alpha1.SubscriptionParameters, s *pubsub.Subscription) { - if p.BigQueryConfig != nil { +// setBigqueryConfig sets BigqueryConfig of subscription based on SubscriptionParameters. +func setBigqueryConfig(p v1alpha1.SubscriptionParameters, s *pubsub.Subscription) { + if p.BigqueryConfig != nil { s.BigqueryConfig = &pubsub.BigQueryConfig{ - Table: p.BigQueryConfig.Table, - UseTopicSchema: p.BigQueryConfig.UseTopicSchema, - WriteMetadata: p.BigQueryConfig.WriteMetadata, - DropUnknownFields: p.BigQueryConfig.DropUnknownFields, + Table: p.BigqueryConfig.Table, + UseTopicSchema: p.BigqueryConfig.UseTopicSchema, + WriteMetadata: p.BigqueryConfig.WriteMetadata, + DropUnknownFields: p.BigqueryConfig.DropUnknownFields, } } } @@ -182,8 +182,8 @@ func LateInitialize(p *v1alpha1.SubscriptionParameters, s pubsub.Subscription) { } } - if p.BigQueryConfig == nil && s.BigqueryConfig != nil { - p.BigQueryConfig = &v1alpha1.BigQueryConfig{ + if p.BigqueryConfig == nil && s.BigqueryConfig != nil { + p.BigqueryConfig = &v1alpha1.BigqueryConfig{ Table: s.BigqueryConfig.Table, DropUnknownFields: s.BigqueryConfig.DropUnknownFields, UseTopicSchema: s.BigqueryConfig.UseTopicSchema, @@ -267,9 +267,9 @@ func GenerateUpdateRequest(name string, p v1alpha1.SubscriptionParameters, s pub setPushConfig(p, us.Subscription) } - if !cmp.Equal(p.BigQueryConfig, observed.BigQueryConfig) { - mask = append(mask, "bigQueryConfig") - setBigQueryConfig(p, us.Subscription) + if !cmp.Equal(p.BigqueryConfig, observed.BigqueryConfig) { + mask = append(mask, "bigqueryConfig") + setBigqueryConfig(p, us.Subscription) } if !cmp.Equal(p.RetryPolicy, observed.RetryPolicy) { diff --git a/pkg/clients/subscription/subscription_test.go b/pkg/clients/subscription/subscription_test.go index 006df0f03..de7da5f6e 100644 --- a/pkg/clients/subscription/subscription_test.go +++ b/pkg/clients/subscription/subscription_test.go @@ -109,7 +109,7 @@ func bigqueryParams() *v1alpha1.SubscriptionParameters { Labels: map[string]string{"example": "true"}, MessageRetentionDuration: "864000s", PushConfig: nil, - BigQueryConfig: &v1alpha1.BigQueryConfig{ + BigqueryConfig: &v1alpha1.BigqueryConfig{ Table: "projects/my-project/subscriptions/my-bigquery-subscription", UseTopicSchema: true, WriteMetadata: true, @@ -295,7 +295,7 @@ func TestLateInitializeBigquery(t *testing.T) { Labels: map[string]string{"example": "true"}, MessageRetentionDuration: "864000s", PushConfig: nil, - BigQueryConfig: &v1alpha1.BigQueryConfig{ + BigqueryConfig: &v1alpha1.BigqueryConfig{ Table: "projects/my-project/subscriptions/my-bigquery-subscription", UseTopicSchema: true, WriteMetadata: true, @@ -466,7 +466,7 @@ func TestGenerateUpdateRequestBigquery(t *testing.T) { }, result: &pubsub.UpdateSubscriptionRequest{ Subscription: mutableSubscription, - UpdateMask: "ackDeadlineSeconds,detached,filter,labels,messageRetentionDuration,retainAckedMessages,expirationPolicy,bigQueryConfig,retryPolicy", + UpdateMask: "ackDeadlineSeconds,detached,filter,labels,messageRetentionDuration,retainAckedMessages,expirationPolicy,bigqueryConfig,retryPolicy", }, }, }