Use GoModuleInfo for both ManifestWriter and GoModGenerator #410
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
Currently, `ManifestWriter` and `GoModGenerator` use different ways to calculate non-standard library dependencies and the go directive (minimum go version), which could produce inconsistencies. This commit updates both writers to use the same source of information (`GoModuleInfo`) for writing `generated.json` and `go.mod`.
syall
force-pushed
the
fix-go-mod-generation
branch
from
dcd8f9b to
a897e6d
Compare
syall
commented
Jan 27, 2023
| CodegenUtils.runCommand( | ||
| String.format("go mod edit -require=%s@%s", dependency.getKey(), dependency.getValue()), | ||
| manifest.getBaseDir()); | ||
| } | ||
|
|
||
| CodegenUtils.runCommand( | ||
| String.format("go mod edit -go=%s", settings.getGoDirective()), | ||
| String.format("go mod edit -go=%s", goModuleInfo.getGoDirective()), | ||
| manifest.getBaseDir()); |
There was a problem hiding this comment.
Not directly related to the changes in the PR, but should we run go mod tidy to generate a go.sum file?
In the GitHub Go Modules FAQ, the guidance is to check in the corresponding go.sum file produced by go mod tidy into version control.
aajtodd
approved these changes
Jan 27, 2023
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:
Related to changes in #405
Description of changes:
Currently,
ManifestWriterandGoModGeneratoruse differentways to calculate non-standard library dependencies and
the go directive (minimum go version), which could produce
inconsistencies.
This commit updates both writers to use the same source of
information (
GoModuleInfo) for writinggenerated.jsonand
go.mod.Testing:
All tests were done in
smithy-go-codegen-test:goDirectiveinsmithy-build.jsongoDirectiveingenerated.jsongoDirectiveingo.modgoDirective < default1.12IllegalArgumentExceptionIllegalArgumentExceptiongoDirective == default1.151.151.15goDirective > default1.181.181.18goDirective is undefinedundefined1.151.15The
IllegalArgumentExceptionthrown whengoDirective < defaultis:No codegen diff was produced when testing
aws-sdk-go-v2code generation (make generate).By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.