Migrate AWS SDK for JavaScript v2 APIs to v3

src/commands/add-cognito-user-pool-trigger.js

@@ -1,15 +1,23 @@
 const loadConfig = require('../util/loadconfig'),
 	iamNameSanitize = require('../util/iam-name-sanitize'),
-	aws = require('aws-sdk'),
 	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}})

src/commands/add-iot-topic-rule.js

@@ -1,6 +1,13 @@
 const loadConfig = require('../util/loadconfig'),
-	iamNameSanitize = require('../util/iam-name-sanitize'),
-	aws = require('aws-sdk');
+	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 +16,8 @@ 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}})

src/commands/add-kinesis-event-source.js

@@ -1,8 +1,19 @@
 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');
+	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 +24,9 @@ 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 () {

src/commands/add-s3-event-source.js

@@ -1,14 +1,26 @@
 const loadConfig = require('../util/loadconfig'),
-	iamNameSanitize = require('../util/iam-name-sanitize'),
-	aws = require('aws-sdk');
+	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,
 		awsPartition,
 		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 +38,7 @@ 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 +56,7 @@ module.exports = function addS3EventSource(options) {
 						}
 					]
 				})
-			}).promise();
+			});
 		},
 		addInvokePermission = function () {
 			return lambda.addPermission({
@@ -58,7 +70,7 @@ 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}),
 				eventConfig = {
 					LambdaFunctionArn: lambdaConfig.arn,
 					Events: events
@@ -85,7 +97,7 @@ module.exports = function addS3EventSource(options) {
 			}
 			return s3.getBucketNotificationConfiguration({
 				Bucket: options.bucket
-			}).promise()
+			})
 			.then(currentConfig => {
 				const merged = currentConfig || {};
 				if (!merged.LambdaFunctionConfigurations) {
@@ -95,7 +107,7 @@ module.exports = function addS3EventSource(options) {
 				return s3.putBucketNotificationConfiguration({
 					Bucket: options.bucket,
 					NotificationConfiguration: merged
-				}).promise();
+				});
 			});
 		};
 

src/commands/add-scheduled-event.js

@@ -1,6 +1,13 @@
 const loadConfig = require('../util/loadconfig'),
-	fsPromise = require('../util/fs-promise'),
-	aws = require('aws-sdk');
+	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 +17,10 @@ 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 () {

src/commands/add-sns-event-source.js

@@ -1,15 +1,24 @@
 const loadConfig = require('../util/loadconfig'),
-	fsPromise = require('../util/fs-promise'),
-	aws = require('aws-sdk');
+	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';
 	let lambdaConfig,
 		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 () {

src/commands/add-sqs-event-source.js

@@ -1,8 +1,19 @@
 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');
+	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 +24,11 @@ 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 () {

src/commands/allow-alexa-skill-trigger.js

@@ -1,12 +1,15 @@
-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 () {

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,9 @@ 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}), {log: logger.logApiCall, logName: 's3'}),
 		getSnsDLQTopic = function () {
 			const topicNameOrArn = options['dlq-sns'];
 			if (!topicNameOrArn) {
@@ -62,7 +79,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 () {

src/commands/destroy.js

@@ -1,9 +1,21 @@
-const aws = require('aws-sdk'),
-	loadConfig = require('../util/loadconfig'),
+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,19 +26,21 @@ 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
 				});
 			}
 		})
 		.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);
 			}

src/commands/list.js

@@ -1,6 +1,10 @@
-const aws = require('aws-sdk'),
-	loadConfig = require('../util/loadconfig'),
+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 +25,7 @@ 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) {