From ac97eea52362fb4b539d0eee923251e361129873 Mon Sep 17 00:00:00 2001 From: Kyrie Chen Date: Mon, 5 Dec 2022 20:30:09 -0500 Subject: [PATCH] Updates by new code-generator. --- apis/v1alpha1/ack-generate-metadata.yaml | 10 +++++----- apis/v1alpha1/subnet_group.go | 4 ++-- apis/v1alpha1/types.go | 4 ++-- helm/crds/memorydb.services.k8s.aws_subnetgroups.yaml | 4 ++-- pkg/resource/acl/tags.go | 10 ++++++---- pkg/resource/cluster/tags.go | 10 ++++++---- pkg/resource/parameter_group/tags.go | 10 ++++++---- pkg/resource/snapshot/tags.go | 10 ++++++---- pkg/resource/subnet_group/tags.go | 10 ++++++---- pkg/resource/user/tags.go | 10 ++++++---- 10 files changed, 47 insertions(+), 35 deletions(-) diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index 845317e..7abefb3 100755 --- a/apis/v1alpha1/ack-generate-metadata.yaml +++ b/apis/v1alpha1/ack-generate-metadata.yaml @@ -1,9 +1,9 @@ ack_generate_info: - build_date: "2022-09-12T19:52:33Z" - build_hash: 2944c8772f216656d84ee02d392eaca501274c1e - go_version: go1.17.5 - version: v0.20.1 -api_directory_checksum: 93069d6d43fb053a96eda1dfc900fbe410ce5b1e + build_date: "2022-12-06T01:26:44Z" + build_hash: c1f00b512eb25d054b6b5faa67674d9a08e28b38 + go_version: go1.19 + version: v0.20.1-2-gc1f00b5 +api_directory_checksum: a1e396caca4bdd1612fa7d09f0ee56f3e4976ff7 api_version: v1alpha1 aws_sdk_go_version: v1.44.93 generator_config_info: diff --git a/apis/v1alpha1/subnet_group.go b/apis/v1alpha1/subnet_group.go index 012ef63..233d487 100644 --- a/apis/v1alpha1/subnet_group.go +++ b/apis/v1alpha1/subnet_group.go @@ -24,9 +24,9 @@ import ( // // Represents the output of one of the following operations: // -// * CreateSubnetGroup +// - CreateSubnetGroup // -// * UpdateSubnetGroup +// - UpdateSubnetGroup // // A subnet group is a collection of subnets (typically private) that you can // designate for your clusters running in an Amazon Virtual Private Cloud (VPC) diff --git a/apis/v1alpha1/types.go b/apis/v1alpha1/types.go index 2aa826b..63fb2ee 100644 --- a/apis/v1alpha1/types.go +++ b/apis/v1alpha1/types.go @@ -298,9 +298,9 @@ type Subnet struct { // Represents the output of one of the following operations: // -// * CreateSubnetGroup +// - CreateSubnetGroup // -// * UpdateSubnetGroup +// - UpdateSubnetGroup // // A subnet group is a collection of subnets (typically private) that you can // designate for your clusters running in an Amazon Virtual Private Cloud (VPC) diff --git a/helm/crds/memorydb.services.k8s.aws_subnetgroups.yaml b/helm/crds/memorydb.services.k8s.aws_subnetgroups.yaml index a10d737..1f2a030 100644 --- a/helm/crds/memorydb.services.k8s.aws_subnetgroups.yaml +++ b/helm/crds/memorydb.services.k8s.aws_subnetgroups.yaml @@ -34,8 +34,8 @@ spec: type: object spec: description: "SubnetGroupSpec defines the desired state of SubnetGroup. - \n Represents the output of one of the following operations: \n * CreateSubnetGroup - \n * UpdateSubnetGroup \n A subnet group is a collection of subnets + \n Represents the output of one of the following operations: \n - CreateSubnetGroup + \n - UpdateSubnetGroup \n A subnet group is a collection of subnets (typically private) that you can designate for your clusters running in an Amazon Virtual Private Cloud (VPC) environment." properties: diff --git a/pkg/resource/acl/tags.go b/pkg/resource/acl/tags.go index 4c521f8..d3c4d74 100644 --- a/pkg/resource/acl/tags.go +++ b/pkg/resource/acl/tags.go @@ -36,10 +36,12 @@ func ToACKTags(tags []*svcapitypes.Tag) acktags.Tags { } for _, t := range tags { - if t.Value == nil { - result[*t.Key] = "" - } else { - result[*t.Key] = *t.Value + if t.Key != nil { + if t.Value == nil { + result[*t.Key] = "" + } else { + result[*t.Key] = *t.Value + } } } diff --git a/pkg/resource/cluster/tags.go b/pkg/resource/cluster/tags.go index e449089..1eed1ff 100644 --- a/pkg/resource/cluster/tags.go +++ b/pkg/resource/cluster/tags.go @@ -36,10 +36,12 @@ func ToACKTags(tags []*svcapitypes.Tag) acktags.Tags { } for _, t := range tags { - if t.Value == nil { - result[*t.Key] = "" - } else { - result[*t.Key] = *t.Value + if t.Key != nil { + if t.Value == nil { + result[*t.Key] = "" + } else { + result[*t.Key] = *t.Value + } } } diff --git a/pkg/resource/parameter_group/tags.go b/pkg/resource/parameter_group/tags.go index 2a27bb4..4f3af85 100644 --- a/pkg/resource/parameter_group/tags.go +++ b/pkg/resource/parameter_group/tags.go @@ -36,10 +36,12 @@ func ToACKTags(tags []*svcapitypes.Tag) acktags.Tags { } for _, t := range tags { - if t.Value == nil { - result[*t.Key] = "" - } else { - result[*t.Key] = *t.Value + if t.Key != nil { + if t.Value == nil { + result[*t.Key] = "" + } else { + result[*t.Key] = *t.Value + } } } diff --git a/pkg/resource/snapshot/tags.go b/pkg/resource/snapshot/tags.go index 3b2ae4a..37b6a61 100644 --- a/pkg/resource/snapshot/tags.go +++ b/pkg/resource/snapshot/tags.go @@ -36,10 +36,12 @@ func ToACKTags(tags []*svcapitypes.Tag) acktags.Tags { } for _, t := range tags { - if t.Value == nil { - result[*t.Key] = "" - } else { - result[*t.Key] = *t.Value + if t.Key != nil { + if t.Value == nil { + result[*t.Key] = "" + } else { + result[*t.Key] = *t.Value + } } } diff --git a/pkg/resource/subnet_group/tags.go b/pkg/resource/subnet_group/tags.go index 5ce354b..aa6b388 100644 --- a/pkg/resource/subnet_group/tags.go +++ b/pkg/resource/subnet_group/tags.go @@ -36,10 +36,12 @@ func ToACKTags(tags []*svcapitypes.Tag) acktags.Tags { } for _, t := range tags { - if t.Value == nil { - result[*t.Key] = "" - } else { - result[*t.Key] = *t.Value + if t.Key != nil { + if t.Value == nil { + result[*t.Key] = "" + } else { + result[*t.Key] = *t.Value + } } } diff --git a/pkg/resource/user/tags.go b/pkg/resource/user/tags.go index 15ae36b..4276c24 100644 --- a/pkg/resource/user/tags.go +++ b/pkg/resource/user/tags.go @@ -36,10 +36,12 @@ func ToACKTags(tags []*svcapitypes.Tag) acktags.Tags { } for _, t := range tags { - if t.Value == nil { - result[*t.Key] = "" - } else { - result[*t.Key] = *t.Value + if t.Key != nil { + if t.Value == nil { + result[*t.Key] = "" + } else { + result[*t.Key] = *t.Value + } } }