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

chore: Regenerate code after service client modularization #1569

Merged
merged 1 commit into from
Jun 13, 2024
Merged

chore: Regenerate code after service client modularization #1569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
55 changes: 32 additions & 23 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.7
// swift-tools-version:5.9

//
// Copyright Amazon.com Inc. or its affiliates.
Expand All @@ -16,12 +16,18 @@ import PackageDescription
// MARK: - Target Dependencies

extension Target.Dependency {
// AWS modules
static var awsClientRuntime: Self { "AWSClientRuntime" }
static var awsSDKCommon: Self { "AWSSDKCommon" }
static var awsSDKEventStreamsAuth: Self { "AWSSDKEventStreamsAuth" }
static var awsSDKHTTPAuth: Self { "AWSSDKHTTPAuth" }
static var awsSDKIdentity: Self { "AWSSDKIdentity" }
static var clientRuntime: Self { .product(name: "ClientRuntime", package: "smithy-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") }
Expand All @@ -47,11 +53,11 @@ let package = Package(
.watchOS(.v6)
],
products: [
.library(name: "AWSSDKCommon", targets: ["AWSSDKCommon"]),
.library(name: "AWSClientRuntime", targets: ["AWSClientRuntime"]),
.library(name: "AWSSDKCommon", targets: ["AWSSDKCommon"]),
.library(name: "AWSSDKEventStreamsAuth", targets: ["AWSSDKEventStreamsAuth"]),
.library(name: "AWSSDKIdentity", targets: ["AWSSDKIdentity"]),
.library(name: "AWSSDKHTTPAuth", targets: ["AWSSDKHTTPAuth"]),
.library(name: "AWSSDKIdentity", targets: ["AWSSDKIdentity"]),
],
targets: [
.target(
Expand Down Expand Up @@ -83,36 +89,36 @@ let package = Package(
path: "./Sources/Core/AWSSDKCommon"
),
.target(
name: "AWSSDKIdentity",
dependencies: [.crt, .smithy, .clientRuntime, .smithyIdentity, .smithyIdentityAPI, .smithyHTTPAPI, .awsSDKCommon],
path: "./Sources/Core/AWSSDKIdentity"
name: "AWSSDKEventStreamsAuth",
dependencies: [.smithyEventStreamsAPI, .smithyEventStreamsAuthAPI, .smithyEventStreams, .crt, .clientRuntime, "AWSSDKHTTPAuth"],
path: "./Sources/Core/AWSSDKEventStreamsAuth"
),
.target(
name: "AWSSDKHTTPAuth",
dependencies: [.crt, .smithy, .clientRuntime, .smithyHTTPAuth, "AWSSDKIdentity"],
path: "./Sources/Core/AWSSDKHTTPAuth"
),
.target(
name: "AWSSDKEventStreamsAuth",
dependencies: [.smithyEventStreamsAPI, .smithyEventStreamsAuthAPI, .smithyEventStreams, .crt, .clientRuntime, "AWSSDKHTTPAuth"],
path: "./Sources/Core/AWSSDKEventStreamsAuth"
name: "AWSSDKIdentity",
dependencies: [.crt, .smithy, .clientRuntime, .smithyIdentity, .smithyIdentityAPI, .smithyHTTPAPI, .awsSDKCommon],
path: "./Sources/Core/AWSSDKIdentity"
),
.testTarget(
name: "AWSClientRuntimeTests",
dependencies: [.awsClientRuntime, .clientRuntime, .smithyTestUtils, .awsSDKCommon],
path: "./Tests/Core/AWSClientRuntimeTests",
resources: [.process("Resources")]
),
.testTarget(
name: "AWSSDKHTTPAuthTests",
dependencies: ["AWSSDKHTTPAuth", "AWSClientRuntime", "AWSSDKEventStreamsAuth", .crt, .clientRuntime, .smithyTestUtils],
path: "./Tests/Core/AWSSDKHTTPAuthTests"
),
.testTarget(
name: "AWSSDKEventStreamsAuthTests",
dependencies: ["AWSClientRuntime", "AWSSDKEventStreamsAuth"],
path: "./Tests/Core/AWSSDKEventStreamsAuthTests"
),
.testTarget(
name: "AWSSDKHTTPAuthTests",
dependencies: ["AWSSDKHTTPAuth", "AWSClientRuntime", "AWSSDKEventStreamsAuth", .crt, .clientRuntime, .smithyTestUtils],
path: "./Tests/Core/AWSSDKHTTPAuthTests"
),
.testTarget(
name: "AWSSDKIdentityTests",
dependencies: [.smithy, .smithyIdentity, "AWSSDKIdentity", .awsClientRuntime],
Expand Down Expand Up @@ -179,9 +185,10 @@ let serviceTargetDependencies: [Target.Dependency] = [
.smithyEventStreamsAuthAPI,
.smithyEventStreams,
.smithyChecksumsAPI,
"AWSSDKIdentity",
"AWSSDKHTTPAuth",
"AWSSDKEventStreamsAuth",
.awsSDKCommon,
.awsSDKIdentity,
.awsSDKHTTPAuth,
.awsSDKEventStreamsAuth,
]

func addServiceTarget(_ name: String) {
Expand Down Expand Up @@ -240,7 +247,7 @@ func addIntegrationTestTarget(_ name: String) {
package.targets += [
.testTarget(
name: integrationTestName,
dependencies: [.crt, .clientRuntime, .awsClientRuntime, .byName(name: name), .smithyTestUtils, .awsSDKIdentity, .smithyIdentity] + additionalDependencies.map { Target.Dependency.target(name: $0, condition: nil) },
dependencies: [.crt, .clientRuntime, .awsClientRuntime, .byName(name: name), .smithyTestUtils, .awsSDKIdentity, .smithyIdentity, .awsSDKCommon] + additionalDependencies.map { Target.Dependency.target(name: $0, condition: nil) },
path: "./IntegrationTests/Services/\(integrationTestName)",
exclude: exclusions,
resources: [.process("Resources")]
Expand All @@ -249,7 +256,6 @@ func addIntegrationTestTarget(_ name: String) {
}

var enabledServices = Set<String>()

var enabledServiceUnitTests = Set<String>()

func addAllServices() {
Expand All @@ -264,11 +270,15 @@ func addIntegrationTests() {
}

func excludeRuntimeUnitTests() {
package.targets.removeAll { $0.name == "AWSClientRuntimeTests" }
package.targets.removeAll {
$0.name == "AWSClientRuntimeTests" ||
$0.name == "AWSSDKHTTPAuthTests" ||
$0.name == "AWSSDKEventStreamsAuthTests" ||
$0.name == "AWSSDKIdentityTests"
}
}

func addProtocolTests() {

struct ProtocolTest {
let name: String
let sourcePath: String
Expand Down Expand Up @@ -325,7 +335,6 @@ func addResolvedTargets() {
enabledServiceUnitTests.forEach(addServiceUnitTestTarget)
}


// MARK: - Generated

addDependencies(
Expand Down
45 changes: 0 additions & 45 deletions Sources/Services/AWSACM/AuthSchemeResolver.swift
View file
Open in desktop

This file was deleted.

Loading
Loading