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): enum and map in type conversion #782

Open
wants to merge 11 commits into
base: main-1.x
Choose a base branch
from
Open

fix(go): enum and map in type conversion #782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
684f54c
Enum fix
rishav-karanjit Feb 4, 2025
ed70c3a
map fix
rishav-karanjit Feb 4, 2025
0c76cda
formatting
rishav-karanjit Feb 4, 2025
f7af900
fix
rishav-karanjit Feb 4, 2025
55aafdd
auto commit
rishav-karanjit Feb 5, 2025
f2c9377
Merge branch 'main-1.x' into go/enumfix
rishav-karanjit Feb 6, 2025
daa2e12
panic
rishav-karanjit Feb 7, 2025
bb36bd9
Merge branch 'go/enumfix' of https://github.com/smithy-lang/smithy-da…
rishav-karanjit Feb 7, 2025
c40fdae
add if check
rishav-karanjit Feb 7, 2025
af14337
auto commit
rishav-karanjit Feb 7, 2025
75e50f3
Merge branch 'main-1.x' into go/enumfix
rishav-karanjit Feb 10, 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
21 changes: 17 additions & 4 deletions ...ava/software/amazon/polymorph/smithygo/awssdk/shapevisitor/AwsSdkToDafnyShapeVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,14 +239,12 @@ public String mapShape(final MapShape shape) {
var nilWrapIfRequired = "nil";
var someWrapIfRequired = "%s";
var returnType = "dafny.Map";
var nilCheck = "";

if (this.isOptional) {
nilWrapIfRequired = "Wrappers.Companion_Option_.Create_None_()";
someWrapIfRequired = "Wrappers.Companion_Option_.Create_Some_(%s)";
returnType = "Wrappers.Option";
}
var nilCheck = "";
if (isPointerType) {
nilCheck =
"if %s == nil {return %s}".formatted(dataSource, nilWrapIfRequired);
}
Expand Down Expand Up @@ -374,10 +372,23 @@ public String stringShape(final StringShape shape) {
shape,
context.symbolProvider().toSymbol(shape)
);

var noEnumMatchedCheck =
"""
if index == len(%s.Values()) {
panic("Input value did not found in enum values")
}
""".formatted(dataSource);
if (this.isOptional) {
someWrapIfRequired = "Wrappers.Companion_Option_.Create_Some_(%s)";
returnType = "Wrappers.Option";
// In AWS SDK, some shapes don't have required trait and also don't have pointers in it.
// This will result the default value of the string be "" if not provided.
noEnumMatchedCheck =
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's be defensive and error out in case of it being required and not matching an enum value.

"""
if index == len(%s.Values()) {
return Wrappers.Companion_Option_.Create_None_()
}
""".formatted(dataSource);
}

return """
Expand All @@ -388,6 +399,7 @@ public String stringShape(final StringShape shape) {
if enumVal == %s{
break;
}
%s
}
var enum interface{}
for allEnums, i := dafny.Iterate(%s{}.AllSingletonConstructors()), 0; i < index; i++ {
Expand All @@ -402,6 +414,7 @@ var enum interface{}
returnType,
dataSource,
dataSource,
noEnumMatchedCheck,
DafnyNameResolver.getDafnyCompanionStructType(
shape,
context.symbolProvider().toSymbol(shape)
Expand Down
13 changes: 13 additions & 0 deletions ...ftware/amazon/polymorph/smithygo/localservice/shapevisitor/SmithyToDafnyShapeVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import software.amazon.smithy.model.shapes.UnionShape;
import software.amazon.smithy.model.traits.EnumTrait;
import software.amazon.smithy.model.traits.ErrorTrait;
import software.amazon.smithy.model.traits.RequiredTrait;
import software.amazon.smithy.utils.StringUtils;

/**
Expand Down Expand Up @@ -497,10 +498,20 @@ public String stringShape(final StringShape shape) {
}

var nilCheck = "";
var noEnumMatchedCheck = "";
final var dereferenceIfRequired = isPointerType ? "*" : "";
if (isPointerType) {
nilCheck =
"if %s == nil {return %s}".formatted(dataSource, nilWrapIfRequired);
} else {
// String is not pointer when its required.
// If string is not pointer and enum did not match to any value panic
noEnumMatchedCheck =
"""
if index == len(%s.Values()) {
panic("Input value did not found in enum values")
}
""".formatted(dataSource);
}
return """
func () %s {
Expand All @@ -511,6 +522,7 @@ public String stringShape(final StringShape shape) {
if enumVal == %s%s{
break;
}
%s
}
var enum interface{}
for allEnums, i := dafny.Iterate(%s{}.AllSingletonConstructors()), 0; i < index; i++ {
Expand All @@ -527,6 +539,7 @@ var enum interface{}
dataSource,
dereferenceIfRequired,
dataSource,
noEnumMatchedCheck,
DafnyNameResolver.getDafnyCompanionStructType(
shape,
context.symbolProvider().toSymbol(shape)
Expand Down
Loading