Merge pull request #145 from amzn/aws_client_invocation_delegate_conv…

…enience_function Use AWSClientInvocationDelegate convenience function.
amzn · Dec 18, 2023 · f887209 · f887209
2 parents 07e658e + e7462b5
commit f887209
Show file tree

Hide file tree

Showing 23 changed files with 1,359 additions and 1,358 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -10,6 +10,7 @@ jobs:
   run-codeql-linux:
     name: Run CodeQL on Linux
     runs-on: ubuntu-latest
+    container: swift:5.8
     permissions:
       security-events: write
 

diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
@@ -12,10 +12,10 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-22.04, ubuntu-20.04]
-        swift: ["5.8"]
+        swift: ["5.9"]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: swift-actions/setup-swift@v1.23.0
+      - uses: swift-actions/setup-swift@v1.25.0
         with:
           swift-version: ${{ matrix.swift }}
       - uses: actions/checkout@v2
@@ -28,10 +28,10 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        swift: ["5.7.3"]
+        swift: ["5.8.1", "5.7.3"]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: swift-actions/setup-swift@v1.23.0
+      - uses: swift-actions/setup-swift@v1.25.0
         with:
           swift-version: ${{ matrix.swift }}
       - uses: actions/checkout@v2

diff --git a/Package.resolved b/Package.resolved
@@ -15,17 +15,17 @@
         "repositoryURL": "https://github.com/amzn/smoke-aws-support.git",
         "state": {
           "branch": null,
-          "revision": "276620e7599e94b680cfc2b1c2285e0016850860",
-          "version": "1.2.2"
+          "revision": "c46cd7e8b8f32d6629d57a8b2b58d6622bd898be",
+          "version": "1.7.0"
         }
       },
       {
         "package": "smoke-http",
         "repositoryURL": "https://github.com/amzn/smoke-http.git",
         "state": {
           "branch": null,
-          "revision": "3ec0cea2402f4c16303a4378f62eae8a83d0ee12",
-          "version": "2.20.0"
+          "revision": "d37f4c40e3f00a880fc09b7927f8a2fbf4c5d018",
+          "version": "2.22.5"
         }
       },
       {

diff --git a/Package.swift b/Package.swift
@@ -144,7 +144,7 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-metrics.git", "1.0.0"..<"3.0.0"),
         .package(url: "https://github.com/LiveUI/XMLCoding.git", from: "0.4.1"),
         .package(url: "https://github.com/amzn/smoke-http.git", from: "2.19.1"),
-        .package(url: "https://github.com/amzn/smoke-aws-support.git", from: "1.0.0"),
+        .package(url: "https://github.com/amzn/smoke-aws-support.git", from: "1.7.0"),
         .package(url: "https://github.com/apple/swift-crypto.git", from: "1.0.0"),
     ],
     targets: [

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 <img src="https://github.com/amzn/smoke-aws/actions/workflows/swift.yml/badge.svg?branch=main" alt="Build - Main Branch">
 </a>
 <a href="http://swift.org">
-<img src="https://img.shields.io/badge/swift-5.7|5.8-orange.svg?style=flat" alt="Swift 5.7 and 5.8 Tested">
+<img src="https://img.shields.io/badge/swift-5.7|5.8-orange.svg?style=flat" alt="Swift 5.7, 5.8 and 5.9 Tested">
 </a>
 <img src="https://img.shields.io/badge/ubuntu-20.04|22.04-yellow.svg?style=flat" alt="Ubuntu 20.04 and 22.04 Tested">
 <a href="https://gitter.im/SmokeServerSide">

diff --git a/Sources/AppConfigClient/AWSAppConfigClient.swift b/Sources/AppConfigClient/AWSAppConfigClient.swift
diff --git a/Sources/CloudWatchClient/AWSCloudWatchClient.swift b/Sources/CloudWatchClient/AWSCloudWatchClient.swift
diff --git a/Sources/CloudformationClient/AWSCloudformationClient.swift b/Sources/CloudformationClient/AWSCloudformationClient.swift
diff --git a/Sources/CodePipelineClient/AWSCodePipelineClient.swift b/Sources/CodePipelineClient/AWSCodePipelineClient.swift
diff --git a/Sources/DynamoDBClient/AWSDynamoDBClient.swift b/Sources/DynamoDBClient/AWSDynamoDBClient.swift
diff --git a/Sources/ECRClient/AWSECRClient.swift b/Sources/ECRClient/AWSECRClient.swift
diff --git a/Sources/ElasticComputeCloudClient/AWSElasticComputeCloudClient.swift b/Sources/ElasticComputeCloudClient/AWSElasticComputeCloudClient.swift
diff --git a/Sources/ElasticContainerClient/AWSElasticContainerClient.swift b/Sources/ElasticContainerClient/AWSElasticContainerClient.swift
diff --git a/Sources/RDSClient/AWSRDSClient.swift b/Sources/RDSClient/AWSRDSClient.swift
diff --git a/Sources/RDSDataClient/AWSRDSDataClient.swift b/Sources/RDSDataClient/AWSRDSDataClient.swift
@@ -581,7 +581,7 @@ public struct AWSRDSDataClient<InvocationReportingType: HTTPClientCoreInvocation
      */
     public func batchExecuteStatement(
             input: RDSDataModel.BatchExecuteStatementRequest) async throws -> RDSDataModel.BatchExecuteStatementResponse {
-        let handlerDelegate = AWSClientInvocationDelegate(
+        let handlerDelegate = try await AWSClientInvocationDelegate.get(
                     credentialsProvider: credentialsProvider,
                     awsRegion: awsRegion,
                     service: service,
@@ -617,7 +617,7 @@ public struct AWSRDSDataClient<InvocationReportingType: HTTPClientCoreInvocation
      */
     public func beginTransaction(
             input: RDSDataModel.BeginTransactionRequest) async throws -> RDSDataModel.BeginTransactionResponse {
-        let handlerDelegate = AWSClientInvocationDelegate(
+        let handlerDelegate = try await AWSClientInvocationDelegate.get(
                     credentialsProvider: credentialsProvider,
                     awsRegion: awsRegion,
                     service: service,
@@ -653,7 +653,7 @@ public struct AWSRDSDataClient<InvocationReportingType: HTTPClientCoreInvocation
      */
     public func commitTransaction(
             input: RDSDataModel.CommitTransactionRequest) async throws -> RDSDataModel.CommitTransactionResponse {
-        let handlerDelegate = AWSClientInvocationDelegate(
+        let handlerDelegate = try await AWSClientInvocationDelegate.get(
                     credentialsProvider: credentialsProvider,
                     awsRegion: awsRegion,
                     service: service,
@@ -689,7 +689,7 @@ public struct AWSRDSDataClient<InvocationReportingType: HTTPClientCoreInvocation
      */
     public func executeSql(
             input: RDSDataModel.ExecuteSqlRequest) async throws -> RDSDataModel.ExecuteSqlResponse {
-        let handlerDelegate = AWSClientInvocationDelegate(
+        let handlerDelegate = try await AWSClientInvocationDelegate.get(
                     credentialsProvider: credentialsProvider,
                     awsRegion: awsRegion,
                     service: service,
@@ -725,7 +725,7 @@ public struct AWSRDSDataClient<InvocationReportingType: HTTPClientCoreInvocation
      */
     public func executeStatement(
             input: RDSDataModel.ExecuteStatementRequest) async throws -> RDSDataModel.ExecuteStatementResponse {
-        let handlerDelegate = AWSClientInvocationDelegate(
+        let handlerDelegate = try await AWSClientInvocationDelegate.get(
                     credentialsProvider: credentialsProvider,
                     awsRegion: awsRegion,
                     service: service,
@@ -761,7 +761,7 @@ public struct AWSRDSDataClient<InvocationReportingType: HTTPClientCoreInvocation
      */
     public func rollbackTransaction(
             input: RDSDataModel.RollbackTransactionRequest) async throws -> RDSDataModel.RollbackTransactionResponse {
-        let handlerDelegate = AWSClientInvocationDelegate(
+        let handlerDelegate = try await AWSClientInvocationDelegate.get(
                     credentialsProvider: credentialsProvider,
                     awsRegion: awsRegion,
                     service: service,