Skip to content
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.

Sign up for GitHub

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

fix(go): AWS SDK shape namespace #769

Merged
merged 13 commits into from
Jan 29, 2025
Merged

fix(go): AWS SDK shape namespace #769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2b9f006
auto commit
rishav-karanjit Jan 21, 2025
f773675
handle top level shapes in aws sdk
rishav-karanjit Jan 22, 2025
cb22b02
Revert "auto commit"
rishav-karanjit Jan 22, 2025
7aafe76
auto commit
rishav-karanjit Jan 22, 2025
c714143
Merge branch 'main-1.x' into rishav/go/fixawssdkshape
rishav-karanjit Jan 22, 2025
91efc1d
add model parameter to smithyTypesNamespace
rishav-karanjit Jan 22, 2025
f82fd60
merge
rishav-karanjit Jan 22, 2025
a3f3933
formatting
rishav-karanjit Jan 22, 2025
88a1d11
remove debugging code
rishav-karanjit Jan 22, 2025
6bccf65
merge
rishav-karanjit Jan 27, 2025
b58a0e3
auto commit
rishav-karanjit Jan 27, 2025
320d548
fix merge
rishav-karanjit Jan 27, 2025
915a6e6
formatting
rishav-karanjit Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ...-codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/StructureGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,10 @@ public void renderStructure(Runnable runnable, boolean isInputStructure) {
.getProperty(SymbolUtils.INPUT_VARIANT, Symbol.class)
.orElse(memberSymbol);
}
var namespace = SmithyNameResolver.smithyTypesNamespace(targetShape);
var namespace = SmithyNameResolver.smithyTypesNamespace(
targetShape,
model
);

if (targetShape.hasTrait(ReferenceTrait.class)) {
memberSymbol =
Expand Down Expand Up @@ -158,7 +161,7 @@ public void renderStructure(Runnable runnable, boolean isInputStructure) {
targetShape.getId().getNamespace()
),
"types",
SmithyNameResolver.smithyTypesNamespace(targetShape)
SmithyNameResolver.smithyTypesNamespace(targetShape, model)
);
} else if (
!member
Expand Down
21 changes: 10 additions & 11 deletions ...dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/SymbolVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,11 +400,10 @@ public Symbol mapShape(MapShape shape) {

private Symbol.Builder symbolBuilderFor(Shape shape, String typeName) {
final String namespace;
if (shape.hasTrait(ServiceTrait.class)) {
namespace =
shape.expectTrait(ServiceTrait.class).getSdkId().toLowerCase();
if (SmithyNameResolver.isShapeFromAWSSDK(shape)) {
namespace = SmithyNameResolver.smithyTypesNamespace(shape, model);
} else {
namespace = SmithyNameResolver.smithyTypesNamespace(shape);
namespace = SmithyNameResolver.smithyTypesNamespace(shape, model);
}
if (pointableIndex.isPointable(shape)) {
return SymbolUtils.createPointableSymbolBuilder(
Expand Down Expand Up @@ -541,11 +540,11 @@ public Symbol stringShape(StringShape shape) {
return symbolBuilderFor(
shape,
name,
SmithyNameResolver.smithyTypesNamespace(shape)
SmithyNameResolver.smithyTypesNamespace(shape, model)
)
.definitionFile(
"./%s/enums.go".formatted(
SmithyNameResolver.smithyTypesNamespace(shape)
SmithyNameResolver.smithyTypesNamespace(shape, model)
)
)
.build();
Expand Down Expand Up @@ -576,13 +575,13 @@ public Symbol structureShape(StructureShape shape) {
if (shape.hasTrait(ErrorTrait.ID)) {
builder.definitionFile(
"./%s/errors.go".formatted(
SmithyNameResolver.smithyTypesNamespace(shape)
SmithyNameResolver.smithyTypesNamespace(shape, model)
)
);
} else {
builder.definitionFile(
"./%s/types.go".formatted(
SmithyNameResolver.smithyTypesNamespace(shape)
SmithyNameResolver.smithyTypesNamespace(shape, model)
)
);
}
Expand Down Expand Up @@ -646,7 +645,7 @@ public Symbol unionShape(UnionShape shape) {
return symbolBuilderFor(
shape,
name,
SmithyNameResolver.smithyTypesNamespace(shape)
SmithyNameResolver.smithyTypesNamespace(shape, model)
)
.definitionFile("./types/types.go")
.build();
Expand All @@ -672,11 +671,11 @@ public Symbol intEnumShape(IntEnumShape shape) {
return symbolBuilderFor(
shape,
name,
SmithyNameResolver.smithyTypesNamespace(settings.getService(model))
SmithyNameResolver.smithyTypesNamespace(settings.getService(model), model)
)
.definitionFile(
"./%s/enums.go".formatted(
SmithyNameResolver.smithyTypesNamespace(shape)
SmithyNameResolver.smithyTypesNamespace(shape, model)
)
)
.build();
Expand Down
5 changes: 4 additions & 1 deletion ...afny-codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/UnionGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,10 @@ public void generateUnion(GoWriter writer) {
writer.write("Value $T", memberSymbol);
} else {
// Handling smithy-dafny Reference Trait begins
var namespace = SmithyNameResolver.smithyTypesNamespace(target);
var namespace = SmithyNameResolver.smithyTypesNamespace(
target,
model
);
var newMemberSymbol = memberSymbol;
if (target.hasTrait(ReferenceTrait.class)) {
newMemberSymbol =
Expand Down
30 changes: 18 additions & 12 deletions ...codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/ValidationGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,8 @@ private void renderListShape(
);
final var inputType = GoCodegenUtils.getType(
symbolProvider.toSymbol(currentShape),
isExternalShape
isExternalShape,
context.model()
);
if (isExternalShape) {
if (SmithyNameResolver.isShapeFromAWSSDK(currentShape)) {
Expand All @@ -523,14 +524,14 @@ private void renderListShape(
currentShape.getId().getNamespace()
),
"types",
SmithyNameResolver.smithyTypesNamespace(currentShape)
SmithyNameResolver.smithyTypesNamespace(currentShape, model)
);
} else {
writer.addImportFromModule(
SmithyNameResolver.getGoModuleNameForSmithyNamespace(
currentShape.getId().getNamespace()
),
SmithyNameResolver.smithyTypesNamespace(currentShape)
SmithyNameResolver.smithyTypesNamespace(currentShape, model)
);
}
}
Expand Down Expand Up @@ -610,7 +611,8 @@ private void renderMapShape(
);
final var inputType = GoCodegenUtils.getType(
symbolProvider.toSymbol(currentShape),
isExternalShape
isExternalShape,
context.model()
);
if (isExternalShape) {
if (SmithyNameResolver.isShapeFromAWSSDK(currentShape)) {
Expand All @@ -619,14 +621,14 @@ private void renderMapShape(
currentShape.getId().getNamespace()
),
"types",
SmithyNameResolver.smithyTypesNamespace(currentShape)
SmithyNameResolver.smithyTypesNamespace(currentShape, model)
);
} else {
writer.addImportFromModule(
SmithyNameResolver.getGoModuleNameForSmithyNamespace(
currentShape.getId().getNamespace()
),
SmithyNameResolver.smithyTypesNamespace(currentShape)
SmithyNameResolver.smithyTypesNamespace(currentShape, model)
);
}
}
Expand Down Expand Up @@ -671,18 +673,21 @@ private void renderUnionShape(
var dataSourceForUnion = dataSource;
final var currServiceShapeNamespace =
SmithyNameResolver.smithyTypesNamespace(
context.settings().getService(model)
context.settings().getService(model),
model
);
final var currShapeNamespace = SmithyNameResolver.smithyTypesNamespace(
model.expectShape(memberShape.getTarget())
model.expectShape(memberShape.getTarget()),
model
);
if (!funcInput.isEmpty()) {
final Boolean isExternalShape =
!currServiceShapeNamespace.equals(currShapeNamespace) &&
!currShapeNamespace.startsWith("smithy");
final var inputType = GoCodegenUtils.getType(
symbolProvider.toSymbol(currentShape),
isExternalShape
isExternalShape,
context.model()
);
if (isExternalShape) {
if (SmithyNameResolver.isShapeFromAWSSDK(currentShape)) {
Expand All @@ -691,14 +696,14 @@ private void renderUnionShape(
currentShape.getId().getNamespace()
),
"types",
SmithyNameResolver.smithyTypesNamespace(currentShape)
SmithyNameResolver.smithyTypesNamespace(currentShape, model)
);
} else {
writer.addImportFromModule(
SmithyNameResolver.getGoModuleNameForSmithyNamespace(
currentShape.getId().getNamespace()
),
SmithyNameResolver.smithyTypesNamespace(currentShape)
SmithyNameResolver.smithyTypesNamespace(currentShape, model)
);
}
}
Expand All @@ -721,7 +726,8 @@ private void renderUnionShape(
);
for (final var memberInUnion : currentShape.getAllMembers().values()) {
final var currMemberNamespace = SmithyNameResolver.smithyTypesNamespace(
currentShape
currentShape,
model
);
final Boolean isExternalShape =
!currServiceShapeNamespace.equals(currMemberNamespace) &&
Expand Down
Loading
Loading