fix: Add service client version to user-agent #851
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
Nov 5, 2024
| dependenciesByTarget.forEach { writeTargetDependency(writer, it) } | ||
| } | ||
| writer.openBlock("resources: [", "]") { | ||
| writer.write(".process(\"Resources\")") | ||
| } |
There was a problem hiding this comment.
Removed the resources declaration from the service client, since it doesn't have resources anymore.
jbelkins
commented
Nov 5, 2024
| val SMITHY_XML = smithySwiftDependency("SmithyXML") | ||
| val SMITHY_JSON = smithySwiftDependency("SmithyJSON") | ||
| val SMITHY_FORM_URL = smithySwiftDependency("SmithyFormURL") | ||
| val SMITHY_WAITERS_API = smithySwiftDependency("SmithyWaitersAPI") |
There was a problem hiding this comment.
All of the smithy-swift libraries have been DRYed up with the helper method below.
jbelkins
commented
Nov 5, 2024
| @@ -30,6 +30,7 @@ open class HttpProtocolServiceClient( | |||
| ClientRuntimeTypes.Core.Client, | |||
| ) { | |||
| writer.write("public static let clientName = \$S", serviceSymbol.name) | |||
| writer.write("public static let version = \$S", ctx.settings.moduleVersion) | |||
There was a problem hiding this comment.
This is the static property on service client that contains the version.
jbelkins
commented
Nov 5, 2024
| val TestInitializer = runtimeSymbol("TestInitializer") | ||
| val TestBaseError = runtimeSymbol("TestBaseError") | ||
| val TestInitializer = runtimeSymbol("TestInitializer", SwiftDeclaration.ENUM) | ||
| val TestBaseError = runtimeSymbol("TestBaseError", SwiftDeclaration.STRUCT) |
There was a problem hiding this comment.
Added type info to these symbols.
jbelkins
commented
Nov 5, 2024
| @@ -17,9 +18,15 @@ class PackageManifestGeneratorTests { | |||
| private val testContext = setupTests("simple-service-with-operation-and-dependency.smithy", "smithy.example#Example") | |||
|
|
|||
| @Test | |||
| fun `it renders package manifest file with macOS and iOS platforms block`() { | |||
| fun `it starts with a swift-tools-version statement`() { | |||
There was a problem hiding this comment.
Added this test because a Swift package manifest is invalid without it.
dayaffe
approved these changes
Nov 6, 2024
sichanyoo
approved these changes
Nov 6, 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.
Description of changes
versionproperty into each service clientSwiftDependenciesand DRY them up with a helper functionScope
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.