-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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
Migrate aws sdk go v1 to v2 #3844
Merged
+5,568
−45,386
Merged
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
3a5ffdb
Migrate aws sdk go v1 to v2
shraddhabang 9961470
Migrate aws sdk go v1 to v2
shraddhabang 6346fbe
Merge branch 'kubernetes-sigs:main' into main
shraddhabang 7796c0e
Adding pending tasks
shraddhabang 886ada2
Fix the endpoint ports to avoid reconciles
shraddhabang 77aaf66
Merge branch 'kubernetes-sigs:main' into main
shraddhabang d4bf180
Addressing Yang's comments
shraddhabang 83f7110
Merge branch 'main' into main
shraddhabang a1a71c9
Resolve merge conflicts
shraddhabang 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 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 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 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 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 |
---|---|---|
|
@@ -44,6 +44,10 @@ type Parser interface { | |
// returns whether annotation exists and parser error if any. | ||
ParseInt64Annotation(annotation string, value *int64, annotations map[string]string, opts ...ParseOption) (bool, error) | ||
|
||
// ParseInt32Annotation parses annotation into int32 value, | ||
// returns whether annotation exists and parser error if any. | ||
ParseInt32Annotation(annotation string, value *int32, annotations map[string]string, opts ...ParseOption) (bool, error) | ||
|
||
// ParseStringSliceAnnotation parses comma separated values from the annotation into string slice | ||
// returns true if the annotation exists | ||
ParseStringSliceAnnotation(annotation string, value *[]string, annotations map[string]string, opts ...ParseOption) bool | ||
|
@@ -106,6 +110,20 @@ func (p *suffixAnnotationParser) ParseInt64Annotation(annotation string, value * | |
return true, nil | ||
} | ||
|
||
func (p *suffixAnnotationParser) ParseInt32Annotation(annotation string, value *int32, annotations map[string]string, opts ...ParseOption) (bool, error) { | ||
raw := "" | ||
exists, matchedKey := p.parseStringAnnotation(annotation, &raw, annotations, opts...) | ||
if !exists { | ||
return false, nil | ||
} | ||
i, err := strconv.ParseInt(raw, 10, 64) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. should be 32 instead of 64 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Fixed. :D |
||
if err != nil { | ||
return true, errors.Wrapf(err, "failed to parse int32 annotation, %v: %v", matchedKey, raw) | ||
} | ||
*value = int32(i) | ||
return true, nil | ||
} | ||
|
||
func (p *suffixAnnotationParser) ParseStringSliceAnnotation(annotation string, value *[]string, annotations map[string]string, opts ...ParseOption) bool { | ||
raw := "" | ||
if exists, _ := p.parseStringAnnotation(annotation, &raw, annotations, opts...); !exists { | ||
|
Oops, something went wrong.
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.
Why do we need this
ParseInt32Annotation()
in addition toParseInt64Annotation()
?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.
Theaws-sdk-v2 now migrated all the int64 types to int32. Hence to minimize the conversions after parsing. I have created a new parsing method.