From d6f8f81ea4038f1de6894c76dd96caa1aa52d72f Mon Sep 17 00:00:00 2001
From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com>
Date: Thu, 2 Nov 2023 13:17:06 -0700
Subject: [PATCH 1/9] chore: run aws-sdk-js-codemod@0.26.1 on src/**/*.js

---
 src/commands/add-cognito-user-pool-trigger.js | 22 ++++++++---
 src/commands/add-iot-topic-rule.js            | 20 +++++++---
 src/commands/add-kinesis-event-source.js      | 30 ++++++++++----
 src/commands/add-s3-event-source.js           | 39 ++++++++++++++-----
 src/commands/add-scheduled-event.js           | 20 +++++++---
 src/commands/add-sns-event-source.js          | 20 +++++++---
 src/commands/add-sqs-event-source.js          | 30 ++++++++++----
 src/commands/allow-alexa-skill-trigger.js     | 11 ++++--
 src/commands/create.js                        | 37 ++++++++++++++++--
 src/commands/destroy.js                       | 34 +++++++++++-----
 src/commands/list.js                          | 13 +++++--
 src/commands/set-cloudfront-trigger.js        | 33 ++++++++++------
 src/commands/set-version.js                   | 29 +++++++-------
 src/commands/tag.js                           | 21 +++++++---
 src/commands/test-lambda.js                   | 17 +++++---
 src/commands/update.js                        | 37 ++++++++++++++++--
 src/tasks/allow-api-invocation.js             | 14 ++++---
 src/tasks/get-owner-info.js                   | 13 +++++--
 src/tasks/list-versions.js                    |  2 +-
 src/tasks/rebuild-web-api.js                  | 24 +++++-------
 src/tasks/register-authorizers.js             | 24 ++++++++----
 21 files changed, 351 insertions(+), 139 deletions(-)

diff --git a/src/commands/add-cognito-user-pool-trigger.js b/src/commands/add-cognito-user-pool-trigger.js
index 6ed3adfd..7fdbcb9a 100644
--- a/src/commands/add-cognito-user-pool-trigger.js
+++ b/src/commands/add-cognito-user-pool-trigger.js
@@ -1,15 +1,25 @@
-const loadConfig = require('../util/loadconfig'),
-	iamNameSanitize = require('../util/iam-name-sanitize'),
-	aws = require('aws-sdk'),
-	getOwnerInfo = require('../tasks/get-owner-info');
+const loadConfig = require('../util/loadconfig'), iamNameSanitize = require('../util/iam-name-sanitize'), getOwnerInfo = require('../tasks/get-owner-info');
+
+const {
+    CognitoIdentityProvider
+} = require("@aws-sdk/client-cognito-identity-provider");
+
+const {
+    Lambda
+} = require("@aws-sdk/client-lambda");
+
 module.exports = function addCognitoUserPoolTrigger(options, optionalLogger) {
 	'use strict';
 	let lambdaConfig,
 		lambda,
 		cognito;
 	const initServices = function () {
-			lambda = new aws.Lambda({region: lambdaConfig.region});
-			cognito = new aws.CognitoIdentityServiceProvider({region: lambdaConfig.region});
+			lambda = new Lambda({
+                region: lambdaConfig.region
+            });
+			cognito = new CognitoIdentityProvider({
+                region: lambdaConfig.region
+            });
 		},
 		readConfig = function () {
 			return loadConfig(options, {lambda: {name: true, region: true}})
diff --git a/src/commands/add-iot-topic-rule.js b/src/commands/add-iot-topic-rule.js
index b64b8d2a..0de0ecd1 100644
--- a/src/commands/add-iot-topic-rule.js
+++ b/src/commands/add-iot-topic-rule.js
@@ -1,6 +1,12 @@
-const loadConfig = require('../util/loadconfig'),
-	iamNameSanitize = require('../util/iam-name-sanitize'),
-	aws = require('aws-sdk');
+const loadConfig = require('../util/loadconfig'), iamNameSanitize = require('../util/iam-name-sanitize');
+
+const {
+    IoT
+} = require("@aws-sdk/client-iot");
+
+const {
+    Lambda
+} = require("@aws-sdk/client-lambda");
 
 module.exports = function addIOTTopicRuleEventSource(options) {
 	'use strict';
@@ -9,8 +15,12 @@ module.exports = function addIOTTopicRuleEventSource(options) {
 		ruleName,
 		iot;
 	const initServices = function () {
-			lambda = new aws.Lambda({region: lambdaConfig.region});
-			iot = new aws.Iot({region: lambdaConfig.region});
+			lambda = new Lambda({
+                region: lambdaConfig.region
+            });
+			iot = new IoT({
+                region: lambdaConfig.region
+            });
 		},
 		readConfig = function () {
 			return loadConfig(options, {lambda: {name: true, region: true}})
diff --git a/src/commands/add-kinesis-event-source.js b/src/commands/add-kinesis-event-source.js
index 8bba972a..547e1111 100644
--- a/src/commands/add-kinesis-event-source.js
+++ b/src/commands/add-kinesis-event-source.js
@@ -1,8 +1,16 @@
-const loadConfig = require('../util/loadconfig'),
-	isRoleArn = require('../util/is-role-arn'),
-	isKinesisArn = require('../util/is-kinesis-arn'),
-	retry = require('oh-no-i-insist'),
-	aws = require('aws-sdk');
+const loadConfig = require('../util/loadconfig'), isRoleArn = require('../util/is-role-arn'), isKinesisArn = require('../util/is-kinesis-arn'), retry = require('oh-no-i-insist');
+
+const {
+    IAM
+} = require("@aws-sdk/client-iam");
+
+const {
+    Kinesis
+} = require("@aws-sdk/client-kinesis");
+
+const {
+    Lambda
+} = require("@aws-sdk/client-lambda");
 
 module.exports = function addKinesisEventSource(options, logger) {
 	'use strict';
@@ -13,9 +21,15 @@ module.exports = function addKinesisEventSource(options, logger) {
 	const awsDelay = Number(options['aws-delay']) || 5000,
 		awsRetries = Number(options['aws-retries']) || 15,
 		initServices = function () {
-			lambda = new aws.Lambda({region: lambdaConfig.region});
-			iam = new aws.IAM({region: lambdaConfig.region});
-			kinesis = new aws.Kinesis({region: lambdaConfig.region});
+			lambda = new Lambda({
+                region: lambdaConfig.region
+            });
+			iam = new IAM({
+                region: lambdaConfig.region
+            });
+			kinesis = new Kinesis({
+                region: lambdaConfig.region
+            });
 		},
 		getLambda = () => lambda.getFunctionConfiguration({FunctionName: lambdaConfig.name, Qualifier: options.version}).promise(),
 		readConfig = function () {
diff --git a/src/commands/add-s3-event-source.js b/src/commands/add-s3-event-source.js
index eb7df478..6427cc44 100644
--- a/src/commands/add-s3-event-source.js
+++ b/src/commands/add-s3-event-source.js
@@ -1,6 +1,17 @@
-const loadConfig = require('../util/loadconfig'),
-	iamNameSanitize = require('../util/iam-name-sanitize'),
-	aws = require('aws-sdk');
+const loadConfig = require('../util/loadconfig'), iamNameSanitize = require('../util/iam-name-sanitize');
+
+const {
+    IAM
+} = require("@aws-sdk/client-iam");
+
+const {
+    Lambda
+} = require("@aws-sdk/client-lambda");
+
+const {
+    S3
+} = require("@aws-sdk/client-s3");
+
 module.exports = function addS3EventSource(options) {
 	'use strict';
 	let lambdaConfig,
@@ -8,7 +19,9 @@ module.exports = function addS3EventSource(options) {
 		lambda;
 	const ts = Date.now(),
 		getLambda = function (config) {
-			lambda = new aws.Lambda({region: config.lambda.region});
+			lambda = new Lambda({
+                region: config.lambda.region
+            });
 			lambdaConfig = config.lambda;
 			return lambda.getFunctionConfiguration({FunctionName: lambdaConfig.name, Qualifier: options.version}).promise();
 		},
@@ -26,7 +39,9 @@ module.exports = function addS3EventSource(options) {
 				});
 		},
 		addS3AccessPolicy = function () {
-			const iam = new aws.IAM({region: lambdaConfig.region});
+			const iam = new IAM({
+                region: lambdaConfig.region
+            });
 			return iam.putRolePolicy({
 				RoleName: lambdaConfig.role,
 				PolicyName: iamNameSanitize(`s3-${options.bucket}-access-${ts}`),
@@ -44,7 +59,7 @@ module.exports = function addS3EventSource(options) {
 						}
 					]
 				})
-			}).promise();
+			});
 		},
 		addInvokePermission = function () {
 			return lambda.addPermission({
@@ -58,7 +73,13 @@ module.exports = function addS3EventSource(options) {
 		},
 		addBucketNotificationConfig = function () {
 			const events = options.events ? options.events.split(',') : ['s3:ObjectCreated:*'],
-				s3 = new aws.S3({region: lambdaConfig.region, signatureVersion: 'v4'}),
+				s3 = new S3({
+                    region: lambdaConfig.region,
+
+                    // The key signatureVersion is no longer supported in v3, and can be removed.
+                    // @deprecated SDK v3 only supports signature v4.
+                    signatureVersion: 'v4'
+                }),
 				eventConfig = {
 					LambdaFunctionArn: lambdaConfig.arn,
 					Events: events
@@ -85,7 +106,7 @@ module.exports = function addS3EventSource(options) {
 			}
 			return s3.getBucketNotificationConfiguration({
 				Bucket: options.bucket
-			}).promise()
+			})
 			.then(currentConfig => {
 				const merged = currentConfig || {};
 				if (!merged.LambdaFunctionConfigurations) {
@@ -95,7 +116,7 @@ module.exports = function addS3EventSource(options) {
 				return s3.putBucketNotificationConfiguration({
 					Bucket: options.bucket,
 					NotificationConfiguration: merged
-				}).promise();
+				});
 			});
 		};
 
diff --git a/src/commands/add-scheduled-event.js b/src/commands/add-scheduled-event.js
index c74c9e5c..14b9e56e 100644
--- a/src/commands/add-scheduled-event.js
+++ b/src/commands/add-scheduled-event.js
@@ -1,6 +1,12 @@
-const loadConfig = require('../util/loadconfig'),
-	fsPromise = require('../util/fs-promise'),
-	aws = require('aws-sdk');
+const loadConfig = require('../util/loadconfig'), fsPromise = require('../util/fs-promise');
+
+const {
+    CloudWatchEvents
+} = require("@aws-sdk/client-cloudwatch-events");
+
+const {
+    Lambda
+} = require("@aws-sdk/client-lambda");
 
 module.exports = function addScheduledEvent(options) {
 	'use strict';
@@ -10,8 +16,12 @@ module.exports = function addScheduledEvent(options) {
 		eventData,
 		ruleArn;
 	const initServices = function () {
-			lambda = new aws.Lambda({region: lambdaConfig.region});
-			events = new aws.CloudWatchEvents({region: lambdaConfig.region});
+			lambda = new Lambda({
+                region: lambdaConfig.region
+            });
+			events = new CloudWatchEvents({
+                region: lambdaConfig.region
+            });
 		},
 		getLambda = () => lambda.getFunctionConfiguration({FunctionName: lambdaConfig.name, Qualifier: options.version}).promise(),
 		readConfig = function () {
diff --git a/src/commands/add-sns-event-source.js b/src/commands/add-sns-event-source.js
index 43547a2c..cde2bfd6 100644
--- a/src/commands/add-sns-event-source.js
+++ b/src/commands/add-sns-event-source.js
@@ -1,6 +1,12 @@
-const loadConfig = require('../util/loadconfig'),
-	fsPromise = require('../util/fs-promise'),
-	aws = require('aws-sdk');
+const loadConfig = require('../util/loadconfig'), fsPromise = require('../util/fs-promise');
+
+const {
+    Lambda
+} = require("@aws-sdk/client-lambda");
+
+const {
+    SNS
+} = require("@aws-sdk/client-sns");
 
 module.exports = function addSNSEventSource(options) {
 	'use strict';
@@ -8,8 +14,12 @@ module.exports = function addSNSEventSource(options) {
 		lambda,
 		sns;
 	const initServices = function () {
-			lambda = new aws.Lambda({region: lambdaConfig.region});
-			sns = new aws.SNS({region: lambdaConfig.region});
+			lambda = new Lambda({
+                region: lambdaConfig.region
+            });
+			sns = new SNS({
+                region: lambdaConfig.region
+            });
 		},
 		getLambda = () => lambda.getFunctionConfiguration({FunctionName: lambdaConfig.name, Qualifier: options.version}).promise(),
 		readConfig = function () {
diff --git a/src/commands/add-sqs-event-source.js b/src/commands/add-sqs-event-source.js
index 39c49c55..09525239 100644
--- a/src/commands/add-sqs-event-source.js
+++ b/src/commands/add-sqs-event-source.js
@@ -1,8 +1,16 @@
-const loadConfig = require('../util/loadconfig'),
-	isSQSArn = require('../util/is-sqs-arn'),
-	iamNameSanitize = require('../util/iam-name-sanitize'),
-	retry = require('oh-no-i-insist'),
-	aws = require('aws-sdk');
+const loadConfig = require('../util/loadconfig'), isSQSArn = require('../util/is-sqs-arn'), iamNameSanitize = require('../util/iam-name-sanitize'), retry = require('oh-no-i-insist');
+
+const {
+    IAM
+} = require("@aws-sdk/client-iam");
+
+const {
+    Lambda
+} = require("@aws-sdk/client-lambda");
+
+const {
+    SQS
+} = require("@aws-sdk/client-sqs");
 
 module.exports = function addSQSEventSource(options, logger) {
 	'use strict';
@@ -13,9 +21,15 @@ module.exports = function addSQSEventSource(options, logger) {
 	const awsDelay = Number(options['aws-delay']) || 5000,
 		awsRetries = Number(options['aws-retries']) || 15,
 		initServices = function () {
-			lambda = new aws.Lambda({region: lambdaConfig.region});
-			iam = new aws.IAM({region: lambdaConfig.region});
-			sqs = new aws.SQS({region: lambdaConfig.region});
+			lambda = new Lambda({
+                region: lambdaConfig.region
+            });
+			iam = new IAM({
+                region: lambdaConfig.region
+            });
+			sqs = new SQS({
+                region: lambdaConfig.region
+            });
 		},
 		getLambda = () => lambda.getFunctionConfiguration({FunctionName: lambdaConfig.name, Qualifier: options.version}).promise(),
 		readConfig = function () {
diff --git a/src/commands/allow-alexa-skill-trigger.js b/src/commands/allow-alexa-skill-trigger.js
index 30271f19..46a4a4f3 100644
--- a/src/commands/allow-alexa-skill-trigger.js
+++ b/src/commands/allow-alexa-skill-trigger.js
@@ -1,12 +1,17 @@
-const loadConfig = require('../util/loadconfig'),
-	aws = require('aws-sdk');
+const loadConfig = require('../util/loadconfig');
+
+const {
+    Lambda
+} = require("@aws-sdk/client-lambda");
 
 module.exports = function allowAlexaSkillTrigger(options) {
 	'use strict';
 	let lambdaConfig,
 		lambda;
 	const initServices = function () {
-			lambda = new aws.Lambda({region: lambdaConfig.region});
+			lambda = new Lambda({
+                region: lambdaConfig.region
+            });
 		},
 		getLambda = () => lambda.getFunctionConfiguration({FunctionName: lambdaConfig.name, Qualifier: options.version}).promise(),
 		readConfig = function () {
diff --git a/src/commands/create.js b/src/commands/create.js
index 100a8229..3184c1d1 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -31,6 +31,23 @@ const path = require('path'),
 	lambdaInvocationPolicy = require('../policies/lambda-invocation-policy'),
 	waitUntilNotPending = require('../tasks/wait-until-not-pending'),
 	NullLogger = require('../util/null-logger');
+
+const {
+    APIGateway
+} = require("@aws-sdk/client-api-gateway");
+
+const {
+    IAM
+} = require("@aws-sdk/client-iam");
+
+const {
+    Lambda
+} = require("@aws-sdk/client-lambda");
+
+const {
+    S3
+} = require("@aws-sdk/client-s3");
+
 module.exports = function create(options, optionalLogger) {
 	'use strict';
 	let roleMetadata,
@@ -48,9 +65,19 @@ module.exports = function create(options, optionalLogger) {
 		awsRetries = options && options['aws-retries'] && parseInt(options['aws-retries'], 10) || 15,
 		source = (options && options.source) || process.cwd(),
 		configFile = (options && options.config) || path.join(source, 'claudia.json'),
-		iam = loggingWrap(new aws.IAM({region: options.region}), {log: logger.logApiCall, logName: 'iam'}),
-		lambda = loggingWrap(new aws.Lambda({region: options.region}), {log: logger.logApiCall, logName: 'lambda'}),
-		s3 = loggingWrap(new aws.S3({region: options.region, signatureVersion: 'v4'}), {log: logger.logApiCall, logName: 's3'}),
+		iam = loggingWrap(new IAM({
+            region: options.region
+        }), {log: logger.logApiCall, logName: 'iam'}),
+		lambda = loggingWrap(new Lambda({
+            region: options.region
+        }), {log: logger.logApiCall, logName: 'lambda'}),
+		s3 = loggingWrap(new S3({
+            region: options.region,
+
+            // The key signatureVersion is no longer supported in v3, and can be removed.
+            // @deprecated SDK v3 only supports signature v4.
+            signatureVersion: 'v4'
+        }), {log: logger.logApiCall, logName: 's3'}),
 		getSnsDLQTopic = function () {
 			const topicNameOrArn = options['dlq-sns'];
 			if (!topicNameOrArn) {
@@ -62,7 +89,9 @@ module.exports = function create(options, optionalLogger) {
 			return `arn:${awsPartition}:sns:${options.region}:${ownerAccount}:${topicNameOrArn}`;
 		},
 		apiGatewayPromise = retriableWrap(
-			loggingWrap(new aws.APIGateway({region: options.region}), {log: logger.logApiCall, logName: 'apigateway'}),
+			loggingWrap(new APIGateway({
+                region: options.region
+            }), {log: logger.logApiCall, logName: 'apigateway'}),
 			() => logger.logStage('rate-limited by AWS, waiting before retry')
 		),
 		policyFiles = function () {
diff --git a/src/commands/destroy.js b/src/commands/destroy.js
index 4a7cc1b1..de23371d 100644
--- a/src/commands/destroy.js
+++ b/src/commands/destroy.js
@@ -1,9 +1,17 @@
-const aws = require('aws-sdk'),
-	loadConfig = require('../util/loadconfig'),
-	fsPromise = require('../util/fs-promise'),
-	path = require('path'),
-	retriableWrap = require('../util/retriable-wrap'),
-	destroyRole = require('../util/destroy-role');
+const loadConfig = require('../util/loadconfig'), fsPromise = require('../util/fs-promise'), path = require('path'), retriableWrap = require('../util/retriable-wrap'), destroyRole = require('../util/destroy-role');
+
+const {
+    APIGateway
+} = require("@aws-sdk/client-api-gateway");
+
+const {
+    IAM
+} = require("@aws-sdk/client-iam");
+
+const {
+    Lambda
+} = require("@aws-sdk/client-lambda");
+
 module.exports = function destroy(options) {
 	'use strict';
 	let lambdaConfig, apiConfig;
@@ -14,11 +22,15 @@ module.exports = function destroy(options) {
 			apiConfig = config.api;
 		})
 		.then(() => {
-			const lambda = new aws.Lambda({ region: lambdaConfig.region });
-			return lambda.deleteFunction({ FunctionName: lambdaConfig.name }).promise();
+			const lambda = new Lambda({
+                region: lambdaConfig.region
+            });
+			return lambda.deleteFunction({ FunctionName: lambdaConfig.name });
 		})
 		.then(() => {
-			const apiGateway = retriableWrap(new aws.APIGateway({ region: lambdaConfig.region }));
+			const apiGateway = retriableWrap(new APIGateway({
+                region: lambdaConfig.region
+            }));
 			if (apiConfig) {
 				return apiGateway.deleteRestApiPromise({
 					restApiId: apiConfig.id
@@ -26,7 +38,9 @@ module.exports = function destroy(options) {
 			}
 		})
 		.then(() => {
-			const iam = new aws.IAM({ region: lambdaConfig.region });
+			const iam = new IAM({
+                region: lambdaConfig.region
+            });
 			if (lambdaConfig.role && !lambdaConfig.sharedRole) {
 				return destroyRole(iam, lambdaConfig.role);
 			}
diff --git a/src/commands/list.js b/src/commands/list.js
index 6354eb4f..9cec65c2 100644
--- a/src/commands/list.js
+++ b/src/commands/list.js
@@ -1,6 +1,9 @@
-const aws = require('aws-sdk'),
-	loadConfig = require('../util/loadconfig'),
-	listVersions = require('../tasks/list-versions');
+const loadConfig = require('../util/loadconfig'), listVersions = require('../tasks/list-versions');
+
+const {
+    Lambda
+} = require("@aws-sdk/client-lambda");
+
 module.exports = async function list(options /*, optionalLogger*/) {
 	'use strict';
 	const header = ['#\ttime                        \tsize\truntime\taliases'],
@@ -21,7 +24,9 @@ module.exports = async function list(options /*, optionalLogger*/) {
 			);
 		},
 		config = await loadConfig(options, {lambda: {name: true, region: true}}),
-		lambda = new aws.Lambda({region: config.lambda.region}),
+		lambda = new Lambda({
+            region: config.lambda.region
+        }),
 		versionList = await listVersions(config.lambda.name, lambda, options.version);
 
 	if (!formatter) {
diff --git a/src/commands/set-cloudfront-trigger.js b/src/commands/set-cloudfront-trigger.js
index 4f2faeb8..08f1c528 100644
--- a/src/commands/set-cloudfront-trigger.js
+++ b/src/commands/set-cloudfront-trigger.js
@@ -1,11 +1,16 @@
-const loadConfig = require('../util/loadconfig'),
-	NullLogger = require('../util/null-logger'),
-	loggingWrap = require('../util/logging-wrap'),
-	appendServiceToRole = require('../tasks/append-service-to-role'),
-	retry = require('oh-no-i-insist'),
-	findCloudfrontBehavior = require('../tasks/find-cloudfront-behavior'),
-	patchLambdaFunctionAssociations = require('../tasks/patch-lambda-function-associations'),
-	aws = require('aws-sdk');
+const loadConfig = require('../util/loadconfig'), NullLogger = require('../util/null-logger'), loggingWrap = require('../util/logging-wrap'), appendServiceToRole = require('../tasks/append-service-to-role'), retry = require('oh-no-i-insist'), findCloudfrontBehavior = require('../tasks/find-cloudfront-behavior'), patchLambdaFunctionAssociations = require('../tasks/patch-lambda-function-associations');
+
+const {
+    CloudFront
+} = require("@aws-sdk/client-cloudfront");
+
+const {
+    IAM
+} = require("@aws-sdk/client-iam");
+
+const {
+    Lambda
+} = require("@aws-sdk/client-lambda");
 
 module.exports = function setCloudFrontTrigger(options, optionalLogger) {
 	'use strict';
@@ -30,9 +35,15 @@ to propagate changes to Lambda@Edge.
 			console.log(`\x1b[3${color}m${text}\x1b[0m`);
 		},
 		initServices = function (config) {
-			lambda = loggingWrap(new aws.Lambda({region: config.region}), {log: logger.logApiCall, logName: 'lambda'});
-			iam = loggingWrap(new aws.IAM({region: config.region}), {log: logger.logApiCall, logName: 'iam'});
-			cloudFront = loggingWrap(new aws.CloudFront({region: config.region}), {log: logger.logApiCall, logName: 'cloudfront'});
+			lambda = loggingWrap(new Lambda({
+                region: config.region
+            }), {log: logger.logApiCall, logName: 'lambda'});
+			iam = loggingWrap(new IAM({
+                region: config.region
+            }), {log: logger.logApiCall, logName: 'iam'});
+			cloudFront = loggingWrap(new CloudFront({
+                region: config.region
+            }), {log: logger.logApiCall, logName: 'cloudfront'});
 		},
 		readConfig = function () {
 			const version = String(options.version);
diff --git a/src/commands/set-version.js b/src/commands/set-version.js
index 98b11c9b..5f1ddca8 100644
--- a/src/commands/set-version.js
+++ b/src/commands/set-version.js
@@ -1,14 +1,13 @@
-const aws = require('aws-sdk'),
-	loadConfig = require('../util/loadconfig'),
-	allowApiInvocation = require('../tasks/allow-api-invocation'),
-	retriableWrap = require('../util/retriable-wrap'),
-	loggingWrap = require('../util/logging-wrap'),
-	readEnvVarsFromOptions = require('../util/read-env-vars-from-options'),
-	updateEnvVars = require('../tasks/update-env-vars'),
-	apiGWUrl = require('../util/apigw-url'),
-	NullLogger = require('../util/null-logger'),
-	markAlias = require('../tasks/mark-alias'),
-	getOwnerInfo = require('../tasks/get-owner-info');
+const loadConfig = require('../util/loadconfig'), allowApiInvocation = require('../tasks/allow-api-invocation'), retriableWrap = require('../util/retriable-wrap'), loggingWrap = require('../util/logging-wrap'), readEnvVarsFromOptions = require('../util/read-env-vars-from-options'), updateEnvVars = require('../tasks/update-env-vars'), apiGWUrl = require('../util/apigw-url'), NullLogger = require('../util/null-logger'), markAlias = require('../tasks/mark-alias'), getOwnerInfo = require('../tasks/get-owner-info');
+
+const {
+    APIGateway
+} = require("@aws-sdk/client-api-gateway");
+
+const {
+    Lambda
+} = require("@aws-sdk/client-lambda");
+
 module.exports = function setVersion(options, optionalLogger) {
 	'use strict';
 	let lambdaConfig, lambda, apiGateway, apiConfig;
@@ -45,10 +44,14 @@ module.exports = function setVersion(options, optionalLogger) {
 	.then(config => {
 		lambdaConfig = config.lambda;
 		apiConfig = config.api;
-		lambda = loggingWrap(new aws.Lambda({region: lambdaConfig.region}), {log: logger.logApiCall, logName: 'lambda'});
+		lambda = loggingWrap(new Lambda({
+            region: lambdaConfig.region
+        }), {log: logger.logApiCall, logName: 'lambda'});
 		apiGateway = retriableWrap(
 			loggingWrap(
-				new aws.APIGateway({region: lambdaConfig.region}),
+				new APIGateway({
+                    region: lambdaConfig.region
+                }),
 				{log: logger.logApiCall, logName: 'apigateway'}
 			),
 			() => logger.logStage('rate-limited by AWS, waiting before retry')
diff --git a/src/commands/tag.js b/src/commands/tag.js
index 8afbcd0e..51d00567 100644
--- a/src/commands/tag.js
+++ b/src/commands/tag.js
@@ -1,7 +1,12 @@
-const loadConfig = require('../util/loadconfig'),
-	parseKeyValueCSV = require('../util/parse-key-value-csv'),
-	getOwnerInfo = require('../tasks/get-owner-info'),
-	aws = require('aws-sdk');
+const loadConfig = require('../util/loadconfig'), parseKeyValueCSV = require('../util/parse-key-value-csv'), getOwnerInfo = require('../tasks/get-owner-info');
+
+const {
+    APIGateway
+} = require("@aws-sdk/client-api-gateway");
+
+const {
+    Lambda
+} = require("@aws-sdk/client-lambda");
 
 module.exports = function tag(options) {
 	'use strict';
@@ -12,8 +17,12 @@ module.exports = function tag(options) {
 		region,
 		api;
 	const initServices = function () {
-			lambda = new aws.Lambda({region: lambdaConfig.region});
-			api = new aws.APIGateway({region: lambdaConfig.region});
+			lambda = new Lambda({
+                region: lambdaConfig.region
+            });
+			api = new APIGateway({
+                region: lambdaConfig.region
+            });
 		},
 		getLambda = () => lambda.getFunctionConfiguration({FunctionName: lambdaConfig.name, Qualifier: options.version}).promise(),
 		readConfig = function () {
diff --git a/src/commands/test-lambda.js b/src/commands/test-lambda.js
index 3f9f0ee7..0962554d 100644
--- a/src/commands/test-lambda.js
+++ b/src/commands/test-lambda.js
@@ -1,6 +1,9 @@
-const aws = require('aws-sdk'),
-	loadConfig = require('../util/loadconfig'),
-	fsPromise = require('../util/fs-promise');
+const loadConfig = require('../util/loadconfig'), fsPromise = require('../util/fs-promise');
+
+const {
+    Lambda
+} = require("@aws-sdk/client-lambda");
+
 module.exports = function testLambda(options) {
 	'use strict';
 	let lambdaConfig;
@@ -18,8 +21,12 @@ module.exports = function testLambda(options) {
 	})
 	.then(getPayload)
 	.then(payload => {
-		const lambda = new aws.Lambda({region: lambdaConfig.region});
-		return lambda.invoke({FunctionName: lambdaConfig.name, Payload: payload, Qualifier: options.version}).promise();
+		const lambda = new Lambda({
+            region: lambdaConfig.region
+        });
+		return lambda.invoke(
+            {FunctionName: lambdaConfig.name, Payload: payload, Qualifier: options.version}
+        );
 	});
 };
 module.exports.doc = {
diff --git a/src/commands/update.js b/src/commands/update.js
index 1dd3b209..dd774b98 100644
--- a/src/commands/update.js
+++ b/src/commands/update.js
@@ -26,6 +26,23 @@ const zipdir = require('../tasks/zipdir'),
 	retry = require('oh-no-i-insist'),
 	waitUntilNotPending = require('../tasks/wait-until-not-pending'),
 	combineLists = require('../util/combine-lists');
+
+const {
+    APIGateway
+} = require("@aws-sdk/client-api-gateway");
+
+const {
+    IAM
+} = require("@aws-sdk/client-iam");
+
+const {
+    Lambda
+} = require("@aws-sdk/client-lambda");
+
+const {
+    S3
+} = require("@aws-sdk/client-s3");
+
 module.exports = function update(options, optionalLogger) {
 	'use strict';
 	let lambda, s3, iam, apiGateway, lambdaConfig, apiConfig, updateResult,
@@ -216,12 +233,24 @@ module.exports = function update(options, optionalLogger) {
 	.then(config => {
 		lambdaConfig = config.lambda;
 		apiConfig = config.api;
-		lambda = loggingWrap(new aws.Lambda({region: lambdaConfig.region}), {log: logger.logApiCall, logName: 'lambda'});
-		s3 = loggingWrap(new aws.S3({region: lambdaConfig.region, signatureVersion: 'v4'}), {log: logger.logApiCall, logName: 's3'});
-		iam = loggingWrap(new aws.IAM({region: lambdaConfig.region}), {log: logger.logApiCall, logName: 'iam'});
+		lambda = loggingWrap(new Lambda({
+            region: lambdaConfig.region
+        }), {log: logger.logApiCall, logName: 'lambda'});
+		s3 = loggingWrap(new S3({
+            region: lambdaConfig.region,
+
+            // The key signatureVersion is no longer supported in v3, and can be removed.
+            // @deprecated SDK v3 only supports signature v4.
+            signatureVersion: 'v4'
+        }), {log: logger.logApiCall, logName: 's3'});
+		iam = loggingWrap(new IAM({
+            region: lambdaConfig.region
+        }), {log: logger.logApiCall, logName: 'iam'});
 		apiGateway = retriableWrap(
 			loggingWrap(
-				new aws.APIGateway({region: lambdaConfig.region}),
+				new APIGateway({
+                    region: lambdaConfig.region
+                }),
 				{log: logger.logApiCall, logName: 'apigateway'}
 			),
 			() => logger.logStage('rate-limited by AWS, waiting before retry')
diff --git a/src/tasks/allow-api-invocation.js b/src/tasks/allow-api-invocation.js
index 94563631..9302c0b3 100644
--- a/src/tasks/allow-api-invocation.js
+++ b/src/tasks/allow-api-invocation.js
@@ -1,7 +1,11 @@
-const aws = require('aws-sdk');
+const {
+    Lambda
+} = require("@aws-sdk/client-lambda");
 module.exports = function allowApiInvocation(functionName, functionVersion, restApiId, ownerId, awsPartition, awsRegion, path) {
 	'use strict';
-	const lambda = new aws.Lambda({region: awsRegion}),
+	const lambda = new Lambda({
+        region: awsRegion
+    }),
 		activePath = path || '*/*/*',
 		policy = {
 			Action: 'lambda:InvokeFunction',
@@ -21,16 +25,16 @@ module.exports = function allowApiInvocation(functionName, functionVersion, rest
 	return lambda.getPolicy({
 		FunctionName: functionName,
 		Qualifier: functionVersion
-	}).promise()
+	})
 	.then(policyResponse => policyResponse && policyResponse.Policy && JSON.parse(policyResponse.Policy))
 	.then(currentPolicy => {
 		const statements = (currentPolicy && currentPolicy.Statement) || [];
 		if (!statements.find(matchesPolicy)) {
-			return lambda.addPermission(policy).promise();
+			return lambda.addPermission(policy);
 		}
 	}, e => {
 		if (e && e.code === 'ResourceNotFoundException') {
-			return lambda.addPermission(policy).promise();
+			return lambda.addPermission(policy);
 		} else {
 			return Promise.reject(e);
 		}
diff --git a/src/tasks/get-owner-info.js b/src/tasks/get-owner-info.js
index 6f485cdf..14660bac 100644
--- a/src/tasks/get-owner-info.js
+++ b/src/tasks/get-owner-info.js
@@ -1,10 +1,15 @@
-const loggingWrap = require('../util/logging-wrap'),
-	NullLogger = require('../util/null-logger'),
-	aws = require('aws-sdk');
+const loggingWrap = require('../util/logging-wrap'), NullLogger = require('../util/null-logger');
+
+const {
+    STS
+} = require("@aws-sdk/client-sts");
+
 module.exports = function getOwnerInfo(region, optionalLogger) {
 	'use strict';
 	const logger = optionalLogger || new NullLogger(),
-		sts = loggingWrap(new aws.STS({region: region}), {log: logger.logApiCall, logName: 'sts'});
+		sts = loggingWrap(new STS({
+            region: region
+        }), {log: logger.logApiCall, logName: 'sts'});
 	return sts.getCallerIdentity().promise()
 	.then(callerIdentity => ({
 		account: callerIdentity.Account,
diff --git a/src/tasks/list-versions.js b/src/tasks/list-versions.js
index 38e9c48e..e7f4de4c 100644
--- a/src/tasks/list-versions.js
+++ b/src/tasks/list-versions.js
@@ -14,7 +14,7 @@ module.exports = async function listVersions(lambdaName, lambda, filter) {
 			const results = await lambda.listVersionsByFunction({FunctionName: lambdaName, Marker: marker}).promise(),
 				versions = results.Versions,
 				next = results.NextMarker,
-				remainingVersions = next && await listVersionsFromMarker(next);
+				remainingVersions = next && (await listVersionsFromMarker(next));
 
 			if (!remainingVersions) {
 				return versions;
diff --git a/src/tasks/rebuild-web-api.js b/src/tasks/rebuild-web-api.js
index ca0478cd..12f7629e 100644
--- a/src/tasks/rebuild-web-api.js
+++ b/src/tasks/rebuild-web-api.js
@@ -1,24 +1,18 @@
-const aws = require('aws-sdk'),
-	validAuthType = require('../util/valid-auth-type'),
-	sequentialPromiseMap = require('sequential-promise-map'),
-	validCredentials = require('../util/valid-credentials'),
-	allowApiInvocation = require('./allow-api-invocation'),
-	pathSplitter = require('../util/path-splitter'),
-	loggingWrap = require('../util/logging-wrap'),
-	retriableWrap = require('../util/retriable-wrap'),
-	NullLogger = require('../util/null-logger'),
-	safeHash = require('../util/safe-hash'),
-	flattenRequestParameters = require('./flatten-request-parameters'),
-	patchBinaryTypes = require('./patch-binary-types'),
-	clearApi = require('./clear-api'),
-	registerAuthorizers = require('./register-authorizers');
+const validAuthType = require('../util/valid-auth-type'), sequentialPromiseMap = require('sequential-promise-map'), validCredentials = require('../util/valid-credentials'), allowApiInvocation = require('./allow-api-invocation'), pathSplitter = require('../util/path-splitter'), loggingWrap = require('../util/logging-wrap'), retriableWrap = require('../util/retriable-wrap'), NullLogger = require('../util/null-logger'), safeHash = require('../util/safe-hash'), flattenRequestParameters = require('./flatten-request-parameters'), patchBinaryTypes = require('./patch-binary-types'), clearApi = require('./clear-api'), registerAuthorizers = require('./register-authorizers');
+
+const {
+    APIGateway
+} = require("@aws-sdk/client-api-gateway");
+
 module.exports = function rebuildWebApi(functionName, functionVersion, restApiId, apiConfig, ownerAccount, awsPartition, awsRegion, optionalLogger, configCacheStageVar) {
 	'use strict';
 	let authorizerIds;
 	const logger = optionalLogger || new NullLogger(),
 		apiGateway = retriableWrap(
 			loggingWrap(
-				new aws.APIGateway({region: awsRegion}),
+				new APIGateway({
+                    region: awsRegion
+                }),
 				{log: logger.logApiCall, logName: 'apigateway'}
 			),
 			() => logger.logApiCall('rate-limited by AWS, waiting before retry')
diff --git a/src/tasks/register-authorizers.js b/src/tasks/register-authorizers.js
index 62a7929b..42c3a144 100644
--- a/src/tasks/register-authorizers.js
+++ b/src/tasks/register-authorizers.js
@@ -1,20 +1,28 @@
-const aws = require('aws-sdk'),
-	loggingWrap = require('../util/logging-wrap'),
-	retriableWrap = require('../util/retriable-wrap'),
-	allowApiInvocation = require('./allow-api-invocation'),
-	NullLogger = require('../util/null-logger'),
-	sequentialPromiseMap = require('sequential-promise-map');
+const loggingWrap = require('../util/logging-wrap'), retriableWrap = require('../util/retriable-wrap'), allowApiInvocation = require('./allow-api-invocation'), NullLogger = require('../util/null-logger'), sequentialPromiseMap = require('sequential-promise-map');
+
+const {
+    APIGateway
+} = require("@aws-sdk/client-api-gateway");
+
+const {
+    Lambda
+} = require("@aws-sdk/client-lambda");
+
 module.exports = function registerAuthorizers(authorizerMap, apiId, ownerAccount, awsPartition, awsRegion, functionVersion, optionalLogger) {
 	'use strict';
 	const logger = optionalLogger || new NullLogger(),
 		apiGateway = retriableWrap(
 			loggingWrap(
-				new aws.APIGateway({region: awsRegion}),
+				new APIGateway({
+                    region: awsRegion
+                }),
 				{log: logger.logApiCall, logName: 'apigateway'}
 			),
 			() => logger.logApiCall('rate-limited by AWS, waiting before retry')
 		),
-		lambda = loggingWrap(new aws.Lambda({region: awsRegion}), {log: logger.logApiCall, logName: 'lambda'}),
+		lambda = loggingWrap(new Lambda({
+            region: awsRegion
+        }), {log: logger.logApiCall, logName: 'lambda'}),
 		removeAuthorizer = function (authConfig) {
 			return apiGateway.deleteAuthorizerPromise({
 				authorizerId: authConfig.id,

From 41254541198573f85e6cb08ea7d66af651e6c7de Mon Sep 17 00:00:00 2001
From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com>
Date: Thu, 2 Nov 2023 13:25:03 -0700
Subject: [PATCH 2/9] chore: format variable declarators as per previous code

---
 src/commands/add-cognito-user-pool-trigger.js |  4 +++-
 src/commands/add-iot-topic-rule.js            |  3 ++-
 src/commands/add-kinesis-event-source.js      |  5 ++++-
 src/commands/add-s3-event-source.js           |  3 ++-
 src/commands/add-scheduled-event.js           |  3 ++-
 src/commands/add-sns-event-source.js          |  3 ++-
 src/commands/add-sqs-event-source.js          |  5 ++++-
 src/commands/destroy.js                       |  6 +++++-
 src/commands/list.js                          |  3 ++-
 src/commands/set-cloudfront-trigger.js        |  8 +++++++-
 src/commands/set-version.js                   | 11 ++++++++++-
 src/commands/tag.js                           |  4 +++-
 src/commands/test-lambda.js                   |  3 ++-
 src/tasks/get-owner-info.js                   |  3 ++-
 src/tasks/rebuild-web-api.js                  | 14 +++++++++++++-
 src/tasks/register-authorizers.js             |  6 +++++-
 16 files changed, 68 insertions(+), 16 deletions(-)

diff --git a/src/commands/add-cognito-user-pool-trigger.js b/src/commands/add-cognito-user-pool-trigger.js
index 7fdbcb9a..7b9a22eb 100644
--- a/src/commands/add-cognito-user-pool-trigger.js
+++ b/src/commands/add-cognito-user-pool-trigger.js
@@ -1,4 +1,6 @@
-const loadConfig = require('../util/loadconfig'), iamNameSanitize = require('../util/iam-name-sanitize'), getOwnerInfo = require('../tasks/get-owner-info');
+const loadConfig = require('../util/loadconfig'),
+	iamNameSanitize = require('../util/iam-name-sanitize'),
+	getOwnerInfo = require('../tasks/get-owner-info');
 
 const {
     CognitoIdentityProvider
diff --git a/src/commands/add-iot-topic-rule.js b/src/commands/add-iot-topic-rule.js
index 0de0ecd1..855fa06c 100644
--- a/src/commands/add-iot-topic-rule.js
+++ b/src/commands/add-iot-topic-rule.js
@@ -1,4 +1,5 @@
-const loadConfig = require('../util/loadconfig'), iamNameSanitize = require('../util/iam-name-sanitize');
+const loadConfig = require('../util/loadconfig'),
+	iamNameSanitize = require('../util/iam-name-sanitize');
 
 const {
     IoT
diff --git a/src/commands/add-kinesis-event-source.js b/src/commands/add-kinesis-event-source.js
index 547e1111..aea49fa2 100644
--- a/src/commands/add-kinesis-event-source.js
+++ b/src/commands/add-kinesis-event-source.js
@@ -1,4 +1,7 @@
-const loadConfig = require('../util/loadconfig'), isRoleArn = require('../util/is-role-arn'), isKinesisArn = require('../util/is-kinesis-arn'), retry = require('oh-no-i-insist');
+const loadConfig = require('../util/loadconfig'),
+	isRoleArn = require('../util/is-role-arn'),
+	isKinesisArn = require('../util/is-kinesis-arn'),
+	retry = require('oh-no-i-insist');
 
 const {
     IAM
diff --git a/src/commands/add-s3-event-source.js b/src/commands/add-s3-event-source.js
index 6427cc44..64161d95 100644
--- a/src/commands/add-s3-event-source.js
+++ b/src/commands/add-s3-event-source.js
@@ -1,4 +1,5 @@
-const loadConfig = require('../util/loadconfig'), iamNameSanitize = require('../util/iam-name-sanitize');
+const loadConfig = require('../util/loadconfig'),
+	iamNameSanitize = require('../util/iam-name-sanitize');
 
 const {
     IAM
diff --git a/src/commands/add-scheduled-event.js b/src/commands/add-scheduled-event.js
index 14b9e56e..6b247809 100644
--- a/src/commands/add-scheduled-event.js
+++ b/src/commands/add-scheduled-event.js
@@ -1,4 +1,5 @@
-const loadConfig = require('../util/loadconfig'), fsPromise = require('../util/fs-promise');
+const loadConfig = require('../util/loadconfig'),
+	fsPromise = require('../util/fs-promise');
 
 const {
     CloudWatchEvents
diff --git a/src/commands/add-sns-event-source.js b/src/commands/add-sns-event-source.js
index cde2bfd6..bf3cc611 100644
--- a/src/commands/add-sns-event-source.js
+++ b/src/commands/add-sns-event-source.js
@@ -1,4 +1,5 @@
-const loadConfig = require('../util/loadconfig'), fsPromise = require('../util/fs-promise');
+const loadConfig = require('../util/loadconfig'),
+	fsPromise = require('../util/fs-promise');
 
 const {
     Lambda
diff --git a/src/commands/add-sqs-event-source.js b/src/commands/add-sqs-event-source.js
index 09525239..568490b9 100644
--- a/src/commands/add-sqs-event-source.js
+++ b/src/commands/add-sqs-event-source.js
@@ -1,4 +1,7 @@
-const loadConfig = require('../util/loadconfig'), isSQSArn = require('../util/is-sqs-arn'), iamNameSanitize = require('../util/iam-name-sanitize'), retry = require('oh-no-i-insist');
+const loadConfig = require('../util/loadconfig'),
+	isSQSArn = require('../util/is-sqs-arn'),
+	iamNameSanitize = require('../util/iam-name-sanitize'),
+	retry = require('oh-no-i-insist');
 
 const {
     IAM
diff --git a/src/commands/destroy.js b/src/commands/destroy.js
index de23371d..7e32492b 100644
--- a/src/commands/destroy.js
+++ b/src/commands/destroy.js
@@ -1,4 +1,8 @@
-const loadConfig = require('../util/loadconfig'), fsPromise = require('../util/fs-promise'), path = require('path'), retriableWrap = require('../util/retriable-wrap'), destroyRole = require('../util/destroy-role');
+const loadConfig = require('../util/loadconfig'),
+	fsPromise = require('../util/fs-promise'),
+	path = require('path'),
+	retriableWrap = require('../util/retriable-wrap'),
+	destroyRole = require('../util/destroy-role');
 
 const {
     APIGateway
diff --git a/src/commands/list.js b/src/commands/list.js
index 9cec65c2..7dec2e02 100644
--- a/src/commands/list.js
+++ b/src/commands/list.js
@@ -1,4 +1,5 @@
-const loadConfig = require('../util/loadconfig'), listVersions = require('../tasks/list-versions');
+const loadConfig = require('../util/loadconfig'),
+	listVersions = require('../tasks/list-versions');
 
 const {
     Lambda
diff --git a/src/commands/set-cloudfront-trigger.js b/src/commands/set-cloudfront-trigger.js
index 08f1c528..67c8d96e 100644
--- a/src/commands/set-cloudfront-trigger.js
+++ b/src/commands/set-cloudfront-trigger.js
@@ -1,4 +1,10 @@
-const loadConfig = require('../util/loadconfig'), NullLogger = require('../util/null-logger'), loggingWrap = require('../util/logging-wrap'), appendServiceToRole = require('../tasks/append-service-to-role'), retry = require('oh-no-i-insist'), findCloudfrontBehavior = require('../tasks/find-cloudfront-behavior'), patchLambdaFunctionAssociations = require('../tasks/patch-lambda-function-associations');
+const loadConfig = require('../util/loadconfig'),
+	NullLogger = require('../util/null-logger'),
+	loggingWrap = require('../util/logging-wrap'),
+	appendServiceToRole = require('../tasks/append-service-to-role'),
+	retry = require('oh-no-i-insist'),
+	findCloudfrontBehavior = require('../tasks/find-cloudfront-behavior'),
+	patchLambdaFunctionAssociations = require('../tasks/patch-lambda-function-associations');
 
 const {
     CloudFront
diff --git a/src/commands/set-version.js b/src/commands/set-version.js
index 5f1ddca8..aa767483 100644
--- a/src/commands/set-version.js
+++ b/src/commands/set-version.js
@@ -1,4 +1,13 @@
-const loadConfig = require('../util/loadconfig'), allowApiInvocation = require('../tasks/allow-api-invocation'), retriableWrap = require('../util/retriable-wrap'), loggingWrap = require('../util/logging-wrap'), readEnvVarsFromOptions = require('../util/read-env-vars-from-options'), updateEnvVars = require('../tasks/update-env-vars'), apiGWUrl = require('../util/apigw-url'), NullLogger = require('../util/null-logger'), markAlias = require('../tasks/mark-alias'), getOwnerInfo = require('../tasks/get-owner-info');
+const loadConfig = require('../util/loadconfig'),
+	allowApiInvocation = require('../tasks/allow-api-invocation'),
+	retriableWrap = require('../util/retriable-wrap'),
+	loggingWrap = require('../util/logging-wrap'),
+	readEnvVarsFromOptions = require('../util/read-env-vars-from-options'),
+	updateEnvVars = require('../tasks/update-env-vars'),
+	apiGWUrl = require('../util/apigw-url'),
+	NullLogger = require('../util/null-logger'),
+	markAlias = require('../tasks/mark-alias'),
+	getOwnerInfo = require('../tasks/get-owner-info');
 
 const {
     APIGateway
diff --git a/src/commands/tag.js b/src/commands/tag.js
index 51d00567..c2a2519d 100644
--- a/src/commands/tag.js
+++ b/src/commands/tag.js
@@ -1,4 +1,6 @@
-const loadConfig = require('../util/loadconfig'), parseKeyValueCSV = require('../util/parse-key-value-csv'), getOwnerInfo = require('../tasks/get-owner-info');
+const loadConfig = require('../util/loadconfig'),
+	parseKeyValueCSV = require('../util/parse-key-value-csv'),
+	getOwnerInfo = require('../tasks/get-owner-info');
 
 const {
     APIGateway
diff --git a/src/commands/test-lambda.js b/src/commands/test-lambda.js
index 0962554d..d0e48ff7 100644
--- a/src/commands/test-lambda.js
+++ b/src/commands/test-lambda.js
@@ -1,4 +1,5 @@
-const loadConfig = require('../util/loadconfig'), fsPromise = require('../util/fs-promise');
+const loadConfig = require('../util/loadconfig'),
+	fsPromise = require('../util/fs-promise');
 
 const {
     Lambda
diff --git a/src/tasks/get-owner-info.js b/src/tasks/get-owner-info.js
index 14660bac..afeb4cf7 100644
--- a/src/tasks/get-owner-info.js
+++ b/src/tasks/get-owner-info.js
@@ -1,4 +1,5 @@
-const loggingWrap = require('../util/logging-wrap'), NullLogger = require('../util/null-logger');
+const loggingWrap = require('../util/logging-wrap'),
+	NullLogger = require('../util/null-logger');
 
 const {
     STS
diff --git a/src/tasks/rebuild-web-api.js b/src/tasks/rebuild-web-api.js
index 12f7629e..69a09deb 100644
--- a/src/tasks/rebuild-web-api.js
+++ b/src/tasks/rebuild-web-api.js
@@ -1,4 +1,16 @@
-const validAuthType = require('../util/valid-auth-type'), sequentialPromiseMap = require('sequential-promise-map'), validCredentials = require('../util/valid-credentials'), allowApiInvocation = require('./allow-api-invocation'), pathSplitter = require('../util/path-splitter'), loggingWrap = require('../util/logging-wrap'), retriableWrap = require('../util/retriable-wrap'), NullLogger = require('../util/null-logger'), safeHash = require('../util/safe-hash'), flattenRequestParameters = require('./flatten-request-parameters'), patchBinaryTypes = require('./patch-binary-types'), clearApi = require('./clear-api'), registerAuthorizers = require('./register-authorizers');
+const validAuthType = require('../util/valid-auth-type'),
+	sequentialPromiseMap = require('sequential-promise-map'),
+	validCredentials = require('../util/valid-credentials'),
+	allowApiInvocation = require('./allow-api-invocation'),
+	pathSplitter = require('../util/path-splitter'),
+	loggingWrap = require('../util/logging-wrap'),
+	retriableWrap = require('../util/retriable-wrap'),
+	NullLogger = require('../util/null-logger'),
+	safeHash = require('../util/safe-hash'),
+	flattenRequestParameters = require('./flatten-request-parameters'),
+	patchBinaryTypes = require('./patch-binary-types'),
+	clearApi = require('./clear-api'),
+	registerAuthorizers = require('./register-authorizers');
 
 const {
     APIGateway
diff --git a/src/tasks/register-authorizers.js b/src/tasks/register-authorizers.js
index 42c3a144..52b89751 100644
--- a/src/tasks/register-authorizers.js
+++ b/src/tasks/register-authorizers.js
@@ -1,4 +1,8 @@
-const loggingWrap = require('../util/logging-wrap'), retriableWrap = require('../util/retriable-wrap'), allowApiInvocation = require('./allow-api-invocation'), NullLogger = require('../util/null-logger'), sequentialPromiseMap = require('sequential-promise-map');
+const loggingWrap = require('../util/logging-wrap'),
+	retriableWrap = require('../util/retriable-wrap'),
+	allowApiInvocation = require('./allow-api-invocation'),
+	NullLogger = require('../util/null-logger'),
+	sequentialPromiseMap = require('sequential-promise-map');
 
 const {
     APIGateway

From 0d1397e4e2af259c890a2048522bbd89c9385553 Mon Sep 17 00:00:00 2001
From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com>
Date: Thu, 2 Nov 2023 13:29:14 -0700
Subject: [PATCH 3/9] chore: re-format Lambda client creation

---
 src/commands/add-cognito-user-pool-trigger.js | 4 +---
 src/commands/add-iot-topic-rule.js            | 4 +---
 src/commands/add-kinesis-event-source.js      | 4 +---
 src/commands/add-s3-event-source.js           | 4 +---
 src/commands/add-scheduled-event.js           | 4 +---
 src/commands/add-sns-event-source.js          | 4 +---
 src/commands/add-sqs-event-source.js          | 4 +---
 src/commands/allow-alexa-skill-trigger.js     | 4 +---
 src/commands/create.js                        | 4 +---
 src/commands/destroy.js                       | 4 +---
 src/commands/list.js                          | 4 +---
 src/commands/set-cloudfront-trigger.js        | 4 +---
 src/commands/set-version.js                   | 4 +---
 src/commands/tag.js                           | 4 +---
 src/commands/test-lambda.js                   | 4 +---
 src/commands/update.js                        | 4 +---
 src/tasks/allow-api-invocation.js             | 4 +---
 src/tasks/register-authorizers.js             | 4 +---
 18 files changed, 18 insertions(+), 54 deletions(-)

diff --git a/src/commands/add-cognito-user-pool-trigger.js b/src/commands/add-cognito-user-pool-trigger.js
index 7b9a22eb..055b4f50 100644
--- a/src/commands/add-cognito-user-pool-trigger.js
+++ b/src/commands/add-cognito-user-pool-trigger.js
@@ -16,9 +16,7 @@ module.exports = function addCognitoUserPoolTrigger(options, optionalLogger) {
 		lambda,
 		cognito;
 	const initServices = function () {
-			lambda = new Lambda({
-                region: lambdaConfig.region
-            });
+			lambda = new Lambda({region: lambdaConfig.region});
 			cognito = new CognitoIdentityProvider({
                 region: lambdaConfig.region
             });
diff --git a/src/commands/add-iot-topic-rule.js b/src/commands/add-iot-topic-rule.js
index 855fa06c..fd629862 100644
--- a/src/commands/add-iot-topic-rule.js
+++ b/src/commands/add-iot-topic-rule.js
@@ -16,9 +16,7 @@ module.exports = function addIOTTopicRuleEventSource(options) {
 		ruleName,
 		iot;
 	const initServices = function () {
-			lambda = new Lambda({
-                region: lambdaConfig.region
-            });
+			lambda = new Lambda({region: lambdaConfig.region});
 			iot = new IoT({
                 region: lambdaConfig.region
             });
diff --git a/src/commands/add-kinesis-event-source.js b/src/commands/add-kinesis-event-source.js
index aea49fa2..b9cfcf70 100644
--- a/src/commands/add-kinesis-event-source.js
+++ b/src/commands/add-kinesis-event-source.js
@@ -24,9 +24,7 @@ module.exports = function addKinesisEventSource(options, logger) {
 	const awsDelay = Number(options['aws-delay']) || 5000,
 		awsRetries = Number(options['aws-retries']) || 15,
 		initServices = function () {
-			lambda = new Lambda({
-                region: lambdaConfig.region
-            });
+			lambda = new Lambda({region: lambdaConfig.region});
 			iam = new IAM({
                 region: lambdaConfig.region
             });
diff --git a/src/commands/add-s3-event-source.js b/src/commands/add-s3-event-source.js
index 64161d95..a4459a40 100644
--- a/src/commands/add-s3-event-source.js
+++ b/src/commands/add-s3-event-source.js
@@ -20,9 +20,7 @@ module.exports = function addS3EventSource(options) {
 		lambda;
 	const ts = Date.now(),
 		getLambda = function (config) {
-			lambda = new Lambda({
-                region: config.lambda.region
-            });
+			lambda = new Lambda({region: config.lambda.region});
 			lambdaConfig = config.lambda;
 			return lambda.getFunctionConfiguration({FunctionName: lambdaConfig.name, Qualifier: options.version}).promise();
 		},
diff --git a/src/commands/add-scheduled-event.js b/src/commands/add-scheduled-event.js
index 6b247809..3438f383 100644
--- a/src/commands/add-scheduled-event.js
+++ b/src/commands/add-scheduled-event.js
@@ -17,9 +17,7 @@ module.exports = function addScheduledEvent(options) {
 		eventData,
 		ruleArn;
 	const initServices = function () {
-			lambda = new Lambda({
-                region: lambdaConfig.region
-            });
+			lambda = new Lambda({region: lambdaConfig.region});
 			events = new CloudWatchEvents({
                 region: lambdaConfig.region
             });
diff --git a/src/commands/add-sns-event-source.js b/src/commands/add-sns-event-source.js
index bf3cc611..9089076b 100644
--- a/src/commands/add-sns-event-source.js
+++ b/src/commands/add-sns-event-source.js
@@ -15,9 +15,7 @@ module.exports = function addSNSEventSource(options) {
 		lambda,
 		sns;
 	const initServices = function () {
-			lambda = new Lambda({
-                region: lambdaConfig.region
-            });
+			lambda = new Lambda({region: lambdaConfig.region});
 			sns = new SNS({
                 region: lambdaConfig.region
             });
diff --git a/src/commands/add-sqs-event-source.js b/src/commands/add-sqs-event-source.js
index 568490b9..403d700e 100644
--- a/src/commands/add-sqs-event-source.js
+++ b/src/commands/add-sqs-event-source.js
@@ -24,9 +24,7 @@ module.exports = function addSQSEventSource(options, logger) {
 	const awsDelay = Number(options['aws-delay']) || 5000,
 		awsRetries = Number(options['aws-retries']) || 15,
 		initServices = function () {
-			lambda = new Lambda({
-                region: lambdaConfig.region
-            });
+			lambda = new Lambda({region: lambdaConfig.region});
 			iam = new IAM({
                 region: lambdaConfig.region
             });
diff --git a/src/commands/allow-alexa-skill-trigger.js b/src/commands/allow-alexa-skill-trigger.js
index 46a4a4f3..ab2ea5e4 100644
--- a/src/commands/allow-alexa-skill-trigger.js
+++ b/src/commands/allow-alexa-skill-trigger.js
@@ -9,9 +9,7 @@ module.exports = function allowAlexaSkillTrigger(options) {
 	let lambdaConfig,
 		lambda;
 	const initServices = function () {
-			lambda = new Lambda({
-                region: lambdaConfig.region
-            });
+			lambda = new Lambda({region: lambdaConfig.region});
 		},
 		getLambda = () => lambda.getFunctionConfiguration({FunctionName: lambdaConfig.name, Qualifier: options.version}).promise(),
 		readConfig = function () {
diff --git a/src/commands/create.js b/src/commands/create.js
index 3184c1d1..3498287d 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -68,9 +68,7 @@ module.exports = function create(options, optionalLogger) {
 		iam = loggingWrap(new IAM({
             region: options.region
         }), {log: logger.logApiCall, logName: 'iam'}),
-		lambda = loggingWrap(new Lambda({
-            region: options.region
-        }), {log: logger.logApiCall, logName: 'lambda'}),
+		lambda = loggingWrap(new Lambda({region: options.region}), {log: logger.logApiCall, logName: 'lambda'}),
 		s3 = loggingWrap(new S3({
             region: options.region,
 
diff --git a/src/commands/destroy.js b/src/commands/destroy.js
index 7e32492b..5acf8a66 100644
--- a/src/commands/destroy.js
+++ b/src/commands/destroy.js
@@ -26,9 +26,7 @@ module.exports = function destroy(options) {
 			apiConfig = config.api;
 		})
 		.then(() => {
-			const lambda = new Lambda({
-                region: lambdaConfig.region
-            });
+			const lambda = new Lambda({region: lambdaConfig.region});
 			return lambda.deleteFunction({ FunctionName: lambdaConfig.name });
 		})
 		.then(() => {
diff --git a/src/commands/list.js b/src/commands/list.js
index 7dec2e02..8f7ecfd9 100644
--- a/src/commands/list.js
+++ b/src/commands/list.js
@@ -25,9 +25,7 @@ module.exports = async function list(options /*, optionalLogger*/) {
 			);
 		},
 		config = await loadConfig(options, {lambda: {name: true, region: true}}),
-		lambda = new Lambda({
-            region: config.lambda.region
-        }),
+		lambda = new Lambda({region: config.lambda.region}),
 		versionList = await listVersions(config.lambda.name, lambda, options.version);
 
 	if (!formatter) {
diff --git a/src/commands/set-cloudfront-trigger.js b/src/commands/set-cloudfront-trigger.js
index 67c8d96e..5e38a0f8 100644
--- a/src/commands/set-cloudfront-trigger.js
+++ b/src/commands/set-cloudfront-trigger.js
@@ -41,9 +41,7 @@ to propagate changes to Lambda@Edge.
 			console.log(`\x1b[3${color}m${text}\x1b[0m`);
 		},
 		initServices = function (config) {
-			lambda = loggingWrap(new Lambda({
-                region: config.region
-            }), {log: logger.logApiCall, logName: 'lambda'});
+			lambda = loggingWrap(new Lambda({region: config.region}), {log: logger.logApiCall, logName: 'lambda'});
 			iam = loggingWrap(new IAM({
                 region: config.region
             }), {log: logger.logApiCall, logName: 'iam'});
diff --git a/src/commands/set-version.js b/src/commands/set-version.js
index aa767483..1bffbb0b 100644
--- a/src/commands/set-version.js
+++ b/src/commands/set-version.js
@@ -53,9 +53,7 @@ module.exports = function setVersion(options, optionalLogger) {
 	.then(config => {
 		lambdaConfig = config.lambda;
 		apiConfig = config.api;
-		lambda = loggingWrap(new Lambda({
-            region: lambdaConfig.region
-        }), {log: logger.logApiCall, logName: 'lambda'});
+		lambda = loggingWrap(new Lambda({region: lambdaConfig.region}), {log: logger.logApiCall, logName: 'lambda'});
 		apiGateway = retriableWrap(
 			loggingWrap(
 				new APIGateway({
diff --git a/src/commands/tag.js b/src/commands/tag.js
index c2a2519d..6aa4eabd 100644
--- a/src/commands/tag.js
+++ b/src/commands/tag.js
@@ -19,9 +19,7 @@ module.exports = function tag(options) {
 		region,
 		api;
 	const initServices = function () {
-			lambda = new Lambda({
-                region: lambdaConfig.region
-            });
+			lambda = new Lambda({region: lambdaConfig.region});
 			api = new APIGateway({
                 region: lambdaConfig.region
             });
diff --git a/src/commands/test-lambda.js b/src/commands/test-lambda.js
index d0e48ff7..132043aa 100644
--- a/src/commands/test-lambda.js
+++ b/src/commands/test-lambda.js
@@ -22,9 +22,7 @@ module.exports = function testLambda(options) {
 	})
 	.then(getPayload)
 	.then(payload => {
-		const lambda = new Lambda({
-            region: lambdaConfig.region
-        });
+		const lambda = new Lambda({region: lambdaConfig.region});
 		return lambda.invoke(
             {FunctionName: lambdaConfig.name, Payload: payload, Qualifier: options.version}
         );
diff --git a/src/commands/update.js b/src/commands/update.js
index dd774b98..2aa82c1a 100644
--- a/src/commands/update.js
+++ b/src/commands/update.js
@@ -233,9 +233,7 @@ module.exports = function update(options, optionalLogger) {
 	.then(config => {
 		lambdaConfig = config.lambda;
 		apiConfig = config.api;
-		lambda = loggingWrap(new Lambda({
-            region: lambdaConfig.region
-        }), {log: logger.logApiCall, logName: 'lambda'});
+		lambda = loggingWrap(new Lambda({region: lambdaConfig.region}), {log: logger.logApiCall, logName: 'lambda'});
 		s3 = loggingWrap(new S3({
             region: lambdaConfig.region,
 
diff --git a/src/tasks/allow-api-invocation.js b/src/tasks/allow-api-invocation.js
index 9302c0b3..a7ae9f7d 100644
--- a/src/tasks/allow-api-invocation.js
+++ b/src/tasks/allow-api-invocation.js
@@ -3,9 +3,7 @@ const {
 } = require("@aws-sdk/client-lambda");
 module.exports = function allowApiInvocation(functionName, functionVersion, restApiId, ownerId, awsPartition, awsRegion, path) {
 	'use strict';
-	const lambda = new Lambda({
-        region: awsRegion
-    }),
+	const lambda = new Lambda({region: awsRegion}),
 		activePath = path || '*/*/*',
 		policy = {
 			Action: 'lambda:InvokeFunction',
diff --git a/src/tasks/register-authorizers.js b/src/tasks/register-authorizers.js
index 52b89751..7ccfc446 100644
--- a/src/tasks/register-authorizers.js
+++ b/src/tasks/register-authorizers.js
@@ -24,9 +24,7 @@ module.exports = function registerAuthorizers(authorizerMap, apiId, ownerAccount
 			),
 			() => logger.logApiCall('rate-limited by AWS, waiting before retry')
 		),
-		lambda = loggingWrap(new Lambda({
-            region: awsRegion
-        }), {log: logger.logApiCall, logName: 'lambda'}),
+		lambda = loggingWrap(new Lambda({region: awsRegion}), {log: logger.logApiCall, logName: 'lambda'}),
 		removeAuthorizer = function (authConfig) {
 			return apiGateway.deleteAuthorizerPromise({
 				authorizerId: authConfig.id,

From 8ae0773ce4a48997b16a2fc40fdf17c5305e6f96 Mon Sep 17 00:00:00 2001
From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com>
Date: Thu, 2 Nov 2023 13:55:10 -0700
Subject: [PATCH 4/9] chore: re-format CognitoIdentityProvider client creation

---
 src/commands/add-cognito-user-pool-trigger.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/commands/add-cognito-user-pool-trigger.js b/src/commands/add-cognito-user-pool-trigger.js
index 055b4f50..2b1489ba 100644
--- a/src/commands/add-cognito-user-pool-trigger.js
+++ b/src/commands/add-cognito-user-pool-trigger.js
@@ -17,9 +17,7 @@ module.exports = function addCognitoUserPoolTrigger(options, optionalLogger) {
 		cognito;
 	const initServices = function () {
 			lambda = new Lambda({region: lambdaConfig.region});
-			cognito = new CognitoIdentityProvider({
-                region: lambdaConfig.region
-            });
+			cognito = new CognitoIdentityProvider({region: lambdaConfig.region});
 		},
 		readConfig = function () {
 			return loadConfig(options, {lambda: {name: true, region: true}})

From b60396a07f3cab8044fff6d31dbc90a2ac15feee Mon Sep 17 00:00:00 2001
From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com>
Date: Thu, 2 Nov 2023 13:55:37 -0700
Subject: [PATCH 5/9] chore: re-format IoT client creation

---
 src/commands/add-iot-topic-rule.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/commands/add-iot-topic-rule.js b/src/commands/add-iot-topic-rule.js
index fd629862..8b8b4a3e 100644
--- a/src/commands/add-iot-topic-rule.js
+++ b/src/commands/add-iot-topic-rule.js
@@ -17,9 +17,7 @@ module.exports = function addIOTTopicRuleEventSource(options) {
 		iot;
 	const initServices = function () {
 			lambda = new Lambda({region: lambdaConfig.region});
-			iot = new IoT({
-                region: lambdaConfig.region
-            });
+			iot = new IoT({region: lambdaConfig.region});
 		},
 		readConfig = function () {
 			return loadConfig(options, {lambda: {name: true, region: true}})

From 20eabe93ff5141ea0a631e05dd9a4ec07f3ea19b Mon Sep 17 00:00:00 2001
From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com>
Date: Thu, 2 Nov 2023 13:56:44 -0700
Subject: [PATCH 6/9] chore: re-format IAM client creation

---
 src/commands/add-kinesis-event-source.js | 4 +---
 src/commands/add-s3-event-source.js      | 4 +---
 src/commands/add-sqs-event-source.js     | 4 +---
 src/commands/create.js                   | 4 +---
 src/commands/destroy.js                  | 4 +---
 src/commands/set-cloudfront-trigger.js   | 4 +---
 src/commands/update.js                   | 4 +---
 7 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/src/commands/add-kinesis-event-source.js b/src/commands/add-kinesis-event-source.js
index b9cfcf70..93bb9b28 100644
--- a/src/commands/add-kinesis-event-source.js
+++ b/src/commands/add-kinesis-event-source.js
@@ -25,9 +25,7 @@ module.exports = function addKinesisEventSource(options, logger) {
 		awsRetries = Number(options['aws-retries']) || 15,
 		initServices = function () {
 			lambda = new Lambda({region: lambdaConfig.region});
-			iam = new IAM({
-                region: lambdaConfig.region
-            });
+			iam = new IAM({region: lambdaConfig.region});
 			kinesis = new Kinesis({
                 region: lambdaConfig.region
             });
diff --git a/src/commands/add-s3-event-source.js b/src/commands/add-s3-event-source.js
index a4459a40..eae05d6c 100644
--- a/src/commands/add-s3-event-source.js
+++ b/src/commands/add-s3-event-source.js
@@ -38,9 +38,7 @@ module.exports = function addS3EventSource(options) {
 				});
 		},
 		addS3AccessPolicy = function () {
-			const iam = new IAM({
-                region: lambdaConfig.region
-            });
+			const iam = new IAM({region: lambdaConfig.region});
 			return iam.putRolePolicy({
 				RoleName: lambdaConfig.role,
 				PolicyName: iamNameSanitize(`s3-${options.bucket}-access-${ts}`),
diff --git a/src/commands/add-sqs-event-source.js b/src/commands/add-sqs-event-source.js
index 403d700e..2a2ca433 100644
--- a/src/commands/add-sqs-event-source.js
+++ b/src/commands/add-sqs-event-source.js
@@ -25,9 +25,7 @@ module.exports = function addSQSEventSource(options, logger) {
 		awsRetries = Number(options['aws-retries']) || 15,
 		initServices = function () {
 			lambda = new Lambda({region: lambdaConfig.region});
-			iam = new IAM({
-                region: lambdaConfig.region
-            });
+			iam = new IAM({region: lambdaConfig.region});
 			sqs = new SQS({
                 region: lambdaConfig.region
             });
diff --git a/src/commands/create.js b/src/commands/create.js
index 3498287d..bc059a11 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -65,9 +65,7 @@ module.exports = function create(options, optionalLogger) {
 		awsRetries = options && options['aws-retries'] && parseInt(options['aws-retries'], 10) || 15,
 		source = (options && options.source) || process.cwd(),
 		configFile = (options && options.config) || path.join(source, 'claudia.json'),
-		iam = loggingWrap(new IAM({
-            region: options.region
-        }), {log: logger.logApiCall, logName: 'iam'}),
+		iam = loggingWrap(new IAM({region: options.region}), {log: logger.logApiCall, logName: 'iam'}),
 		lambda = loggingWrap(new Lambda({region: options.region}), {log: logger.logApiCall, logName: 'lambda'}),
 		s3 = loggingWrap(new S3({
             region: options.region,
diff --git a/src/commands/destroy.js b/src/commands/destroy.js
index 5acf8a66..5c49a045 100644
--- a/src/commands/destroy.js
+++ b/src/commands/destroy.js
@@ -40,9 +40,7 @@ module.exports = function destroy(options) {
 			}
 		})
 		.then(() => {
-			const iam = new IAM({
-                region: lambdaConfig.region
-            });
+			const iam = new IAM({region: lambdaConfig.region});
 			if (lambdaConfig.role && !lambdaConfig.sharedRole) {
 				return destroyRole(iam, lambdaConfig.role);
 			}
diff --git a/src/commands/set-cloudfront-trigger.js b/src/commands/set-cloudfront-trigger.js
index 5e38a0f8..5cfe504e 100644
--- a/src/commands/set-cloudfront-trigger.js
+++ b/src/commands/set-cloudfront-trigger.js
@@ -42,9 +42,7 @@ to propagate changes to Lambda@Edge.
 		},
 		initServices = function (config) {
 			lambda = loggingWrap(new Lambda({region: config.region}), {log: logger.logApiCall, logName: 'lambda'});
-			iam = loggingWrap(new IAM({
-                region: config.region
-            }), {log: logger.logApiCall, logName: 'iam'});
+			iam = loggingWrap(new IAM({region: config.region}), {log: logger.logApiCall, logName: 'iam'});
 			cloudFront = loggingWrap(new CloudFront({
                 region: config.region
             }), {log: logger.logApiCall, logName: 'cloudfront'});
diff --git a/src/commands/update.js b/src/commands/update.js
index 2aa82c1a..102c116a 100644
--- a/src/commands/update.js
+++ b/src/commands/update.js
@@ -241,9 +241,7 @@ module.exports = function update(options, optionalLogger) {
             // @deprecated SDK v3 only supports signature v4.
             signatureVersion: 'v4'
         }), {log: logger.logApiCall, logName: 's3'});
-		iam = loggingWrap(new IAM({
-            region: lambdaConfig.region
-        }), {log: logger.logApiCall, logName: 'iam'});
+		iam = loggingWrap(new IAM({region: lambdaConfig.region}), {log: logger.logApiCall, logName: 'iam'});
 		apiGateway = retriableWrap(
 			loggingWrap(
 				new APIGateway({

From 3111b436e697c94843b7130bc3e38f9699cfebfd Mon Sep 17 00:00:00 2001
From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com>
Date: Thu, 2 Nov 2023 13:57:07 -0700
Subject: [PATCH 7/9] chore: re-format Kinesis client creation

---
 src/commands/add-kinesis-event-source.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/commands/add-kinesis-event-source.js b/src/commands/add-kinesis-event-source.js
index 93bb9b28..c4af4f39 100644
--- a/src/commands/add-kinesis-event-source.js
+++ b/src/commands/add-kinesis-event-source.js
@@ -26,9 +26,7 @@ module.exports = function addKinesisEventSource(options, logger) {
 		initServices = function () {
 			lambda = new Lambda({region: lambdaConfig.region});
 			iam = new IAM({region: lambdaConfig.region});
-			kinesis = new Kinesis({
-                region: lambdaConfig.region
-            });
+			kinesis = new Kinesis({region: lambdaConfig.region});
 		},
 		getLambda = () => lambda.getFunctionConfiguration({FunctionName: lambdaConfig.name, Qualifier: options.version}).promise(),
 		readConfig = function () {

From b103f93ca3196175f294b0622250203b4e2c7e45 Mon Sep 17 00:00:00 2001
From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com>
Date: Thu, 2 Nov 2023 13:58:49 -0700
Subject: [PATCH 8/9] Remove signatureVersion from AWS Config

---
 src/commands/add-s3-event-source.js | 6 +-----
 src/commands/create.js              | 6 +-----
 src/commands/update.js              | 6 +-----
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/commands/add-s3-event-source.js b/src/commands/add-s3-event-source.js
index eae05d6c..de9f31c9 100644
--- a/src/commands/add-s3-event-source.js
+++ b/src/commands/add-s3-event-source.js
@@ -71,11 +71,7 @@ module.exports = function addS3EventSource(options) {
 		addBucketNotificationConfig = function () {
 			const events = options.events ? options.events.split(',') : ['s3:ObjectCreated:*'],
 				s3 = new S3({
-                    region: lambdaConfig.region,
-
-                    // The key signatureVersion is no longer supported in v3, and can be removed.
-                    // @deprecated SDK v3 only supports signature v4.
-                    signatureVersion: 'v4'
+                    region: lambdaConfig.region
                 }),
 				eventConfig = {
 					LambdaFunctionArn: lambdaConfig.arn,
diff --git a/src/commands/create.js b/src/commands/create.js
index bc059a11..605821fd 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -68,11 +68,7 @@ module.exports = function create(options, optionalLogger) {
 		iam = loggingWrap(new IAM({region: options.region}), {log: logger.logApiCall, logName: 'iam'}),
 		lambda = loggingWrap(new Lambda({region: options.region}), {log: logger.logApiCall, logName: 'lambda'}),
 		s3 = loggingWrap(new S3({
-            region: options.region,
-
-            // The key signatureVersion is no longer supported in v3, and can be removed.
-            // @deprecated SDK v3 only supports signature v4.
-            signatureVersion: 'v4'
+            region: options.region
         }), {log: logger.logApiCall, logName: 's3'}),
 		getSnsDLQTopic = function () {
 			const topicNameOrArn = options['dlq-sns'];
diff --git a/src/commands/update.js b/src/commands/update.js
index 102c116a..fa05c0f1 100644
--- a/src/commands/update.js
+++ b/src/commands/update.js
@@ -235,11 +235,7 @@ module.exports = function update(options, optionalLogger) {
 		apiConfig = config.api;
 		lambda = loggingWrap(new Lambda({region: lambdaConfig.region}), {log: logger.logApiCall, logName: 'lambda'});
 		s3 = loggingWrap(new S3({
-            region: lambdaConfig.region,
-
-            // The key signatureVersion is no longer supported in v3, and can be removed.
-            // @deprecated SDK v3 only supports signature v4.
-            signatureVersion: 'v4'
+            region: lambdaConfig.region
         }), {log: logger.logApiCall, logName: 's3'});
 		iam = loggingWrap(new IAM({region: lambdaConfig.region}), {log: logger.logApiCall, logName: 'iam'});
 		apiGateway = retriableWrap(

From 09ed5b1f40b28826c25fe3af434c49e6597fbfe0 Mon Sep 17 00:00:00 2001
From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com>
Date: Thu, 2 Nov 2023 14:00:04 -0700
Subject: [PATCH 9/9] chore: re-format S3 client creation

---
 src/commands/add-s3-event-source.js | 4 +---
 src/commands/create.js              | 4 +---
 src/commands/update.js              | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/commands/add-s3-event-source.js b/src/commands/add-s3-event-source.js
index de9f31c9..fda41d6a 100644
--- a/src/commands/add-s3-event-source.js
+++ b/src/commands/add-s3-event-source.js
@@ -70,9 +70,7 @@ module.exports = function addS3EventSource(options) {
 		},
 		addBucketNotificationConfig = function () {
 			const events = options.events ? options.events.split(',') : ['s3:ObjectCreated:*'],
-				s3 = new S3({
-                    region: lambdaConfig.region
-                }),
+				s3 = new S3({region: lambdaConfig.region}),
 				eventConfig = {
 					LambdaFunctionArn: lambdaConfig.arn,
 					Events: events
diff --git a/src/commands/create.js b/src/commands/create.js
index 605821fd..be170e7f 100644
--- a/src/commands/create.js
+++ b/src/commands/create.js
@@ -67,9 +67,7 @@ module.exports = function create(options, optionalLogger) {
 		configFile = (options && options.config) || path.join(source, 'claudia.json'),
 		iam = loggingWrap(new IAM({region: options.region}), {log: logger.logApiCall, logName: 'iam'}),
 		lambda = loggingWrap(new Lambda({region: options.region}), {log: logger.logApiCall, logName: 'lambda'}),
-		s3 = loggingWrap(new S3({
-            region: options.region
-        }), {log: logger.logApiCall, logName: 's3'}),
+		s3 = loggingWrap(new S3({region: options.region}), {log: logger.logApiCall, logName: 's3'}),
 		getSnsDLQTopic = function () {
 			const topicNameOrArn = options['dlq-sns'];
 			if (!topicNameOrArn) {
diff --git a/src/commands/update.js b/src/commands/update.js
index fa05c0f1..60120cf5 100644
--- a/src/commands/update.js
+++ b/src/commands/update.js
@@ -234,9 +234,7 @@ module.exports = function update(options, optionalLogger) {
 		lambdaConfig = config.lambda;
 		apiConfig = config.api;
 		lambda = loggingWrap(new Lambda({region: lambdaConfig.region}), {log: logger.logApiCall, logName: 'lambda'});
-		s3 = loggingWrap(new S3({
-            region: lambdaConfig.region
-        }), {log: logger.logApiCall, logName: 's3'});
+		s3 = loggingWrap(new S3({region: lambdaConfig.region}), {log: logger.logApiCall, logName: 's3'});
 		iam = loggingWrap(new IAM({region: lambdaConfig.region}), {log: logger.logApiCall, logName: 'iam'});
 		apiGateway = retriableWrap(
 			loggingWrap(