From ee649c786c37808508f39ab2db5aa1eefea5c804 Mon Sep 17 00:00:00 2001 From: David Yaffe Date: Tue, 2 Dec 2025 11:18:28 -0500 Subject: [PATCH 1/7] FOR TESTING --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 785cab54b6c..00103ca2325 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # aws_logo.png AWS SDK for Swift + + [![License][apache-badge]][apache-url] [apache-badge]: https://img.shields.io/badge/License-Apache%202.0-blue.svg @@ -45,4 +47,4 @@ This library is licensed under the Apache 2.0 License. ## Security -Please refer to our [security policy](https://github.com/awslabs/aws-sdk-swift/security/policy). \ No newline at end of file +Please refer to our [security policy](https://github.com/awslabs/aws-sdk-swift/security/policy). From 449f6181a49ccc386a5e0cb0cc18ba0fadc5211e Mon Sep 17 00:00:00 2001 From: David Yaffe Date: Wed, 3 Dec 2025 11:29:10 -0500 Subject: [PATCH 2/7] revert README spacing + fix dependencies --- IntegrationTests/Package.swift | 9 ++++++++- ...STSAssumeRoleAWSCredentialIdentityResolverTests.swift | 6 ++---- README.md | 2 -- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/IntegrationTests/Package.swift b/IntegrationTests/Package.swift index 22e82b5fafe..19c112e3160 100644 --- a/IntegrationTests/Package.swift +++ b/IntegrationTests/Package.swift @@ -41,6 +41,8 @@ let package = Package( dependencies: [ .package(path: "../../smithy-swift"), .package(path: "../../aws-sdk-swift"), + .package(url: "https://github.com/awslabs/smithy-swift-opentelemetry", from: "1.0.0"), + .package(url: "https://github.com/open-telemetry/opentelemetry-swift", from: "1.13.0"), ], targets: integrationTestTargets ) @@ -71,6 +73,7 @@ private func integrationTestTarget(_ name: String) -> Target { let integrationTestName = "\(name)IntegrationTests" var additionalDependencies: [String] = [] var exclusions: [String] = [] + var platformSpecificDependencies: [Target.Dependency] = [] switch name { case "AWSEC2": additionalDependencies = ["AWSIAM", "AWSSTS", "AWSCloudWatchLogs"] @@ -93,6 +96,10 @@ private func integrationTestTarget(_ name: String) -> Target { additionalDependencies = ["AWSCloudFront"] case "AWSSTS": additionalDependencies = ["AWSIAM", "AWSCognitoIdentity"] + platformSpecificDependencies = [ + .product(name: "SmithyOpenTelemetry", package: "smithy-swift-opentelemetry", condition: .when(platforms: [.macOS, .iOS, .tvOS, .watchOS])), + .product(name: "InMemoryExporter", package: "opentelemetry-swift", condition: .when(platforms: [.macOS, .iOS, .tvOS, .watchOS])) + ] case "AWSCognitoIdentity": additionalDependencies = ["AWSSTS", "AWSIAM"] default: @@ -113,7 +120,7 @@ private func integrationTestTarget(_ name: String) -> Target { .product(name: name, package: "aws-sdk-swift") ] + additionalDependencies.map { Target.Dependency.product(name: $0, package: "aws-sdk-swift", condition: nil) - }, + } + platformSpecificDependencies, path: "./Services/\(integrationTestName)", exclude: exclusions, resources: [.process("Resources")] diff --git a/IntegrationTests/Services/AWSSTSIntegrationTests/STSAssumeRoleAWSCredentialIdentityResolverTests.swift b/IntegrationTests/Services/AWSSTSIntegrationTests/STSAssumeRoleAWSCredentialIdentityResolverTests.swift index 91635c236b7..f562f8ac509 100644 --- a/IntegrationTests/Services/AWSSTSIntegrationTests/STSAssumeRoleAWSCredentialIdentityResolverTests.swift +++ b/IntegrationTests/Services/AWSSTSIntegrationTests/STSAssumeRoleAWSCredentialIdentityResolverTests.swift @@ -11,12 +11,10 @@ import AWSSTS import AWSIAM import AWSSDKIdentity import ClientRuntime -#if canImport(InMemoryExporter) +#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) +import SmithyOpenTelemetry import InMemoryExporter #endif -//#if os(Linux) -//import OpenTelemetryConcurrency -//#endif class STSAssumeRoleAWSCredentialIdentityResolverTests: XCTestCase { private let region = "us-east-1" diff --git a/README.md b/README.md index 00103ca2325..e179dabe79a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # aws_logo.png AWS SDK for Swift - - [![License][apache-badge]][apache-url] [apache-badge]: https://img.shields.io/badge/License-Apache%202.0-blue.svg From f3d866428fa7f8deff5e8470fa3f9c8410c334cd Mon Sep 17 00:00:00 2001 From: David Yaffe Date: Wed, 3 Dec 2025 14:16:43 -0500 Subject: [PATCH 3/7] fix package link --- IntegrationTests/Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IntegrationTests/Package.swift b/IntegrationTests/Package.swift index 19c112e3160..a1083f471ae 100644 --- a/IntegrationTests/Package.swift +++ b/IntegrationTests/Package.swift @@ -41,8 +41,8 @@ let package = Package( dependencies: [ .package(path: "../../smithy-swift"), .package(path: "../../aws-sdk-swift"), - .package(url: "https://github.com/awslabs/smithy-swift-opentelemetry", from: "1.0.0"), - .package(url: "https://github.com/open-telemetry/opentelemetry-swift", from: "1.13.0"), + .package(url: "git@github.com:awslabs/smithy-swift-opentelemetry.git", from: "1.0.0"), + .package(url: "git@github.com:open-telemetry/opentelemetry-swift", from: "1.13.0"), ], targets: integrationTestTargets ) From 894f0983be2e06925af6886ff4c2c80c6c885257 Mon Sep 17 00:00:00 2001 From: David Yaffe Date: Wed, 3 Dec 2025 14:32:23 -0500 Subject: [PATCH 4/7] whoops fix packages again --- IntegrationTests/Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IntegrationTests/Package.swift b/IntegrationTests/Package.swift index a1083f471ae..daf49ba09b4 100644 --- a/IntegrationTests/Package.swift +++ b/IntegrationTests/Package.swift @@ -41,8 +41,8 @@ let package = Package( dependencies: [ .package(path: "../../smithy-swift"), .package(path: "../../aws-sdk-swift"), - .package(url: "git@github.com:awslabs/smithy-swift-opentelemetry.git", from: "1.0.0"), - .package(url: "git@github.com:open-telemetry/opentelemetry-swift", from: "1.13.0"), + .package(url: "git@github.com:smithy-lang/smithy-swift-opentelemetry.git", from: "1.0.0"), + .package(url: "git@github.com:open-telemetry/opentelemetry-swift.git", from: "1.13.0"), ], targets: integrationTestTargets ) From 92d31493311cba55162ba31b021d1dc4db45fd35 Mon Sep 17 00:00:00 2001 From: David Yaffe Date: Wed, 3 Dec 2025 14:47:41 -0500 Subject: [PATCH 5/7] try again --- IntegrationTests/Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IntegrationTests/Package.swift b/IntegrationTests/Package.swift index daf49ba09b4..9df93287589 100644 --- a/IntegrationTests/Package.swift +++ b/IntegrationTests/Package.swift @@ -41,8 +41,8 @@ let package = Package( dependencies: [ .package(path: "../../smithy-swift"), .package(path: "../../aws-sdk-swift"), - .package(url: "git@github.com:smithy-lang/smithy-swift-opentelemetry.git", from: "1.0.0"), - .package(url: "git@github.com:open-telemetry/opentelemetry-swift.git", from: "1.13.0"), + .package(url: "https://github.com/smithy-lang/smithy-swift-opentelemetry.git", from: "1.0.0"), + .package(url: "https://github.com/open-telemetry/opentelemetry-swift.git", from: "1.13.0"), ], targets: integrationTestTargets ) From 9e0a7be36e38bd7341230d05512a3b9a44aba900 Mon Sep 17 00:00:00 2001 From: David Yaffe Date: Wed, 3 Dec 2025 15:31:30 -0500 Subject: [PATCH 6/7] try try again --- IntegrationTests/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IntegrationTests/Package.swift b/IntegrationTests/Package.swift index 9df93287589..12780f3243b 100644 --- a/IntegrationTests/Package.swift +++ b/IntegrationTests/Package.swift @@ -41,7 +41,7 @@ let package = Package( dependencies: [ .package(path: "../../smithy-swift"), .package(path: "../../aws-sdk-swift"), - .package(url: "https://github.com/smithy-lang/smithy-swift-opentelemetry.git", from: "1.0.0"), + .package(url: "git@github.com:smithy-lang/smithy-swift-opentelemetry.git", from: "1.0.0"), .package(url: "https://github.com/open-telemetry/opentelemetry-swift.git", from: "1.13.0"), ], targets: integrationTestTargets From 3dd816dd2e74e75468007652379c6be5c76790b8 Mon Sep 17 00:00:00 2001 From: David Yaffe Date: Fri, 5 Dec 2025 12:32:17 -0500 Subject: [PATCH 7/7] use URL --- IntegrationTests/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IntegrationTests/Package.swift b/IntegrationTests/Package.swift index 12780f3243b..9df93287589 100644 --- a/IntegrationTests/Package.swift +++ b/IntegrationTests/Package.swift @@ -41,7 +41,7 @@ let package = Package( dependencies: [ .package(path: "../../smithy-swift"), .package(path: "../../aws-sdk-swift"), - .package(url: "git@github.com:smithy-lang/smithy-swift-opentelemetry.git", from: "1.0.0"), + .package(url: "https://github.com/smithy-lang/smithy-swift-opentelemetry.git", from: "1.0.0"), .package(url: "https://github.com/open-telemetry/opentelemetry-swift.git", from: "1.13.0"), ], targets: integrationTestTargets