feat: Merge AWS service model files at codegen time #1545
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
jbelkins
commented
Jun 5, 2024
| @@ -63,7 +63,6 @@ jobs: | |||
| ./gradlew -p codegen/sdk-codegen build | |||
| ./gradlew -p codegen/sdk-codegen stageSdks | |||
| ./gradlew --stop | |||
| ./scripts/mergeModels.sh Sources/Services | |||
There was a problem hiding this comment.
Invocations of mergeModels.sh are removed here and in other scripts where it is currently used.
jbelkins
commented
Jun 5, 2024
| @@ -65,7 +65,8 @@ fun generateSmithyBuild(tests: List<CodegenTest>): String { | |||
| "swiftVersion": "5.7.0", | |||
| "build": { | |||
| "rootProject": true | |||
| } | |||
| }, | |||
| "mergeModels": false | |||
There was a problem hiding this comment.
Protocol tests (either local or Smithy) do not merge models
jbelkins
commented
Jun 5, 2024
| @@ -117,7 +117,8 @@ fun generateSmithyBuild(services: List<AwsService>): String { | |||
| "build": { | |||
| "rootProject": $buildStandaloneSdk | |||
| }, | |||
| "useInterceptors": ${interceptorsServices.contains(service.packageName)} | |||
| "useInterceptors": ${interceptorsServices.contains(service.packageName)}, | |||
| "mergeModels": true | |||
There was a problem hiding this comment.
When generating an AWS SDK, models are merged. This can be changed to false for troubleshooting, if desired.
jbelkins
commented
Jun 5, 2024
| @@ -11,9 +11,6 @@ rm -rf Tests/Services/* | |||
| ./gradlew -p codegen/sdk-codegen stageSdks | |||
| ./gradlew --stop | |||
|
|
|||
| # Merge model files | |||
| ./scripts/mergeModels.sh Sources/Services | |||
|
|
|||
There was a problem hiding this comment.
The rest of the changes are the removal of the mergeModels.sh script.
jbelkins
commented
Jun 5, 2024
| @@ -25,6 +25,7 @@ import software.amazon.smithy.swift.codegen.model.toUpperCamelCase | |||
| import software.amazon.smithy.swift.codegen.swiftmodules.ClientRuntimeTypes.Middleware.NoopHandler | |||
| import software.amazon.smithy.swift.codegen.swiftmodules.SmithyHTTPAPITypes | |||
| import software.amazon.smithy.swift.codegen.swiftmodules.SmithyTypes | |||
| import software.amazon.smithy.swift.codegen.utils.ModelFileUtils | |||
There was a problem hiding this comment.
The next several changes are just using the helper method to determine the filename for a generated model Swift file.
sichanyoo
approved these changes
Jun 5, 2024
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 #
#1543
Description of changes
smithy-lang/smithy-swift#752 adds an option to merge models at code-generation time.
Specific changes in SDK:
mergeModels.shscript is no longer used and is removed. References to that script are removed throughout scripting & CI.New/existing dependencies impact assessment, if applicable
No new dependencies were added to this change.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.