Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: Standalone integration test package #1585

Merged
merged 20 commits into from
Jun 25, 2024
Merged

feat!: Standalone integration test package #1585

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
789add6
Add Package.swift to make integration test an independent package.
Jun 20, 2024
a4b593d
Update package manifest codegen flag name from includeIntegrationTest…
Jun 20, 2024
4413755
Remove test target additions from integration test helper functions i…
Jun 20, 2024
315328b
Update integ test CI with new flag name & use the new IntegrationTest…
Jun 20, 2024
99e534c
Fix cd to wrong directory lol
Jun 20, 2024
5d5bd07
Fetch aws-sdk from local instead of GH.
Jun 20, 2024
18c9b81
Misc. fixes
Jun 20, 2024
b646031
Change command order
Jun 20, 2024
2116421
Linux integ test CI fix?
Jun 20, 2024
d4b1d2c
Remoeve unnecessary command continuation \.
Jun 20, 2024
bad5bc0
Move xcscheme and xctestplan to under IntegrationTests/.
Jun 21, 2024
83f6160
Fix xctestplan path for apple integ test CI & try fix for Linux integ…
Jun 21, 2024
a917d77
Merge branch 'main' into feat/integ-test-package
Jun 24, 2024
57f05a1
Remove integration test logic from main Package.swift
jbelkins Jun 25, 2024
9456f9c
Remove more integration test logic from main project
jbelkins Jun 25, 2024
2decae3
Delete dead code
jbelkins Jun 25, 2024
93bd89b
Remove unused modules from dependency & make AWS runtime dependency b…
Jun 25, 2024
5f7da75
Resolve PR comment.
Jun 25, 2024
5ff38c8
Fix commas
Jun 25, 2024
aaedd05
Merge main into feat/integ-test-package.
Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 19 additions & 16 deletions IntegrationTests/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,14 @@ extension Target.Dependency {
// AWS modules
static var awsClientRuntime: Self { .product(name: "AWSClientRuntime", package: "aws-sdk-swift") }
static var awsSDKCommon: Self { .product(name: "AWSSDKCommon", package: "aws-sdk-swift") }
static var awsSDKEventStreamsAuth: Self { .product(name: "AWSSDKEventStreamsAuth", package: "aws-sdk-swift") }
static var awsSDKHTTPAuth: Self { .product(name: "AWSSDKHTTPAuth", package: "aws-sdk-swift") }
static var awsSDKIdentity: Self { .product(name: "AWSSDKIdentity", package: "aws-sdk-swift") }

// CRT module
static var crt: Self { .product(name: "AwsCommonRuntimeKit", package: "aws-crt-swift") }

// Smithy modules
static var clientRuntime: Self { .product(name: "ClientRuntime", package: "smithy-swift") }
static var smithy: Self { .product(name: "Smithy", package: "smithy-swift") }
static var smithyChecksumsAPI: Self { .product(name: "SmithyChecksumsAPI", package: "smithy-swift") }
static var smithyEventStreams: Self { .product(name: "SmithyEventStreams", package: "smithy-swift") }
static var smithyEventStreamsAPI: Self { .product(name: "SmithyEventStreamsAPI", package: "smithy-swift") }
static var smithyEventStreamsAuthAPI: Self { .product(name: "SmithyEventStreamsAuthAPI", package: "smithy-swift") }
static var smithyHTTPAPI: Self { .product(name: "SmithyHTTPAPI", package: "smithy-swift") }
static var smithyHTTPAuth: Self { .product(name: "SmithyHTTPAuth", package: "smithy-swift") }
static var smithyIdentity: Self { .product(name: "SmithyIdentity", package: "smithy-swift") }
static var smithyIdentityAPI: Self { .product(name: "SmithyIdentityAPI", package: "smithy-swift") }
static var smithyRetries: Self { .product(name: "SmithyRetries", package: "smithy-swift") }
static var smithyRetriesAPI: Self { .product(name: "SmithyRetriesAPI", package: "smithy-swift") }
static var smithyWaitersAPI: Self { .product(name: "SmithyWaitersAPI", package: "smithy-swift") }
static var smithyTestUtils: Self { .product(name: "SmithyTestUtil", package: "smithy-swift") }
}

Expand Down Expand Up @@ -83,9 +70,25 @@ func addClientRuntimeDependency() {
}

func addAWSClientRuntimeDependency() {
package.dependencies += [
.package(path: "../../aws-sdk-swift")
]
let smithySwiftURL = "https://github.com/awslabs/aws-sdk-swift"
jbelkins marked this conversation as resolved.
Show resolved Hide resolved
let useLocalDeps = ProcessInfo.processInfo.environment["AWS_SWIFT_SDK_USE_LOCAL_DEPS"] != nil
let useMainDeps = ProcessInfo.processInfo.environment["AWS_SWIFT_SDK_USE_MAIN_DEPS"] != nil
switch (useLocalDeps, useMainDeps) {
case (true, true):
fatalError("Unable to determine which dependencies to use. Please only specify one of AWS_SWIFT_SDK_USE_LOCAL_DEPS or AWS_SWIFT_SDK_USE_MAIN_DEPS.")
case (true, false):
package.dependencies += [
.package(path: "../../aws-sdk-swift")
]
case (false, true):
package.dependencies += [
.package(url: smithySwiftURL, branch: "main")
]
case (false, false):
package.dependencies += [
.package(url: smithySwiftURL, .upToNextMajor(from: "0.0.0"))
]
}
}

func addCRTDependency() {
Expand Down
Loading