From 1db3994cf82f3d765ef4c02bd3121f6637410b27 Mon Sep 17 00:00:00 2001 From: Cem Mergenci Date: Thu, 21 Nov 2024 14:33:30 +0300 Subject: [PATCH] Manually backport new `omitempty` struct tags. Signed-off-by: Cem Mergenci --- apis/deploy/v1beta1/zz_deploymentgroup_types.go | 2 +- apis/firehose/v1beta1/zz_deliverystream_types.go | 8 ++++---- apis/glue/v1beta1/zz_crawler_types.go | 2 +- apis/kinesisanalyticsv2/v1beta1/zz_application_types.go | 4 ++-- apis/ssm/v1beta1/zz_association_types.go | 2 +- apis/ssm/v1beta1/zz_maintenancewindowtask_types.go | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apis/deploy/v1beta1/zz_deploymentgroup_types.go b/apis/deploy/v1beta1/zz_deploymentgroup_types.go index 1a930cec39..e32cfe4f38 100755 --- a/apis/deploy/v1beta1/zz_deploymentgroup_types.go +++ b/apis/deploy/v1beta1/zz_deploymentgroup_types.go @@ -743,7 +743,7 @@ type ProdTrafficRouteParameters struct { // +crossplane:generate:reference:extractor=github.com/crossplane/upjet/pkg/resource.ExtractParamPath("arn",true) // +kubebuilder:validation:Optional // +listType=set - ListenerArns []*string `json:"listenerArns" tf:"listener_arns,omitempty"` + ListenerArns []*string `json:"listenerArns,omitempty" tf:"listener_arns,omitempty"` // References to LBListener in elbv2 to populate listenerArns. // +kubebuilder:validation:Optional diff --git a/apis/firehose/v1beta1/zz_deliverystream_types.go b/apis/firehose/v1beta1/zz_deliverystream_types.go index 5f73b2747c..2764058add 100755 --- a/apis/firehose/v1beta1/zz_deliverystream_types.go +++ b/apis/firehose/v1beta1/zz_deliverystream_types.go @@ -2592,7 +2592,7 @@ type OpensearchConfigurationVPCConfigParameters struct { // +crossplane:generate:reference:extractor=github.com/crossplane/upjet/pkg/resource.ExtractResourceID() // +kubebuilder:validation:Optional // +listType=set - SecurityGroupIds []*string `json:"securityGroupIds" tf:"security_group_ids,omitempty"` + SecurityGroupIds []*string `json:"securityGroupIds,omitempty" tf:"security_group_ids,omitempty"` // References to SecurityGroup in ec2 to populate securityGroupIds. // +kubebuilder:validation:Optional @@ -2607,7 +2607,7 @@ type OpensearchConfigurationVPCConfigParameters struct { // +crossplane:generate:reference:extractor=github.com/crossplane/upjet/pkg/resource.ExtractResourceID() // +kubebuilder:validation:Optional // +listType=set - SubnetIds []*string `json:"subnetIds" tf:"subnet_ids,omitempty"` + SubnetIds []*string `json:"subnetIds,omitempty" tf:"subnet_ids,omitempty"` // References to Subnet in ec2 to populate subnetIds. // +kubebuilder:validation:Optional @@ -5937,7 +5937,7 @@ type VPCConfigParameters struct { // +crossplane:generate:reference:extractor=github.com/crossplane/upjet/pkg/resource.ExtractResourceID() // +kubebuilder:validation:Optional // +listType=set - SecurityGroupIds []*string `json:"securityGroupIds" tf:"security_group_ids,omitempty"` + SecurityGroupIds []*string `json:"securityGroupIds,omitempty" tf:"security_group_ids,omitempty"` // References to SecurityGroup in ec2 to populate securityGroupIds. // +kubebuilder:validation:Optional @@ -5952,7 +5952,7 @@ type VPCConfigParameters struct { // +crossplane:generate:reference:extractor=github.com/crossplane/upjet/pkg/resource.ExtractResourceID() // +kubebuilder:validation:Optional // +listType=set - SubnetIds []*string `json:"subnetIds" tf:"subnet_ids,omitempty"` + SubnetIds []*string `json:"subnetIds,omitempty" tf:"subnet_ids,omitempty"` // References to Subnet in ec2 to populate subnetIds. // +kubebuilder:validation:Optional diff --git a/apis/glue/v1beta1/zz_crawler_types.go b/apis/glue/v1beta1/zz_crawler_types.go index 3e02ba9514..bedc8334c6 100755 --- a/apis/glue/v1beta1/zz_crawler_types.go +++ b/apis/glue/v1beta1/zz_crawler_types.go @@ -97,7 +97,7 @@ type CatalogTargetParameters struct { // A list of catalog tables to be synchronized. // +crossplane:generate:reference:type=github.com/upbound/provider-aws/apis/glue/v1beta2.CatalogTable // +kubebuilder:validation:Optional - Tables []*string `json:"tables" tf:"tables,omitempty"` + Tables []*string `json:"tables,omitempty" tf:"tables,omitempty"` // References to CatalogTable in glue to populate tables. // +kubebuilder:validation:Optional diff --git a/apis/kinesisanalyticsv2/v1beta1/zz_application_types.go b/apis/kinesisanalyticsv2/v1beta1/zz_application_types.go index 39b4b1e83c..21dab69a08 100755 --- a/apis/kinesisanalyticsv2/v1beta1/zz_application_types.go +++ b/apis/kinesisanalyticsv2/v1beta1/zz_application_types.go @@ -1694,7 +1694,7 @@ type VPCConfigurationParameters struct { // +crossplane:generate:reference:extractor=github.com/crossplane/upjet/pkg/resource.ExtractResourceID() // +kubebuilder:validation:Optional // +listType=set - SecurityGroupIds []*string `json:"securityGroupIds" tf:"security_group_ids,omitempty"` + SecurityGroupIds []*string `json:"securityGroupIds,omitempty" tf:"security_group_ids,omitempty"` // References to SecurityGroup in ec2 to populate securityGroupIds. // +kubebuilder:validation:Optional @@ -1709,7 +1709,7 @@ type VPCConfigurationParameters struct { // +crossplane:generate:reference:extractor=github.com/crossplane/upjet/pkg/resource.ExtractResourceID() // +kubebuilder:validation:Optional // +listType=set - SubnetIds []*string `json:"subnetIds" tf:"subnet_ids,omitempty"` + SubnetIds []*string `json:"subnetIds,omitempty" tf:"subnet_ids,omitempty"` // References to Subnet in ec2 to populate subnetIds. // +kubebuilder:validation:Optional diff --git a/apis/ssm/v1beta1/zz_association_types.go b/apis/ssm/v1beta1/zz_association_types.go index 46ee8e642e..0e6469ee4d 100755 --- a/apis/ssm/v1beta1/zz_association_types.go +++ b/apis/ssm/v1beta1/zz_association_types.go @@ -300,7 +300,7 @@ type TargetsParameters struct { // +crossplane:generate:reference:type=github.com/upbound/provider-aws/apis/ec2/v1beta2.Instance // +crossplane:generate:reference:extractor=github.com/crossplane/upjet/pkg/resource.ExtractResourceID() // +kubebuilder:validation:Optional - Values []*string `json:"values" tf:"values,omitempty"` + Values []*string `json:"values,omitempty" tf:"values,omitempty"` // References to Instance in ec2 to populate values. // +kubebuilder:validation:Optional diff --git a/apis/ssm/v1beta1/zz_maintenancewindowtask_types.go b/apis/ssm/v1beta1/zz_maintenancewindowtask_types.go index db023531a7..d1d467e4f4 100755 --- a/apis/ssm/v1beta1/zz_maintenancewindowtask_types.go +++ b/apis/ssm/v1beta1/zz_maintenancewindowtask_types.go @@ -372,7 +372,7 @@ type MaintenanceWindowTaskTargetsParameters struct { // +crossplane:generate:reference:type=github.com/upbound/provider-aws/apis/ec2/v1beta2.Instance // +crossplane:generate:reference:extractor=github.com/crossplane/upjet/pkg/resource.ExtractResourceID() // +kubebuilder:validation:Optional - Values []*string `json:"values" tf:"values,omitempty"` + Values []*string `json:"values,omitempty" tf:"values,omitempty"` // References to Instance in ec2 to populate values. // +kubebuilder:validation:Optional