fix(go): AWS SDK shape namespace #769
Merged
Conversation
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 reverts commit 2b9f006.
rishav-karanjit
changed the title
Comment on lines
+78
to
+85
| // Boolean to hold if shape is input or output of any operation | ||
| boolean isTopLevelShape = model | ||
| .shapes(OperationShape.class) | ||
| .anyMatch(op -> | ||
| op.getInput().filter(shape.getId()::equals).isPresent() || | ||
| op.getOutput().filter(shape.getId()::equals).isPresent() | ||
| ); | ||
| return isTopLevelShape ? sdkName : sdkName.concat("types"); |
There was a problem hiding this comment.
Why not overload the method and pass this boolean only when required?
There was a problem hiding this comment.
Because if we do that every time we call smithyTypesNamespace we will end-up doing a if-else check like below:
if (isShapeFromAWSSDK(shape)) {
smithyTypesNamespace(..., boolean flag);
} else {
smithyTypesNamespace(...);
}
ShubhamChaturvedi7
approved these changes
Jan 29, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Issue #, if available:
Description of changes:
Short description:
<serviceName>if shape in aws sdk models is inside input and output of operationmodelto the smithyTypeNamespace functionLong description:
All the shape which is input and output of operation is inside
github.com/aws/aws-sdk-go-v2/service/dynamodband all other inside those are ingithub.aaakk.us.kg/aws/aws-sdk-go-v2/service/dynamodb/types. However, in currentmain-1.x, smithyNameResolver return<serviceName>types(example:dynamodbtypesandkmstypes) in every scenario which is wrong. Updates from this PR loops in the model's operation shape and if the shape belong to input/output of the operation shape and uses either types or module for the shapes.Note: We alias service/types module to types. For example:
github.com/aws/aws-sdk-go-v2/service/dynamodb/typesis aliased intodynamodbtypesandgithub.aaakk.us.kg/aws/aws-sdk-go-v2/service/kms/typesintokmstypesso that there won't be name collision.Test PR in MPL after bumping smithy-dafny to this branch: aws/aws-cryptographic-material-providers-library#1243
(No polymorph changes expected in MPL because none of the model in MPL depends on shape that are inside input and output of operation shape.)
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.