Skip to content

Commit

Permalink
Merge branch 'main' into jbe/delete_release_workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
jbelkins authored Jul 6, 2023
2 parents f235096 + d08625c commit 11357da
Show file tree
Hide file tree
Showing 462 changed files with 32,455 additions and 4,366 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@ struct PrepareRelease {
try tagVersion(newVersion)
try generateReleaseManifest(
newVersion: newVersion,
previousVersion: previousVersion,
sourceCodeArtifactId: sourceCodeArtifactId
previousVersion: previousVersion
)
try gitStatus()
}
Expand Down Expand Up @@ -168,8 +167,7 @@ struct PrepareRelease {
/// - sourceCodeArtifactId: The artifactId for the source code
func generateReleaseManifest(
newVersion: Version,
previousVersion: Version,
sourceCodeArtifactId: String
previousVersion: Version
) throws {
let commits = try Process.git.listOfCommitsBetween("HEAD", "\(previousVersion)")

Expand All @@ -184,9 +182,7 @@ struct PrepareRelease {
name: "\(newVersion)",
tagName: "\(newVersion)",
body: releaseNotes,
assets: [
.init(artifactId: sourceCodeArtifactId, name: "Source code")
]
assets: []
)

let jsonData = try JSONEncoder().encode(manifest)
Expand Down
4 changes: 3 additions & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ func addProtocolTests() {
// MARK: - Generated

addDependencies(
clientRuntimeVersion: "0.22.0",
clientRuntimeVersion: "0.24.0",
crtVersion: "0.12.0"
)

Expand All @@ -189,6 +189,7 @@ let serviceTargets: [String] = [
"AWSApiGatewayV2",
"AWSAppConfig",
"AWSAppConfigData",
"AWSAppFabric",
"AWSAppIntegrations",
"AWSAppMesh",
"AWSAppRunner",
Expand Down Expand Up @@ -508,6 +509,7 @@ let serviceTargets: [String] = [
"AWSTransfer",
"AWSTranslate",
"AWSVPCLattice",
"AWSVerifiedPermissions",
"AWSVoiceID",
"AWSWAF",
"AWSWAFRegional",
Expand Down
2 changes: 1 addition & 1 deletion Package.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.19.0
0.20.0
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ typealias CRTCredentialsProvider = AwsCommonRuntimeKit.CredentialsProvider
struct CredentialsProvidingCRTAdapter: CRTCredentialsProviding {
let credentialsProvider: CredentialsProviding

init(credentialsProvider: CredentialsProviding) {
self.credentialsProvider = credentialsProvider
}

func getCredentials() async throws -> CRTCredentials {
let credentials = try await credentialsProvider.getCredentials()
return try .init(credentials: credentials)
Expand Down
9 changes: 4 additions & 5 deletions Sources/Services/AWSACM/EndpointResolver.swift
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,14 @@ public struct EndpointResolverMiddleware<OperationStackOutput: ClientRuntime.Htt
input.withProtocol(protocolType)
}

var updatedContext = context
if let signingRegion = signingRegion {
updatedContext.attributes.set(key: HttpContext.signingRegion, value: signingRegion)
context.attributes.set(key: HttpContext.signingRegion, value: signingRegion)
}
if let signingName = signingName {
updatedContext.attributes.set(key: HttpContext.signingName, value: signingName)
context.attributes.set(key: HttpContext.signingName, value: signingName)
}
if let signingAlgorithm = signingAlgorithm {
updatedContext.attributes.set(key: HttpContext.signingAlgorithm, value: signingAlgorithm)
context.attributes.set(key: HttpContext.signingAlgorithm, value: signingAlgorithm)
}

if let headers = endpoint.headers {
Expand All @@ -146,7 +145,7 @@ public struct EndpointResolverMiddleware<OperationStackOutput: ClientRuntime.Htt
.withPath(awsEndpoint.endpoint.path.appendingPathComponent(context.getPath()))
.withHeader(name: "Host", value: host)

return try await next.handle(context: updatedContext, input: input)
return try await next.handle(context: context, input: input)
}

public typealias MInput = ClientRuntime.SdkHttpRequestBuilder
Expand Down
9 changes: 4 additions & 5 deletions Sources/Services/AWSACMPCA/EndpointResolver.swift
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,14 @@ public struct EndpointResolverMiddleware<OperationStackOutput: ClientRuntime.Htt
input.withProtocol(protocolType)
}

var updatedContext = context
if let signingRegion = signingRegion {
updatedContext.attributes.set(key: HttpContext.signingRegion, value: signingRegion)
context.attributes.set(key: HttpContext.signingRegion, value: signingRegion)
}
if let signingName = signingName {
updatedContext.attributes.set(key: HttpContext.signingName, value: signingName)
context.attributes.set(key: HttpContext.signingName, value: signingName)
}
if let signingAlgorithm = signingAlgorithm {
updatedContext.attributes.set(key: HttpContext.signingAlgorithm, value: signingAlgorithm)
context.attributes.set(key: HttpContext.signingAlgorithm, value: signingAlgorithm)
}

if let headers = endpoint.headers {
Expand All @@ -146,7 +145,7 @@ public struct EndpointResolverMiddleware<OperationStackOutput: ClientRuntime.Htt
.withPath(awsEndpoint.endpoint.path.appendingPathComponent(context.getPath()))
.withHeader(name: "Host", value: host)

return try await next.handle(context: updatedContext, input: input)
return try await next.handle(context: context, input: input)
}

public typealias MInput = ClientRuntime.SdkHttpRequestBuilder
Expand Down
9 changes: 4 additions & 5 deletions Sources/Services/AWSAPIGateway/EndpointResolver.swift
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,14 @@ public struct EndpointResolverMiddleware<OperationStackOutput: ClientRuntime.Htt
input.withProtocol(protocolType)
}

var updatedContext = context
if let signingRegion = signingRegion {
updatedContext.attributes.set(key: HttpContext.signingRegion, value: signingRegion)
context.attributes.set(key: HttpContext.signingRegion, value: signingRegion)
}
if let signingName = signingName {
updatedContext.attributes.set(key: HttpContext.signingName, value: signingName)
context.attributes.set(key: HttpContext.signingName, value: signingName)
}
if let signingAlgorithm = signingAlgorithm {
updatedContext.attributes.set(key: HttpContext.signingAlgorithm, value: signingAlgorithm)
context.attributes.set(key: HttpContext.signingAlgorithm, value: signingAlgorithm)
}

if let headers = endpoint.headers {
Expand All @@ -146,7 +145,7 @@ public struct EndpointResolverMiddleware<OperationStackOutput: ClientRuntime.Htt
.withPath(awsEndpoint.endpoint.path.appendingPathComponent(context.getPath()))
.withHeader(name: "Host", value: host)

return try await next.handle(context: updatedContext, input: input)
return try await next.handle(context: context, input: input)
}

public typealias MInput = ClientRuntime.SdkHttpRequestBuilder
Expand Down
9 changes: 4 additions & 5 deletions Sources/Services/AWSARCZonalShift/EndpointResolver.swift
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,14 @@ public struct EndpointResolverMiddleware<OperationStackOutput: ClientRuntime.Htt
input.withProtocol(protocolType)
}

var updatedContext = context
if let signingRegion = signingRegion {
updatedContext.attributes.set(key: HttpContext.signingRegion, value: signingRegion)
context.attributes.set(key: HttpContext.signingRegion, value: signingRegion)
}
if let signingName = signingName {
updatedContext.attributes.set(key: HttpContext.signingName, value: signingName)
context.attributes.set(key: HttpContext.signingName, value: signingName)
}
if let signingAlgorithm = signingAlgorithm {
updatedContext.attributes.set(key: HttpContext.signingAlgorithm, value: signingAlgorithm)
context.attributes.set(key: HttpContext.signingAlgorithm, value: signingAlgorithm)
}

if let headers = endpoint.headers {
Expand All @@ -146,7 +145,7 @@ public struct EndpointResolverMiddleware<OperationStackOutput: ClientRuntime.Htt
.withPath(awsEndpoint.endpoint.path.appendingPathComponent(context.getPath()))
.withHeader(name: "Host", value: host)

return try await next.handle(context: updatedContext, input: input)
return try await next.handle(context: context, input: input)
}

public typealias MInput = ClientRuntime.SdkHttpRequestBuilder
Expand Down
9 changes: 4 additions & 5 deletions Sources/Services/AWSAccessAnalyzer/EndpointResolver.swift
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,14 @@ public struct EndpointResolverMiddleware<OperationStackOutput: ClientRuntime.Htt
input.withProtocol(protocolType)
}

var updatedContext = context
if let signingRegion = signingRegion {
updatedContext.attributes.set(key: HttpContext.signingRegion, value: signingRegion)
context.attributes.set(key: HttpContext.signingRegion, value: signingRegion)
}
if let signingName = signingName {
updatedContext.attributes.set(key: HttpContext.signingName, value: signingName)
context.attributes.set(key: HttpContext.signingName, value: signingName)
}
if let signingAlgorithm = signingAlgorithm {
updatedContext.attributes.set(key: HttpContext.signingAlgorithm, value: signingAlgorithm)
context.attributes.set(key: HttpContext.signingAlgorithm, value: signingAlgorithm)
}

if let headers = endpoint.headers {
Expand All @@ -146,7 +145,7 @@ public struct EndpointResolverMiddleware<OperationStackOutput: ClientRuntime.Htt
.withPath(awsEndpoint.endpoint.path.appendingPathComponent(context.getPath()))
.withHeader(name: "Host", value: host)

return try await next.handle(context: updatedContext, input: input)
return try await next.handle(context: context, input: input)
}

public typealias MInput = ClientRuntime.SdkHttpRequestBuilder
Expand Down
9 changes: 4 additions & 5 deletions Sources/Services/AWSAccount/EndpointResolver.swift
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,14 @@ public struct EndpointResolverMiddleware<OperationStackOutput: ClientRuntime.Htt
input.withProtocol(protocolType)
}

var updatedContext = context
if let signingRegion = signingRegion {
updatedContext.attributes.set(key: HttpContext.signingRegion, value: signingRegion)
context.attributes.set(key: HttpContext.signingRegion, value: signingRegion)
}
if let signingName = signingName {
updatedContext.attributes.set(key: HttpContext.signingName, value: signingName)
context.attributes.set(key: HttpContext.signingName, value: signingName)
}
if let signingAlgorithm = signingAlgorithm {
updatedContext.attributes.set(key: HttpContext.signingAlgorithm, value: signingAlgorithm)
context.attributes.set(key: HttpContext.signingAlgorithm, value: signingAlgorithm)
}

if let headers = endpoint.headers {
Expand All @@ -146,7 +145,7 @@ public struct EndpointResolverMiddleware<OperationStackOutput: ClientRuntime.Htt
.withPath(awsEndpoint.endpoint.path.appendingPathComponent(context.getPath()))
.withHeader(name: "Host", value: host)

return try await next.handle(context: updatedContext, input: input)
return try await next.handle(context: context, input: input)
}

public typealias MInput = ClientRuntime.SdkHttpRequestBuilder
Expand Down
9 changes: 4 additions & 5 deletions Sources/Services/AWSAlexaForBusiness/EndpointResolver.swift
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,14 @@ public struct EndpointResolverMiddleware<OperationStackOutput: ClientRuntime.Htt
input.withProtocol(protocolType)
}

var updatedContext = context
if let signingRegion = signingRegion {
updatedContext.attributes.set(key: HttpContext.signingRegion, value: signingRegion)
context.attributes.set(key: HttpContext.signingRegion, value: signingRegion)
}
if let signingName = signingName {
updatedContext.attributes.set(key: HttpContext.signingName, value: signingName)
context.attributes.set(key: HttpContext.signingName, value: signingName)
}
if let signingAlgorithm = signingAlgorithm {
updatedContext.attributes.set(key: HttpContext.signingAlgorithm, value: signingAlgorithm)
context.attributes.set(key: HttpContext.signingAlgorithm, value: signingAlgorithm)
}

if let headers = endpoint.headers {
Expand All @@ -146,7 +145,7 @@ public struct EndpointResolverMiddleware<OperationStackOutput: ClientRuntime.Htt
.withPath(awsEndpoint.endpoint.path.appendingPathComponent(context.getPath()))
.withHeader(name: "Host", value: host)

return try await next.handle(context: updatedContext, input: input)
return try await next.handle(context: context, input: input)
}

public typealias MInput = ClientRuntime.SdkHttpRequestBuilder
Expand Down
9 changes: 4 additions & 5 deletions Sources/Services/AWSAmp/EndpointResolver.swift
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,14 @@ public struct EndpointResolverMiddleware<OperationStackOutput: ClientRuntime.Htt
input.withProtocol(protocolType)
}

var updatedContext = context
if let signingRegion = signingRegion {
updatedContext.attributes.set(key: HttpContext.signingRegion, value: signingRegion)
context.attributes.set(key: HttpContext.signingRegion, value: signingRegion)
}
if let signingName = signingName {
updatedContext.attributes.set(key: HttpContext.signingName, value: signingName)
context.attributes.set(key: HttpContext.signingName, value: signingName)
}
if let signingAlgorithm = signingAlgorithm {
updatedContext.attributes.set(key: HttpContext.signingAlgorithm, value: signingAlgorithm)
context.attributes.set(key: HttpContext.signingAlgorithm, value: signingAlgorithm)
}

if let headers = endpoint.headers {
Expand All @@ -146,7 +145,7 @@ public struct EndpointResolverMiddleware<OperationStackOutput: ClientRuntime.Htt
.withPath(awsEndpoint.endpoint.path.appendingPathComponent(context.getPath()))
.withHeader(name: "Host", value: host)

return try await next.handle(context: updatedContext, input: input)
return try await next.handle(context: context, input: input)
}

public typealias MInput = ClientRuntime.SdkHttpRequestBuilder
Expand Down
9 changes: 4 additions & 5 deletions Sources/Services/AWSAmplify/EndpointResolver.swift
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,14 @@ public struct EndpointResolverMiddleware<OperationStackOutput: ClientRuntime.Htt
input.withProtocol(protocolType)
}

var updatedContext = context
if let signingRegion = signingRegion {
updatedContext.attributes.set(key: HttpContext.signingRegion, value: signingRegion)
context.attributes.set(key: HttpContext.signingRegion, value: signingRegion)
}
if let signingName = signingName {
updatedContext.attributes.set(key: HttpContext.signingName, value: signingName)
context.attributes.set(key: HttpContext.signingName, value: signingName)
}
if let signingAlgorithm = signingAlgorithm {
updatedContext.attributes.set(key: HttpContext.signingAlgorithm, value: signingAlgorithm)
context.attributes.set(key: HttpContext.signingAlgorithm, value: signingAlgorithm)
}

if let headers = endpoint.headers {
Expand All @@ -146,7 +145,7 @@ public struct EndpointResolverMiddleware<OperationStackOutput: ClientRuntime.Htt
.withPath(awsEndpoint.endpoint.path.appendingPathComponent(context.getPath()))
.withHeader(name: "Host", value: host)

return try await next.handle(context: updatedContext, input: input)
return try await next.handle(context: context, input: input)
}

public typealias MInput = ClientRuntime.SdkHttpRequestBuilder
Expand Down
9 changes: 4 additions & 5 deletions Sources/Services/AWSAmplifyBackend/EndpointResolver.swift
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,14 @@ public struct EndpointResolverMiddleware<OperationStackOutput: ClientRuntime.Htt
input.withProtocol(protocolType)
}

var updatedContext = context
if let signingRegion = signingRegion {
updatedContext.attributes.set(key: HttpContext.signingRegion, value: signingRegion)
context.attributes.set(key: HttpContext.signingRegion, value: signingRegion)
}
if let signingName = signingName {
updatedContext.attributes.set(key: HttpContext.signingName, value: signingName)
context.attributes.set(key: HttpContext.signingName, value: signingName)
}
if let signingAlgorithm = signingAlgorithm {
updatedContext.attributes.set(key: HttpContext.signingAlgorithm, value: signingAlgorithm)
context.attributes.set(key: HttpContext.signingAlgorithm, value: signingAlgorithm)
}

if let headers = endpoint.headers {
Expand All @@ -146,7 +145,7 @@ public struct EndpointResolverMiddleware<OperationStackOutput: ClientRuntime.Htt
.withPath(awsEndpoint.endpoint.path.appendingPathComponent(context.getPath()))
.withHeader(name: "Host", value: host)

return try await next.handle(context: updatedContext, input: input)
return try await next.handle(context: context, input: input)
}

public typealias MInput = ClientRuntime.SdkHttpRequestBuilder
Expand Down
9 changes: 4 additions & 5 deletions Sources/Services/AWSAmplifyUIBuilder/EndpointResolver.swift
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,14 @@ public struct EndpointResolverMiddleware<OperationStackOutput: ClientRuntime.Htt
input.withProtocol(protocolType)
}

var updatedContext = context
if let signingRegion = signingRegion {
updatedContext.attributes.set(key: HttpContext.signingRegion, value: signingRegion)
context.attributes.set(key: HttpContext.signingRegion, value: signingRegion)
}
if let signingName = signingName {
updatedContext.attributes.set(key: HttpContext.signingName, value: signingName)
context.attributes.set(key: HttpContext.signingName, value: signingName)
}
if let signingAlgorithm = signingAlgorithm {
updatedContext.attributes.set(key: HttpContext.signingAlgorithm, value: signingAlgorithm)
context.attributes.set(key: HttpContext.signingAlgorithm, value: signingAlgorithm)
}

if let headers = endpoint.headers {
Expand All @@ -146,7 +145,7 @@ public struct EndpointResolverMiddleware<OperationStackOutput: ClientRuntime.Htt
.withPath(awsEndpoint.endpoint.path.appendingPathComponent(context.getPath()))
.withHeader(name: "Host", value: host)

return try await next.handle(context: updatedContext, input: input)
return try await next.handle(context: context, input: input)
}

public typealias MInput = ClientRuntime.SdkHttpRequestBuilder
Expand Down
Loading

0 comments on commit 11357da

Please sign in to comment.