Skip to content

Commit 13e86ce

Browse files
aws-sdk-swift-automationaws-sdk-swift-automation
committed
chore: Updates version to 1.3.36
1 parent baae5a1 commit 13e86ce

File tree

1,225 files changed

+26621
-1285
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,225 files changed

+26621
-1285
lines changed

‎Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import PackageDescription
1515

1616
// MARK: - Dynamic Content
1717

18-
let clientRuntimeVersion: Version = "0.135.0"
18+
let clientRuntimeVersion: Version = "0.136.0"
1919
let crtVersion: Version = "0.52.1"
2020

2121
let excludeRuntimeUnitTests = false

‎Package.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.3.35
1+
1.3.36

‎Package.version.next‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.3.36
1+
1.3.37

‎Sources/Services/AWSACM/Sources/AWSACM/ACMClient.swift‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ import typealias SmithyHTTPAuthAPI.AuthSchemes
6767

6868
public class ACMClient: ClientRuntime.Client {
6969
public static let clientName = "ACMClient"
70-
public static let version = "1.3.35"
70+
public static let version = "1.3.36"
7171
let client: ClientRuntime.SdkHttpClient
7272
let config: ACMClient.ACMClientConfiguration
7373
let serviceName = "ACM"
@@ -111,6 +111,7 @@ extension ACMClient {
111111
public var httpClientEngine: SmithyHTTPAPI.HTTPClient
112112
public var httpClientConfiguration: ClientRuntime.HttpClientConfiguration
113113
public var authSchemes: SmithyHTTPAuthAPI.AuthSchemes?
114+
public var authSchemePreference: [String]?
114115
public var authSchemeResolver: SmithyHTTPAuthAPI.AuthSchemeResolver
115116
public var bearerTokenIdentityResolver: any SmithyIdentity.BearerTokenIdentityResolver
116117
public private(set) var interceptorProviders: [ClientRuntime.InterceptorProvider]
@@ -138,6 +139,7 @@ extension ACMClient {
138139
_ httpClientEngine: SmithyHTTPAPI.HTTPClient,
139140
_ httpClientConfiguration: ClientRuntime.HttpClientConfiguration,
140141
_ authSchemes: SmithyHTTPAuthAPI.AuthSchemes?,
142+
_ authSchemePreference: [String]?,
141143
_ authSchemeResolver: SmithyHTTPAuthAPI.AuthSchemeResolver,
142144
_ bearerTokenIdentityResolver: any SmithyIdentity.BearerTokenIdentityResolver,
143145
_ interceptorProviders: [ClientRuntime.InterceptorProvider],
@@ -163,6 +165,7 @@ extension ACMClient {
163165
self.httpClientEngine = httpClientEngine
164166
self.httpClientConfiguration = httpClientConfiguration
165167
self.authSchemes = authSchemes
168+
self.authSchemePreference = authSchemePreference
166169
self.authSchemeResolver = authSchemeResolver
167170
self.bearerTokenIdentityResolver = bearerTokenIdentityResolver
168171
self.interceptorProviders = interceptorProviders
@@ -191,6 +194,7 @@ extension ACMClient {
191194
httpClientEngine: SmithyHTTPAPI.HTTPClient? = nil,
192195
httpClientConfiguration: ClientRuntime.HttpClientConfiguration? = nil,
193196
authSchemes: SmithyHTTPAuthAPI.AuthSchemes? = nil,
197+
authSchemePreference: [String]? = nil,
194198
authSchemeResolver: SmithyHTTPAuthAPI.AuthSchemeResolver? = nil,
195199
bearerTokenIdentityResolver: (any SmithyIdentity.BearerTokenIdentityResolver)? = nil,
196200
interceptorProviders: [ClientRuntime.InterceptorProvider]? = nil,
@@ -217,6 +221,7 @@ extension ACMClient {
217221
httpClientEngine ?? AWSClientConfigDefaultsProvider.httpClientEngine(httpClientConfiguration),
218222
httpClientConfiguration ?? AWSClientConfigDefaultsProvider.httpClientConfiguration(),
219223
authSchemes ?? [AWSSDKHTTPAuth.SigV4AuthScheme()],
224+
authSchemePreference ?? nil,
220225
authSchemeResolver ?? DefaultACMAuthSchemeResolver(),
221226
bearerTokenIdentityResolver ?? SmithyIdentity.StaticBearerTokenIdentityResolver(token: SmithyIdentity.BearerTokenIdentity(token: "")),
222227
interceptorProviders ?? [],
@@ -245,6 +250,7 @@ extension ACMClient {
245250
httpClientEngine: SmithyHTTPAPI.HTTPClient? = nil,
246251
httpClientConfiguration: ClientRuntime.HttpClientConfiguration? = nil,
247252
authSchemes: SmithyHTTPAuthAPI.AuthSchemes? = nil,
253+
authSchemePreference: [String]? = nil,
248254
authSchemeResolver: SmithyHTTPAuthAPI.AuthSchemeResolver? = nil,
249255
bearerTokenIdentityResolver: (any SmithyIdentity.BearerTokenIdentityResolver)? = nil,
250256
interceptorProviders: [ClientRuntime.InterceptorProvider]? = nil,
@@ -271,6 +277,7 @@ extension ACMClient {
271277
httpClientEngine ?? AWSClientConfigDefaultsProvider.httpClientEngine(httpClientConfiguration),
272278
httpClientConfiguration ?? AWSClientConfigDefaultsProvider.httpClientConfiguration(),
273279
authSchemes ?? [AWSSDKHTTPAuth.SigV4AuthScheme()],
280+
authSchemePreference ?? nil,
274281
authSchemeResolver ?? DefaultACMAuthSchemeResolver(),
275282
bearerTokenIdentityResolver ?? SmithyIdentity.StaticBearerTokenIdentityResolver(token: SmithyIdentity.BearerTokenIdentity(token: "")),
276283
interceptorProviders ?? [],
@@ -300,6 +307,7 @@ extension ACMClient {
300307
httpClientEngine: nil,
301308
httpClientConfiguration: nil,
302309
authSchemes: nil,
310+
authSchemePreference: nil,
303311
authSchemeResolver: nil,
304312
bearerTokenIdentityResolver: nil,
305313
interceptorProviders: nil,
@@ -329,6 +337,7 @@ extension ACMClient {
329337
AWSClientConfigDefaultsProvider.httpClientEngine(),
330338
AWSClientConfigDefaultsProvider.httpClientConfiguration(),
331339
[AWSSDKHTTPAuth.SigV4AuthScheme()],
340+
nil,
332341
DefaultACMAuthSchemeResolver(),
333342
SmithyIdentity.StaticBearerTokenIdentityResolver(token: SmithyIdentity.BearerTokenIdentity(token: "")),
334343
[],
@@ -387,6 +396,7 @@ extension ACMClient {
387396
.withLogger(value: config.logger)
388397
.withPartitionID(value: config.partitionID)
389398
.withAuthSchemes(value: config.authSchemes ?? [])
399+
.withAuthSchemePreference(value: config.authSchemePreference)
390400
.withAuthSchemeResolver(value: config.authSchemeResolver)
391401
.withUnsignedPayloadTrait(value: false)
392402
.withSocketTimeout(value: config.httpClientConfiguration.socketTimeout)
@@ -467,6 +477,7 @@ extension ACMClient {
467477
.withLogger(value: config.logger)
468478
.withPartitionID(value: config.partitionID)
469479
.withAuthSchemes(value: config.authSchemes ?? [])
480+
.withAuthSchemePreference(value: config.authSchemePreference)
470481
.withAuthSchemeResolver(value: config.authSchemeResolver)
471482
.withUnsignedPayloadTrait(value: false)
472483
.withSocketTimeout(value: config.httpClientConfiguration.socketTimeout)
@@ -543,6 +554,7 @@ extension ACMClient {
543554
.withLogger(value: config.logger)
544555
.withPartitionID(value: config.partitionID)
545556
.withAuthSchemes(value: config.authSchemes ?? [])
557+
.withAuthSchemePreference(value: config.authSchemePreference)
546558
.withAuthSchemeResolver(value: config.authSchemeResolver)
547559
.withUnsignedPayloadTrait(value: false)
548560
.withSocketTimeout(value: config.httpClientConfiguration.socketTimeout)
@@ -620,6 +632,7 @@ extension ACMClient {
620632
.withLogger(value: config.logger)
621633
.withPartitionID(value: config.partitionID)
622634
.withAuthSchemes(value: config.authSchemes ?? [])
635+
.withAuthSchemePreference(value: config.authSchemePreference)
623636
.withAuthSchemeResolver(value: config.authSchemeResolver)
624637
.withUnsignedPayloadTrait(value: false)
625638
.withSocketTimeout(value: config.httpClientConfiguration.socketTimeout)
@@ -696,6 +709,7 @@ extension ACMClient {
696709
.withLogger(value: config.logger)
697710
.withPartitionID(value: config.partitionID)
698711
.withAuthSchemes(value: config.authSchemes ?? [])
712+
.withAuthSchemePreference(value: config.authSchemePreference)
699713
.withAuthSchemeResolver(value: config.authSchemeResolver)
700714
.withUnsignedPayloadTrait(value: false)
701715
.withSocketTimeout(value: config.httpClientConfiguration.socketTimeout)
@@ -773,6 +787,7 @@ extension ACMClient {
773787
.withLogger(value: config.logger)
774788
.withPartitionID(value: config.partitionID)
775789
.withAuthSchemes(value: config.authSchemes ?? [])
790+
.withAuthSchemePreference(value: config.authSchemePreference)
776791
.withAuthSchemeResolver(value: config.authSchemeResolver)
777792
.withUnsignedPayloadTrait(value: false)
778793
.withSocketTimeout(value: config.httpClientConfiguration.socketTimeout)
@@ -879,6 +894,7 @@ extension ACMClient {
879894
.withLogger(value: config.logger)
880895
.withPartitionID(value: config.partitionID)
881896
.withAuthSchemes(value: config.authSchemes ?? [])
897+
.withAuthSchemePreference(value: config.authSchemePreference)
882898
.withAuthSchemeResolver(value: config.authSchemeResolver)
883899
.withUnsignedPayloadTrait(value: false)
884900
.withSocketTimeout(value: config.httpClientConfiguration.socketTimeout)
@@ -955,6 +971,7 @@ extension ACMClient {
955971
.withLogger(value: config.logger)
956972
.withPartitionID(value: config.partitionID)
957973
.withAuthSchemes(value: config.authSchemes ?? [])
974+
.withAuthSchemePreference(value: config.authSchemePreference)
958975
.withAuthSchemeResolver(value: config.authSchemeResolver)
959976
.withUnsignedPayloadTrait(value: false)
960977
.withSocketTimeout(value: config.httpClientConfiguration.socketTimeout)
@@ -1031,6 +1048,7 @@ extension ACMClient {
10311048
.withLogger(value: config.logger)
10321049
.withPartitionID(value: config.partitionID)
10331050
.withAuthSchemes(value: config.authSchemes ?? [])
1051+
.withAuthSchemePreference(value: config.authSchemePreference)
10341052
.withAuthSchemeResolver(value: config.authSchemeResolver)
10351053
.withUnsignedPayloadTrait(value: false)
10361054
.withSocketTimeout(value: config.httpClientConfiguration.socketTimeout)
@@ -1109,6 +1127,7 @@ extension ACMClient {
11091127
.withLogger(value: config.logger)
11101128
.withPartitionID(value: config.partitionID)
11111129
.withAuthSchemes(value: config.authSchemes ?? [])
1130+
.withAuthSchemePreference(value: config.authSchemePreference)
11121131
.withAuthSchemeResolver(value: config.authSchemeResolver)
11131132
.withUnsignedPayloadTrait(value: false)
11141133
.withSocketTimeout(value: config.httpClientConfiguration.socketTimeout)
@@ -1189,6 +1208,7 @@ extension ACMClient {
11891208
.withLogger(value: config.logger)
11901209
.withPartitionID(value: config.partitionID)
11911210
.withAuthSchemes(value: config.authSchemes ?? [])
1211+
.withAuthSchemePreference(value: config.authSchemePreference)
11921212
.withAuthSchemeResolver(value: config.authSchemeResolver)
11931213
.withUnsignedPayloadTrait(value: false)
11941214
.withSocketTimeout(value: config.httpClientConfiguration.socketTimeout)
@@ -1266,6 +1286,7 @@ extension ACMClient {
12661286
.withLogger(value: config.logger)
12671287
.withPartitionID(value: config.partitionID)
12681288
.withAuthSchemes(value: config.authSchemes ?? [])
1289+
.withAuthSchemePreference(value: config.authSchemePreference)
12691290
.withAuthSchemeResolver(value: config.authSchemeResolver)
12701291
.withUnsignedPayloadTrait(value: false)
12711292
.withSocketTimeout(value: config.httpClientConfiguration.socketTimeout)
@@ -1347,6 +1368,7 @@ extension ACMClient {
13471368
.withLogger(value: config.logger)
13481369
.withPartitionID(value: config.partitionID)
13491370
.withAuthSchemes(value: config.authSchemes ?? [])
1371+
.withAuthSchemePreference(value: config.authSchemePreference)
13501372
.withAuthSchemeResolver(value: config.authSchemeResolver)
13511373
.withUnsignedPayloadTrait(value: false)
13521374
.withSocketTimeout(value: config.httpClientConfiguration.socketTimeout)
@@ -1425,6 +1447,7 @@ extension ACMClient {
14251447
.withLogger(value: config.logger)
14261448
.withPartitionID(value: config.partitionID)
14271449
.withAuthSchemes(value: config.authSchemes ?? [])
1450+
.withAuthSchemePreference(value: config.authSchemePreference)
14281451
.withAuthSchemeResolver(value: config.authSchemeResolver)
14291452
.withUnsignedPayloadTrait(value: false)
14301453
.withSocketTimeout(value: config.httpClientConfiguration.socketTimeout)
@@ -1503,6 +1526,7 @@ extension ACMClient {
15031526
.withLogger(value: config.logger)
15041527
.withPartitionID(value: config.partitionID)
15051528
.withAuthSchemes(value: config.authSchemes ?? [])
1529+
.withAuthSchemePreference(value: config.authSchemePreference)
15061530
.withAuthSchemeResolver(value: config.authSchemeResolver)
15071531
.withUnsignedPayloadTrait(value: false)
15081532
.withSocketTimeout(value: config.httpClientConfiguration.socketTimeout)

‎Sources/Services/AWSACM/Sources/AWSACM/AuthSchemeResolver.swift‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ public protocol ACMAuthSchemeResolver: SmithyHTTPAuthAPI.AuthSchemeResolver {
2828

2929
public struct DefaultACMAuthSchemeResolver: ACMAuthSchemeResolver {
3030

31+
public let authSchemePreference: [String]
32+
33+
public init(authSchemePreference: [String] = []) {
34+
self.authSchemePreference = authSchemePreference
35+
}
36+
3137
public func resolveAuthScheme(params: SmithyHTTPAuthAPI.AuthSchemeResolverParameters) throws -> [SmithyHTTPAuthAPI.AuthOption] {
3238
var validAuthOptions = [SmithyHTTPAuthAPI.AuthOption]()
3339
guard let serviceParams = params as? ACMAuthSchemeResolverParameters else {
@@ -43,7 +49,7 @@ public struct DefaultACMAuthSchemeResolver: ACMAuthSchemeResolver {
4349
sigV4Option.signingProperties.set(key: SmithyHTTPAuthAPI.SigningPropertyKeys.signingRegion, value: region)
4450
validAuthOptions.append(sigV4Option)
4551
}
46-
return validAuthOptions
52+
return self.reprioritizeAuthOptions(authSchemePreference: authSchemePreference, authOptions: validAuthOptions)
4753
}
4854

4955
public func constructParameters(context: Smithy.Context) throws -> SmithyHTTPAuthAPI.AuthSchemeResolverParameters {

‎Sources/Services/AWSACM/Sources/AWSACM/Plugins.swift‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,15 @@ public class DefaultAWSAuthSchemePlugin: ClientRuntime.Plugin {
5252

5353
public class ACMClientAuthSchemePlugin: ClientRuntime.Plugin {
5454
private var authSchemes: SmithyHTTPAuthAPI.AuthSchemes?
55+
private var authSchemePreference: [String]
5556
private var authSchemeResolver: SmithyHTTPAuthAPI.AuthSchemeResolver?
5657
private var awsCredentialIdentityResolver: (any SmithyIdentity.AWSCredentialIdentityResolver)?
5758
private var bearerTokenIdentityResolver: (any SmithyIdentity.BearerTokenIdentityResolver)?
5859

59-
public init(authSchemes: SmithyHTTPAuthAPI.AuthSchemes? = nil, authSchemeResolver: ACMAuthSchemeResolver? = nil, awsCredentialIdentityResolver: (any SmithyIdentity.AWSCredentialIdentityResolver)? = nil, bearerTokenIdentityResolver: (any SmithyIdentity.BearerTokenIdentityResolver)? = nil) {
60+
public init(authSchemes: SmithyHTTPAuthAPI.AuthSchemes? = nil, authSchemePreference: [String]? = nil, authSchemeResolver: ACMAuthSchemeResolver? = nil, awsCredentialIdentityResolver: (any SmithyIdentity.AWSCredentialIdentityResolver)? = nil, bearerTokenIdentityResolver: (any SmithyIdentity.BearerTokenIdentityResolver)? = nil) {
6061
self.authSchemeResolver = authSchemeResolver
6162
self.authSchemes = authSchemes
63+
self.authSchemePreference = authSchemePreference ?? []
6264
self.awsCredentialIdentityResolver = awsCredentialIdentityResolver
6365
self.bearerTokenIdentityResolver = bearerTokenIdentityResolver
6466
}
@@ -68,6 +70,9 @@ public class ACMClientAuthSchemePlugin: ClientRuntime.Plugin {
6870
if (self.authSchemes != nil) {
6971
config.authSchemes = self.authSchemes
7072
}
73+
if (self.authSchemePreference != nil) {
74+
config.authSchemePreference = self.authSchemePreference
75+
}
7176
if (self.authSchemeResolver != nil) {
7277
config.authSchemeResolver = self.authSchemeResolver!
7378
}

0 commit comments

Comments
 (0)