Skip to content

Commit

Permalink
chore: Codegen with bearer token changes (#1649)
Browse files Browse the repository at this point in the history
* Codegen after bearer token auth merge.

* Update codegen

---------

Co-authored-by: Sichan Yoo <[email protected]>
  • Loading branch information
sichanyoo and Sichan Yoo authored Jul 26, 2024
1 parent 1e58b27 commit fb26571
Show file tree
Hide file tree
Showing 772 changed files with 24,434 additions and 3,073 deletions.
35 changes: 28 additions & 7 deletions Sources/Services/AWSACM/Sources/AWSACM/ACMClient.swift

Large diffs are not rendered by default.

11 changes: 10 additions & 1 deletion Sources/Services/AWSACM/Sources/AWSACM/Plugins.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ import protocol ClientRuntime.ClientConfiguration
import protocol ClientRuntime.Plugin
import protocol SmithyHTTPAuthAPI.AuthSchemeResolver
import protocol SmithyIdentity.AWSCredentialIdentityResolver
import protocol SmithyIdentity.BearerTokenIdentityResolver
import struct AWSSDKHTTPAuth.SigV4AuthScheme
import struct SmithyIdentity.BearerTokenIdentity
import struct SmithyIdentity.StaticBearerTokenIdentityResolver
import typealias SmithyHTTPAuthAPI.AuthSchemes

public class ACMClientEndpointPlugin: Plugin {
Expand Down Expand Up @@ -42,6 +45,7 @@ public class DefaultAWSAuthSchemePlugin: ClientRuntime.Plugin {
config.authSchemeResolver = DefaultACMAuthSchemeResolver()
config.authSchemes = [AWSSDKHTTPAuth.SigV4AuthScheme()]
config.awsCredentialIdentityResolver = try AWSClientRuntime.AWSClientConfigDefaultsProvider.awsCredentialIdentityResolver()
config.bearerTokenIdentityResolver = SmithyIdentity.StaticBearerTokenIdentityResolver(token: SmithyIdentity.BearerTokenIdentity(token: ""))
}
}
}
Expand All @@ -50,11 +54,13 @@ public class ACMClientAuthSchemePlugin: ClientRuntime.Plugin {
private var authSchemes: SmithyHTTPAuthAPI.AuthSchemes?
private var authSchemeResolver: SmithyHTTPAuthAPI.AuthSchemeResolver?
private var awsCredentialIdentityResolver: (any SmithyIdentity.AWSCredentialIdentityResolver)?
private var bearerTokenIdentityResolver: (any SmithyIdentity.BearerTokenIdentityResolver)?

public init(authSchemes: SmithyHTTPAuthAPI.AuthSchemes? = nil, authSchemeResolver: ACMAuthSchemeResolver? = nil, awsCredentialIdentityResolver: (any SmithyIdentity.AWSCredentialIdentityResolver)? = nil) {
public init(authSchemes: SmithyHTTPAuthAPI.AuthSchemes? = nil, authSchemeResolver: ACMAuthSchemeResolver? = nil, awsCredentialIdentityResolver: (any SmithyIdentity.AWSCredentialIdentityResolver)? = nil, bearerTokenIdentityResolver: (any SmithyIdentity.BearerTokenIdentityResolver)? = nil) {
self.authSchemeResolver = authSchemeResolver
self.authSchemes = authSchemes
self.awsCredentialIdentityResolver = awsCredentialIdentityResolver
self.bearerTokenIdentityResolver = bearerTokenIdentityResolver
}

public func configureClient(clientConfiguration: ClientRuntime.ClientConfiguration) throws {
Expand All @@ -68,6 +74,9 @@ public class ACMClientAuthSchemePlugin: ClientRuntime.Plugin {
if (self.awsCredentialIdentityResolver != nil) {
config.awsCredentialIdentityResolver = self.awsCredentialIdentityResolver!
}
if (self.bearerTokenIdentityResolver != nil) {
config.bearerTokenIdentityResolver = self.bearerTokenIdentityResolver!
}
}
}
}
43 changes: 36 additions & 7 deletions Sources/Services/AWSACMPCA/Sources/AWSACMPCA/ACMPCAClient.swift

Large diffs are not rendered by default.

11 changes: 10 additions & 1 deletion Sources/Services/AWSACMPCA/Sources/AWSACMPCA/Plugins.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ import protocol ClientRuntime.ClientConfiguration
import protocol ClientRuntime.Plugin
import protocol SmithyHTTPAuthAPI.AuthSchemeResolver
import protocol SmithyIdentity.AWSCredentialIdentityResolver
import protocol SmithyIdentity.BearerTokenIdentityResolver
import struct AWSSDKHTTPAuth.SigV4AuthScheme
import struct SmithyIdentity.BearerTokenIdentity
import struct SmithyIdentity.StaticBearerTokenIdentityResolver
import typealias SmithyHTTPAuthAPI.AuthSchemes

public class ACMPCAClientEndpointPlugin: Plugin {
Expand Down Expand Up @@ -42,6 +45,7 @@ public class DefaultAWSAuthSchemePlugin: ClientRuntime.Plugin {
config.authSchemeResolver = DefaultACMPCAAuthSchemeResolver()
config.authSchemes = [AWSSDKHTTPAuth.SigV4AuthScheme()]
config.awsCredentialIdentityResolver = try AWSClientRuntime.AWSClientConfigDefaultsProvider.awsCredentialIdentityResolver()
config.bearerTokenIdentityResolver = SmithyIdentity.StaticBearerTokenIdentityResolver(token: SmithyIdentity.BearerTokenIdentity(token: ""))
}
}
}
Expand All @@ -50,11 +54,13 @@ public class ACMPCAClientAuthSchemePlugin: ClientRuntime.Plugin {
private var authSchemes: SmithyHTTPAuthAPI.AuthSchemes?
private var authSchemeResolver: SmithyHTTPAuthAPI.AuthSchemeResolver?
private var awsCredentialIdentityResolver: (any SmithyIdentity.AWSCredentialIdentityResolver)?
private var bearerTokenIdentityResolver: (any SmithyIdentity.BearerTokenIdentityResolver)?

public init(authSchemes: SmithyHTTPAuthAPI.AuthSchemes? = nil, authSchemeResolver: ACMPCAAuthSchemeResolver? = nil, awsCredentialIdentityResolver: (any SmithyIdentity.AWSCredentialIdentityResolver)? = nil) {
public init(authSchemes: SmithyHTTPAuthAPI.AuthSchemes? = nil, authSchemeResolver: ACMPCAAuthSchemeResolver? = nil, awsCredentialIdentityResolver: (any SmithyIdentity.AWSCredentialIdentityResolver)? = nil, bearerTokenIdentityResolver: (any SmithyIdentity.BearerTokenIdentityResolver)? = nil) {
self.authSchemeResolver = authSchemeResolver
self.authSchemes = authSchemes
self.awsCredentialIdentityResolver = awsCredentialIdentityResolver
self.bearerTokenIdentityResolver = bearerTokenIdentityResolver
}

public func configureClient(clientConfiguration: ClientRuntime.ClientConfiguration) throws {
Expand All @@ -68,6 +74,9 @@ public class ACMPCAClientAuthSchemePlugin: ClientRuntime.Plugin {
if (self.awsCredentialIdentityResolver != nil) {
config.awsCredentialIdentityResolver = self.awsCredentialIdentityResolver!
}
if (self.bearerTokenIdentityResolver != nil) {
config.bearerTokenIdentityResolver = self.bearerTokenIdentityResolver!
}
}
}
}
Loading

0 comments on commit fb26571

Please sign in to comment.