Skip to content

Commit 10fbeed

Browse files
authored
Revert "Change defaults when generating a client via smithy CLI (#558)" (#559)
This reverts commit 95ba318. This feature may interact in unexpected ways with existing SDK codegen, so while we figure it out we'll roll back these changes. They will be re-applied later
1 parent 95ba318 commit 10fbeed

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

codegen/smithy-go-codegen-test/smithy-build.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
"module": "github.com/aws/smithy-go/internal/tests/service/weather",
77
"moduleVersion": "0.0.1",
88
"generateGoMod": true,
9-
"goDirective": "1.21"
9+
"goDirective": "1.18"
1010
},
1111
"go-server-codegen": {
1212
"service": "example.weather#Weather",
1313
"module": "github.com/aws/smithy-go/internal/tests/server/weather",
1414
"moduleVersion": "0.0.1",
1515
"generateGoMod": true,
16-
"goDirective": "1.21"
16+
"goDirective": "1.18"
1717
}
1818
}
1919
}

codegen/smithy-go-codegen/src/main/java/software/amazon/smithy/go/codegen/GoModuleInfo.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
public final class GoModuleInfo {
2929

30-
public static final String DEFAULT_GO_DIRECTIVE = "1.21";
30+
public static final String DEFAULT_GO_DIRECTIVE = "1.15";
3131

3232
private List<SymbolDependency> dependencies;
3333

codegen/smithy-go-codegen/src/main/java/software/amazon/smithy/go/codegen/GoSettings.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public static GoSettings from(ObjectNode config, ArtifactType artifactType) {
9292
settings.setModuleDescription(config.getStringMemberOrDefault(
9393
MODULE_DESCRIPTION, settings.getModuleName() + " client"));
9494
settings.setModuleVersion(config.getStringMemberOrDefault(MODULE_VERSION, null));
95-
settings.setGenerateGoMod(config.getBooleanMemberOrDefault(GENERATE_GO_MOD, true));
95+
settings.setGenerateGoMod(config.getBooleanMemberOrDefault(GENERATE_GO_MOD, false));
9696
settings.setGoDirective(config.getStringMemberOrDefault(GO_DIRECTIVE, GoModuleInfo.DEFAULT_GO_DIRECTIVE));
9797
return settings;
9898
}

0 commit comments

Comments
 (0)