Skip to content

Commit cd13360

Browse files
authored
Prepare repository for tag conversion function signature update (#150)
Description of changes: The To/FromACKTags function signatures are changing with the next code-gen release. This PR aims to ensure custom code adapts as well. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent a0ba257 commit cd13360

32 files changed

+204
-155
lines changed

apis/v1alpha1/ack-generate-metadata.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ack_generate_info:
2-
build_date: "2025-02-20T18:02:55Z"
3-
build_hash: a326346bd3a6973254d247c9ab2dc76790c36241
2+
build_date: "2025-03-14T20:25:33Z"
3+
build_hash: 0ab258c51775fd52af32e649da00d57373b20869
44
go_version: go1.24.0
5-
version: v0.43.2
5+
version: v0.43.2-6-g0ab258c
66
api_directory_checksum: feb947454f62a1c6a36512771ee31f36ae7bcb6d
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.32.6

pkg/resource/access_entry/delta.go

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/resource/access_entry/manager.go

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/resource/access_entry/sdk.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/resource/access_entry/tags.go

+17-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/resource/addon/delta.go

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/resource/addon/manager.go

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/resource/addon/sdk.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/resource/addon/tags.go

+17-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/resource/cluster/delta.go

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/resource/cluster/hook.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,8 @@ func (rm *resourceManager) customUpdate(
209209
rm.sdkapi,
210210
rm.metrics,
211211
string(*latest.ko.Status.ACKResourceMetadata.ARN),
212-
ToACKTags(desired.ko.Spec.Tags),
213-
ToACKTags(latest.ko.Spec.Tags),
212+
aws.ToStringMap(desired.ko.Spec.Tags),
213+
aws.ToStringMap(latest.ko.Spec.Tags),
214214
)
215215
if err != nil {
216216
return nil, err

pkg/resource/cluster/manager.go

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/resource/cluster/tags.go

+17-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/resource/fargate_profile/delta.go

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/resource/fargate_profile/hook.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
ackcondition "github.com/aws-controllers-k8s/runtime/pkg/condition"
2525
ackrequeue "github.com/aws-controllers-k8s/runtime/pkg/requeue"
2626
ackrtlog "github.com/aws-controllers-k8s/runtime/pkg/runtime/log"
27+
"github.com/aws/aws-sdk-go-v2/aws"
2728
svcsdk "github.com/aws/aws-sdk-go/service/eks"
2829
)
2930

@@ -78,7 +79,7 @@ func (rm *resourceManager) customUpdate(
7879
if err := tags.SyncTags(
7980
ctx, rm.sdkapi, rm.metrics,
8081
string(*latest.ko.Status.ACKResourceMetadata.ARN),
81-
ToACKTags(desired.ko.Spec.Tags), ToACKTags(latest.ko.Spec.Tags),
82+
aws.ToStringMap(desired.ko.Spec.Tags), aws.ToStringMap(latest.ko.Spec.Tags),
8283
); err != nil {
8384
return nil, err
8485
}

0 commit comments

Comments
 (0)