chore: Separate Registry CLI tools from AWSSDKSwiftCLI #1620
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
changed the title
jbelkins
commented
Jul 10, 2024
| @@ -7,12 +7,14 @@ let package = Package( | |||
| platforms: [ | |||
| .macOS(.v13) | |||
| ], | |||
| products: [ | |||
| .library(name: "AWSCLIUtils", targets: ["AWSCLIUtils"]), | |||
| ], | |||
There was a problem hiding this comment.
This product is published so AWSCLIUtils can be shared with other packages (like the new SPRCLI package.)
jbelkins
commented
Jul 10, 2024
| .product(name: "AWSS3", package: "aws-sdk-swift"), | ||
| .product(name: "AWSCloudFront", package: "aws-sdk-swift"), | ||
| ] | ||
| ), |
There was a problem hiding this comment.
All the SPR targets in AWSSDKSwiftCLI, along with the SDK dependency, are moved to the new SPRCLI package defined below.
jbelkins
commented
Jul 10, 2024
| dependencies: [ | ||
| .package(url: "https://github.com/apple/swift-argument-parser", from: "1.2.0"), | ||
| .package(url: "https://github.com/awslabs/aws-sdk-swift", from: "0.46.0"), | ||
| .package(path: "../AWSSDKSwiftCLI"), |
There was a problem hiding this comment.
The AWSCLIUtils are accessed by adding the local copy of AWSSDKSwiftCLI as a dependency.
jbelkins
commented
Jul 10, 2024
| .product(name: "AWSS3", package: "aws-sdk-swift"), | ||
| .product(name: "AWSCloudFront", package: "aws-sdk-swift"), | ||
| ] | ||
| ), |
There was a problem hiding this comment.
The three targets above were copied in from AWSSDKSwiftCLI.
jbelkins
commented
Jul 10, 2024
| @@ -12,7 +12,6 @@ rm -rf Tests/Services/* | |||
| ./gradlew --stop | |||
|
|
|||
| # Regenerate the SDK Package.swift with all services | |||
| unset AWS_SWIFT_SDK_USE_LOCAL_DEPS | |||
There was a problem hiding this comment.
Un-setting this env var is no longer needed when building AWSSDKSwiftCLI since it does not depend on the SDK anymore.
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 #
#1621
Description of changes
Having the package manifest generator, located in
AWSSDKSwiftCLI, depend on the SDK itself has proven problematic:AWS_SWIFT_SDK_USE_LOCAL_DEPSenv var, which must be set in most situations in development & CI, prevents theAWSSDKSwiftCLIpackage from building with stable aws-sdk-swift as a dependency.AWSSDKSwiftCLIis run to update the manifest, but the manifest being updated is also part of the code being built.The problem is addressed by separating the Registry CLI tools into a separate Swift package, allowing the
aws-sdk-swiftdependency to be removed fromAWSSDKSwiftCLI.AWSSDKSwiftCLIpublishes its reusableAWSCLIUtilsas a library, so it may be used by the Registry CLI as a dependency.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.