Skip to content

Commit d3c6b0f

Browse files
committed
raise minimum macOS to v12
1 parent 3be8586 commit d3c6b0f

File tree

8 files changed

+29
-7
lines changed

8 files changed

+29
-7
lines changed

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Resources/Package.Base.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ extension Target.Dependency {
3939
let package = Package(
4040
name: "aws-sdk-swift",
4141
platforms: [
42-
.macOS(.v10_15),
42+
.macOS(.v12),
4343
.iOS(.v13),
4444
.tvOS(.v13),
4545
.watchOS(.v6)

AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Resources/SmokeTestsPackage.Base.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ extension Target.Dependency {
1010
let package = Package(
1111
name: "SmokeTests",
1212
platforms: [
13-
.macOS(.v10_15)
13+
.macOS(.v12)
1414
],
1515
products: serviceNames.map(productForRunner(_:)),
1616
dependencies: [

IntegrationTests/Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ extension Target.Dependency {
3131
let package = Package(
3232
name: "aws-sdk-swift-integration-tests",
3333
platforms: [
34-
.macOS(.v10_15),
34+
.macOS(.v12),
3535
.iOS(.v13),
3636
.tvOS(.v13),
3737
.watchOS(.v6)

IntegrationTests/Services/AWSEC2IntegrationTests/Resources/IMDSIntegTestApp/Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import PackageDescription
55
let package = Package(
66
name: "IMDSIntegTestApp",
77
platforms: [
8-
.macOS(.v10_15),
8+
.macOS(.v12),
99
.iOS(.v13)
1010
],
1111
dependencies: [

IntegrationTests/Services/AWSECSIntegrationTests/Resources/ECSIntegTestApp/Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import PackageDescription
55
let package = Package(
66
name: "ECSIntegTestApp",
77
platforms: [
8-
.macOS(.v10_15),
8+
.macOS(.v12),
99
.iOS(.v13)
1010
],
1111
dependencies: [

IntegrationTests/Services/AWSSTSIntegrationTests/STSAssumeRoleAWSCredentialIdentityResolverTests.swift

+22
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import AWSSTS
1111
import AWSIAM
1212
import AWSSDKIdentity
1313
import ClientRuntime
14+
import InMemory
1415

1516
class STSAssumeRoleAWSCredentialIdentityResolverTests: XCTestCase {
1617
private let region = "us-east-1"
@@ -71,6 +72,27 @@ class STSAssumeRoleAWSCredentialIdentityResolverTests: XCTestCase {
7172
XCTAssertNotEqual(arn, "")
7273
}
7374

75+
// OpenTelemetry Tracing works as expected
76+
func testGetCallerIdentityWithOTelTracing() async throws {
77+
let inMemoryExporter = InMemoryExporter()
78+
79+
let config = try await STSClient.STSClientConfiguration(
80+
region: "us-west-2",
81+
telemetryProvider: OpenTelemetrySwift.provider(spanExporter: inMemoryExporter)
82+
)
83+
let client = STSClient(config: config)
84+
_ = try await client.getCallerIdentity(input: GetCallerIdentityInput())
85+
86+
let traceResults = inMemoryExporter.getFinishedSpanItems()
87+
88+
// Assert: Check if a span with expected attributes exists
89+
let matchingSpan = traceResults.first { span in
90+
span.instrumentationScope.name == "STS" && span.name == "STS.GetCallerIdentity"
91+
}
92+
93+
XCTAssertNotNil(matchingSpan, "Expected STS.GetCallerIdentity span not found")
94+
}
95+
7496
// MARK: - Setup & teardown
7597

7698
override func setUp() async throws {

Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ extension Target.Dependency {
468468
let package = Package(
469469
name: "aws-sdk-swift",
470470
platforms: [
471-
.macOS(.v10_15),
471+
.macOS(.v12),
472472
.iOS(.v13),
473473
.tvOS(.v13),
474474
.watchOS(.v6)

codegen/Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ extension Target.Dependency {
4444
let package = Package(
4545
name: "aws-sdk-swift-protocol-tests",
4646
platforms: [
47-
.macOS(.v10_15),
47+
.macOS(.v12),
4848
.iOS(.v13),
4949
.tvOS(.v13),
5050
.watchOS(.v6)

0 commit comments

Comments
 (0)