Skip to content

Commit

Permalink
Merge feat/sra-identity-and-auth into feat/test-suite to eliminate ch…
Browse files Browse the repository at this point in the history 
…anges from main in github diff.
  • Loading branch information
Sichan Yoo committed Feb 6, 2024
2 parents ff1da4d + 5137a69 commit 0d7c710
Show file tree
Hide file tree
Showing 4 changed files with 125 additions and 15 deletions.
5 changes: 0 additions & 5 deletions Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,13 +230,8 @@ func addResolvedTargets() {
// MARK: - Generated

addDependencies(
<<<<<<< HEAD
clientRuntimeVersion: "0.37.0",
crtVersion: "0.20.0"
=======
clientRuntimeVersion: "0.39.0",
crtVersion: "0.22.0"
>>>>>>> main
)

// Uncomment this line to exclude runtime unit tests
Expand Down
4 changes: 2 additions & 2 deletions Sources/Core/AWSClientRuntime/AWSClientConfiguration.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ extension AWSClientConfiguration {
} else {
resolvedAuthSchemes.append(SigV4AuthScheme())
// These AWS services use SigV4A auth scheme.
if (["S3", "EventBridge", "CloudFront KeyValueStore"].contains(serviceSpecific?.serviceName)) {
if ["S3", "EventBridge", "CloudFront KeyValueStore"].contains(serviceSpecific?.serviceName) {
resolvedAuthSchemes.append(SigV4AAuthScheme())
}
}
Expand Down Expand Up @@ -275,7 +275,7 @@ extension AWSClientConfiguration {
} else {
resolvedAuthSchemes.append(SigV4AuthScheme())
// These AWS services use SigV4A auth scheme.
if (["S3", "EventBridge", "CloudFront KeyValueStore"].contains(serviceSpecific?.serviceName)) {
if ["S3", "EventBridge", "CloudFront KeyValueStore"].contains(serviceSpecific?.serviceName) {
resolvedAuthSchemes.append(SigV4AAuthScheme())
}
}
Expand Down
123 changes: 123 additions & 0 deletions Tests/Services/AWSLaunchWizardTests/EndpointResolverTest.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,17 @@ import AWSClientRuntime
@testable import AWSLaunchWizard
========
@testable import AWSRepostspace
<<<<<<< HEAD
>>>>>>>> main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
@testable import AWSLaunchWizard
>>>>>>> main
=======
>>>>>>>> temp-main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
@testable import AWSLaunchWizard
>>>>>>> temp-main
>>>>>>> feat/sra-identity-and-auth
import AwsCommonRuntimeKit
import ClientRuntime
import SmithyTestUtil
Expand Down Expand Up @@ -41,10 +48,17 @@ class EndpointResolverTest: XCTestCase {
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard-fips.us-east-1.api.aws", headers: headers, properties: properties)
========
let expected = try ClientRuntime.Endpoint(urlString: "https://repostspace-fips.us-east-1.api.aws", headers: headers, properties: properties)
<<<<<<< HEAD
>>>>>>>> main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard-fips.us-east-1.api.aws", headers: headers, properties: properties)
>>>>>>> main
=======
>>>>>>>> temp-main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard-fips.us-east-1.api.aws", headers: headers, properties: properties)
>>>>>>> temp-main
>>>>>>> feat/sra-identity-and-auth

XCTAssertEqual(expected, actual)
}
Expand All @@ -69,10 +83,17 @@ class EndpointResolverTest: XCTestCase {
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard-fips.us-east-1.amazonaws.com", headers: headers, properties: properties)
========
let expected = try ClientRuntime.Endpoint(urlString: "https://repostspace-fips.us-east-1.amazonaws.com", headers: headers, properties: properties)
<<<<<<< HEAD
>>>>>>>> main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard-fips.us-east-1.amazonaws.com", headers: headers, properties: properties)
>>>>>>> main
=======
>>>>>>>> temp-main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard-fips.us-east-1.amazonaws.com", headers: headers, properties: properties)
>>>>>>> temp-main
>>>>>>> feat/sra-identity-and-auth

XCTAssertEqual(expected, actual)
}
Expand All @@ -97,10 +118,17 @@ class EndpointResolverTest: XCTestCase {
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard.us-east-1.api.aws", headers: headers, properties: properties)
========
let expected = try ClientRuntime.Endpoint(urlString: "https://repostspace.us-east-1.api.aws", headers: headers, properties: properties)
<<<<<<< HEAD
>>>>>>>> main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard.us-east-1.api.aws", headers: headers, properties: properties)
>>>>>>> main
=======
>>>>>>>> temp-main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard.us-east-1.api.aws", headers: headers, properties: properties)
>>>>>>> temp-main
>>>>>>> feat/sra-identity-and-auth

XCTAssertEqual(expected, actual)
}
Expand All @@ -125,10 +153,17 @@ class EndpointResolverTest: XCTestCase {
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard.us-east-1.amazonaws.com", headers: headers, properties: properties)
========
let expected = try ClientRuntime.Endpoint(urlString: "https://repostspace.us-east-1.amazonaws.com", headers: headers, properties: properties)
<<<<<<< HEAD
>>>>>>>> main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard.us-east-1.amazonaws.com", headers: headers, properties: properties)
>>>>>>> main
=======
>>>>>>>> temp-main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard.us-east-1.amazonaws.com", headers: headers, properties: properties)
>>>>>>> temp-main
>>>>>>> feat/sra-identity-and-auth

XCTAssertEqual(expected, actual)
}
Expand All @@ -153,10 +188,17 @@ class EndpointResolverTest: XCTestCase {
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard-fips.cn-north-1.api.amazonwebservices.com.cn", headers: headers, properties: properties)
========
let expected = try ClientRuntime.Endpoint(urlString: "https://repostspace-fips.cn-north-1.api.amazonwebservices.com.cn", headers: headers, properties: properties)
<<<<<<< HEAD
>>>>>>>> main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard-fips.cn-north-1.api.amazonwebservices.com.cn", headers: headers, properties: properties)
>>>>>>> main
=======
>>>>>>>> temp-main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard-fips.cn-north-1.api.amazonwebservices.com.cn", headers: headers, properties: properties)
>>>>>>> temp-main
>>>>>>> feat/sra-identity-and-auth

XCTAssertEqual(expected, actual)
}
Expand All @@ -181,10 +223,17 @@ class EndpointResolverTest: XCTestCase {
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard-fips.cn-north-1.amazonaws.com.cn", headers: headers, properties: properties)
========
let expected = try ClientRuntime.Endpoint(urlString: "https://repostspace-fips.cn-north-1.amazonaws.com.cn", headers: headers, properties: properties)
<<<<<<< HEAD
>>>>>>>> main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard-fips.cn-north-1.amazonaws.com.cn", headers: headers, properties: properties)
>>>>>>> main
=======
>>>>>>>> temp-main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard-fips.cn-north-1.amazonaws.com.cn", headers: headers, properties: properties)
>>>>>>> temp-main
>>>>>>> feat/sra-identity-and-auth

XCTAssertEqual(expected, actual)
}
Expand All @@ -209,10 +258,17 @@ class EndpointResolverTest: XCTestCase {
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard.cn-north-1.api.amazonwebservices.com.cn", headers: headers, properties: properties)
========
let expected = try ClientRuntime.Endpoint(urlString: "https://repostspace.cn-north-1.api.amazonwebservices.com.cn", headers: headers, properties: properties)
<<<<<<< HEAD
>>>>>>>> main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard.cn-north-1.api.amazonwebservices.com.cn", headers: headers, properties: properties)
>>>>>>> main
=======
>>>>>>>> temp-main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard.cn-north-1.api.amazonwebservices.com.cn", headers: headers, properties: properties)
>>>>>>> temp-main
>>>>>>> feat/sra-identity-and-auth

XCTAssertEqual(expected, actual)
}
Expand All @@ -237,10 +293,17 @@ class EndpointResolverTest: XCTestCase {
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard.cn-north-1.amazonaws.com.cn", headers: headers, properties: properties)
========
let expected = try ClientRuntime.Endpoint(urlString: "https://repostspace.cn-north-1.amazonaws.com.cn", headers: headers, properties: properties)
<<<<<<< HEAD
>>>>>>>> main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard.cn-north-1.amazonaws.com.cn", headers: headers, properties: properties)
>>>>>>> main
=======
>>>>>>>> temp-main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard.cn-north-1.amazonaws.com.cn", headers: headers, properties: properties)
>>>>>>> temp-main
>>>>>>> feat/sra-identity-and-auth

XCTAssertEqual(expected, actual)
}
Expand All @@ -265,10 +328,17 @@ class EndpointResolverTest: XCTestCase {
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard-fips.us-gov-east-1.api.aws", headers: headers, properties: properties)
========
let expected = try ClientRuntime.Endpoint(urlString: "https://repostspace-fips.us-gov-east-1.api.aws", headers: headers, properties: properties)
<<<<<<< HEAD
>>>>>>>> main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard-fips.us-gov-east-1.api.aws", headers: headers, properties: properties)
>>>>>>> main
=======
>>>>>>>> temp-main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard-fips.us-gov-east-1.api.aws", headers: headers, properties: properties)
>>>>>>> temp-main
>>>>>>> feat/sra-identity-and-auth

XCTAssertEqual(expected, actual)
}
Expand All @@ -293,10 +363,17 @@ class EndpointResolverTest: XCTestCase {
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard-fips.us-gov-east-1.amazonaws.com", headers: headers, properties: properties)
========
let expected = try ClientRuntime.Endpoint(urlString: "https://repostspace-fips.us-gov-east-1.amazonaws.com", headers: headers, properties: properties)
<<<<<<< HEAD
>>>>>>>> main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard-fips.us-gov-east-1.amazonaws.com", headers: headers, properties: properties)
>>>>>>> main
=======
>>>>>>>> temp-main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard-fips.us-gov-east-1.amazonaws.com", headers: headers, properties: properties)
>>>>>>> temp-main
>>>>>>> feat/sra-identity-and-auth

XCTAssertEqual(expected, actual)
}
Expand All @@ -321,10 +398,17 @@ class EndpointResolverTest: XCTestCase {
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard.us-gov-east-1.api.aws", headers: headers, properties: properties)
========
let expected = try ClientRuntime.Endpoint(urlString: "https://repostspace.us-gov-east-1.api.aws", headers: headers, properties: properties)
<<<<<<< HEAD
>>>>>>>> main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard.us-gov-east-1.api.aws", headers: headers, properties: properties)
>>>>>>> main
=======
>>>>>>>> temp-main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard.us-gov-east-1.api.aws", headers: headers, properties: properties)
>>>>>>> temp-main
>>>>>>> feat/sra-identity-and-auth

XCTAssertEqual(expected, actual)
}
Expand All @@ -349,10 +433,17 @@ class EndpointResolverTest: XCTestCase {
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard.us-gov-east-1.amazonaws.com", headers: headers, properties: properties)
========
let expected = try ClientRuntime.Endpoint(urlString: "https://repostspace.us-gov-east-1.amazonaws.com", headers: headers, properties: properties)
<<<<<<< HEAD
>>>>>>>> main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard.us-gov-east-1.amazonaws.com", headers: headers, properties: properties)
>>>>>>> main
=======
>>>>>>>> temp-main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard.us-gov-east-1.amazonaws.com", headers: headers, properties: properties)
>>>>>>> temp-main
>>>>>>> feat/sra-identity-and-auth

XCTAssertEqual(expected, actual)
}
Expand Down Expand Up @@ -396,10 +487,17 @@ class EndpointResolverTest: XCTestCase {
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard-fips.us-iso-east-1.c2s.ic.gov", headers: headers, properties: properties)
========
let expected = try ClientRuntime.Endpoint(urlString: "https://repostspace-fips.us-iso-east-1.c2s.ic.gov", headers: headers, properties: properties)
<<<<<<< HEAD
>>>>>>>> main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard-fips.us-iso-east-1.c2s.ic.gov", headers: headers, properties: properties)
>>>>>>> main
=======
>>>>>>>> temp-main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard-fips.us-iso-east-1.c2s.ic.gov", headers: headers, properties: properties)
>>>>>>> temp-main
>>>>>>> feat/sra-identity-and-auth

XCTAssertEqual(expected, actual)
}
Expand Down Expand Up @@ -443,10 +541,17 @@ class EndpointResolverTest: XCTestCase {
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard.us-iso-east-1.c2s.ic.gov", headers: headers, properties: properties)
========
let expected = try ClientRuntime.Endpoint(urlString: "https://repostspace.us-iso-east-1.c2s.ic.gov", headers: headers, properties: properties)
<<<<<<< HEAD
>>>>>>>> main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard.us-iso-east-1.c2s.ic.gov", headers: headers, properties: properties)
>>>>>>> main
=======
>>>>>>>> temp-main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard.us-iso-east-1.c2s.ic.gov", headers: headers, properties: properties)
>>>>>>> temp-main
>>>>>>> feat/sra-identity-and-auth

XCTAssertEqual(expected, actual)
}
Expand Down Expand Up @@ -490,10 +595,17 @@ class EndpointResolverTest: XCTestCase {
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard-fips.us-isob-east-1.sc2s.sgov.gov", headers: headers, properties: properties)
========
let expected = try ClientRuntime.Endpoint(urlString: "https://repostspace-fips.us-isob-east-1.sc2s.sgov.gov", headers: headers, properties: properties)
<<<<<<< HEAD
>>>>>>>> main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard-fips.us-isob-east-1.sc2s.sgov.gov", headers: headers, properties: properties)
>>>>>>> main
=======
>>>>>>>> temp-main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard-fips.us-isob-east-1.sc2s.sgov.gov", headers: headers, properties: properties)
>>>>>>> temp-main
>>>>>>> feat/sra-identity-and-auth

XCTAssertEqual(expected, actual)
}
Expand Down Expand Up @@ -537,10 +649,17 @@ class EndpointResolverTest: XCTestCase {
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard.us-isob-east-1.sc2s.sgov.gov", headers: headers, properties: properties)
========
let expected = try ClientRuntime.Endpoint(urlString: "https://repostspace.us-isob-east-1.sc2s.sgov.gov", headers: headers, properties: properties)
<<<<<<< HEAD
>>>>>>>> main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard.us-isob-east-1.sc2s.sgov.gov", headers: headers, properties: properties)
>>>>>>> main
=======
>>>>>>>> temp-main:Tests/Services/AWSRepostspaceTests/EndpointResolverTest.swift
=======
let expected = try ClientRuntime.Endpoint(urlString: "https://launchwizard.us-isob-east-1.sc2s.sgov.gov", headers: headers, properties: properties)
>>>>>>> temp-main
>>>>>>> feat/sra-identity-and-auth

XCTAssertEqual(expected, actual)
}
Expand Down Expand Up @@ -663,5 +782,9 @@ class EndpointResolverTest: XCTestCase {
}

=======
<<<<<<< HEAD
>>>>>>> main
=======
>>>>>>> temp-main
>>>>>>> feat/sra-identity-and-auth
}
Loading

0 comments on commit 0d7c710

Please sign in to comment.