-
Notifications
You must be signed in to change notification settings - Fork 610
🌱 Migrate gc to aws sdk v2 #5518
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Danil-Grigorev
wants to merge
3
commits into
kubernetes-sigs:main
Choose a base branch
from
Danil-Grigorev:migrate-gc-to-aws-sdk-v2
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,201
−241
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,202 @@ | ||
| /* | ||
| Copyright 2025 The Kubernetes Authors. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| // Package convertersv2 provides conversion functions for AWS SDK V2 types to CAPA types. | ||
| package convertersv2 | ||
|
|
||
| import ( | ||
| "sort" | ||
|
|
||
| "github.com/aws/aws-sdk-go-v2/aws" | ||
| autoscalingtypes "github.com/aws/aws-sdk-go-v2/service/autoscaling/types" | ||
| v2ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types" | ||
| elbv1types "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing/types" | ||
| elbv2types "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" | ||
| iamtypes "github.com/aws/aws-sdk-go-v2/service/iam/types" | ||
| secretsmanagertypes "github.com/aws/aws-sdk-go-v2/service/secretsmanager/types" | ||
| ssmtypes "github.com/aws/aws-sdk-go-v2/service/ssm/types" | ||
|
|
||
| infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2" | ||
| ) | ||
|
|
||
| // TagsToMap converts a []v2ec2types.Tag into a infrav1.Tags. | ||
| func TagsToMap(src []v2ec2types.Tag) infrav1.Tags { | ||
| tags := make(infrav1.Tags, len(src)) | ||
|
|
||
| for _, t := range src { | ||
| tags[*t.Key] = *t.Value | ||
| } | ||
|
|
||
| return tags | ||
| } | ||
|
|
||
| // MapPtrToMap converts a [string]*string into a infrav1.Tags. | ||
| func MapPtrToMap(src map[string]*string) infrav1.Tags { | ||
| tags := make(infrav1.Tags, len(src)) | ||
|
|
||
| for k, v := range src { | ||
| tags[k] = *v | ||
| } | ||
|
|
||
| return tags | ||
| } | ||
|
|
||
| // MapToTags converts a infrav1.Tags to a []v2ec2types.Tag. | ||
| func MapToTags(src infrav1.Tags) []v2ec2types.Tag { | ||
| tags := make([]v2ec2types.Tag, 0, len(src)) | ||
|
|
||
| for k, v := range src { | ||
| tag := v2ec2types.Tag{ | ||
| Key: aws.String(k), | ||
| Value: aws.String(v), | ||
| } | ||
|
|
||
| tags = append(tags, tag) | ||
| } | ||
|
|
||
| // Sort so that unit tests can expect a stable order | ||
| sort.Slice(tags, func(i, j int) bool { return *tags[i].Key < *tags[j].Key }) | ||
|
|
||
| return tags | ||
| } | ||
|
|
||
| // ELBTagsToMap converts a []elbv1types.Tag into a infrav1.Tags. | ||
| func ELBTagsToMap(src []elbv1types.Tag) infrav1.Tags { | ||
| tags := make(infrav1.Tags, len(src)) | ||
|
|
||
| for _, t := range src { | ||
| tags[*t.Key] = *t.Value | ||
| } | ||
|
|
||
| return tags | ||
| } | ||
|
|
||
| // V2TagsToMap converts a []elbv2types.Tag into a infrav1.Tags. | ||
| func V2TagsToMap(src []elbv2types.Tag) infrav1.Tags { | ||
| tags := make(infrav1.Tags, len(src)) | ||
|
|
||
| for _, t := range src { | ||
| tags[*t.Key] = *t.Value | ||
| } | ||
|
|
||
| return tags | ||
| } | ||
|
|
||
| // MapToELBTags converts a infrav1.Tags to a []elbv1types.Tag. | ||
| func MapToELBTags(src infrav1.Tags) []elbv1types.Tag { | ||
| tags := make([]elbv1types.Tag, 0, len(src)) | ||
|
|
||
| for k, v := range src { | ||
| tag := elbv1types.Tag{ | ||
| Key: aws.String(k), | ||
| Value: aws.String(v), | ||
| } | ||
|
|
||
| tags = append(tags, tag) | ||
| } | ||
|
|
||
| // Sort so that unit tests can expect a stable order | ||
| sort.Slice(tags, func(i, j int) bool { return *tags[i].Key < *tags[j].Key }) | ||
|
|
||
| return tags | ||
| } | ||
|
|
||
| // MapToV2Tags converts a infrav1.Tags to a []elbv2types.Tag. | ||
| func MapToV2Tags(src infrav1.Tags) []elbv2types.Tag { | ||
| tags := make([]elbv2types.Tag, 0, len(src)) | ||
|
|
||
| for k, v := range src { | ||
| tag := elbv2types.Tag{ | ||
| Key: aws.String(k), | ||
| Value: aws.String(v), | ||
| } | ||
|
|
||
| tags = append(tags, tag) | ||
| } | ||
|
|
||
| // Sort so that unit tests can expect a stable order | ||
| sort.Slice(tags, func(i, j int) bool { return *tags[i].Key < *tags[j].Key }) | ||
|
|
||
| return tags | ||
| } | ||
|
|
||
| // MapToSecretsManagerTags converts a infrav1.Tags to a []secretsmanagertypes.Tag. | ||
| func MapToSecretsManagerTags(src infrav1.Tags) []secretsmanagertypes.Tag { | ||
| tags := make([]secretsmanagertypes.Tag, 0, len(src)) | ||
|
|
||
| for k, v := range src { | ||
| tag := secretsmanagertypes.Tag{ | ||
| Key: aws.String(k), | ||
| Value: aws.String(v), | ||
| } | ||
|
|
||
| tags = append(tags, tag) | ||
| } | ||
|
|
||
| // Sort so that unit tests can expect a stable order | ||
| sort.Slice(tags, func(i, j int) bool { return *tags[i].Key < *tags[j].Key }) | ||
|
|
||
| return tags | ||
| } | ||
|
|
||
| // MapToSSMTags converts a infrav1.Tags to a []ssm.Tag. | ||
| func MapToSSMTags(src infrav1.Tags) []ssmtypes.Tag { | ||
| tags := make([]ssmtypes.Tag, 0, len(src)) | ||
|
|
||
| for k, v := range src { | ||
| tag := ssmtypes.Tag{ | ||
| Key: aws.String(k), | ||
| Value: aws.String(v), | ||
| } | ||
|
|
||
| tags = append(tags, tag) | ||
| } | ||
|
|
||
| // Sort so that unit tests can expect a stable order | ||
| sort.Slice(tags, func(i, j int) bool { return *tags[i].Key < *tags[j].Key }) | ||
|
|
||
| return tags | ||
| } | ||
|
|
||
| // MapToIAMTags converts a infrav1.Tags to a []iamtypes.Tag. | ||
| func MapToIAMTags(src infrav1.Tags) []iamtypes.Tag { | ||
| tags := make([]iamtypes.Tag, 0, len(src)) | ||
|
|
||
| for k, v := range src { | ||
| tag := iamtypes.Tag{ | ||
| Key: aws.String(k), | ||
| Value: aws.String(v), | ||
| } | ||
|
|
||
| tags = append(tags, tag) | ||
| } | ||
|
|
||
| // Sort so that unit tests can expect a stable order | ||
| sort.Slice(tags, func(i, j int) bool { return *tags[i].Key < *tags[j].Key }) | ||
|
|
||
| return tags | ||
| } | ||
|
|
||
| // ASGTagsToMap converts a []autoscalingtypes.TagDescription into a infrav1.Tags. | ||
| func ASGTagsToMap(src []autoscalingtypes.TagDescription) infrav1.Tags { | ||
| tags := make(infrav1.Tags, len(src)) | ||
|
|
||
| for _, t := range src { | ||
| tags[*t.Key] = *t.Value | ||
| } | ||
|
|
||
| return tags | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Change is unrelated – can we take this out?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don’t think so, this change fixes stuck goreleaser build in CI: #5518 (comment) I was able to reproduce it locally, and this change fixes it. Some other AWS SDK v2 rewrite PRs are affected by this too.