Merge pull request motdotla#792 from abetomo/migration-to-aws-sdk-v3-schedule_events

sdk-v3: Migrate lib/schedule_events to V3

Author: DeviaVir

lib/main.js

@@ -973,8 +973,7 @@ they may not work as expected in the Lambda environment.
     console.log(params)
 
     const lambdaClient = new LambdaClient(config)
-    // Migrating to v3.
-    const scheduleEvents = new ScheduleEvents(aws.sdk, region)
+    const scheduleEvents = new ScheduleEvents(config)
     const s3Events = new S3Events(config)
     const cloudWatchLogs = new CloudWatchLogs(config)
 

lib/schedule_events.js

@@ -1,15 +1,12 @@
 'use strict'
 
+const { CloudWatchEventsClient, PutRuleCommand, PutTargetsCommand } = require('@aws-sdk/client-cloudwatch-events')
+const { LambdaClient, AddPermissionCommand } = require('@aws-sdk/client-lambda')
+
 class ScheduleEvents {
-  constructor (aws, region) {
-    // Authenticated `aws` object in `lib/main.js`
-    this.lambda = new aws.Lambda({
-      region,
-      apiVersion: '2015-03-31'
-    })
-    this.cloudwatchevents = new aws.CloudWatchEvents({
-      apiVersion: '2015-10-07'
-    })
+  constructor (config) {
+    this.cweClient = new CloudWatchEventsClient(config)
+    this.lambdaClient = new LambdaClient(config)
   }
 
   _ruleDescription (params) {
@@ -34,13 +31,9 @@ class ScheduleEvents {
 
   _putRule (params) {
     // return RuleArn if created
-    return new Promise((resolve, reject) => {
-      const _params = this._putRulePrams(params)
-      this.cloudwatchevents.putRule(_params, (err, rule) => {
-        if (err) reject(err)
-        resolve(rule)
-      })
-    })
+    return this.cweClient.send(
+      new PutRuleCommand(this._putRulePrams(params))
+    )
   }
 
   _addPermissionParams (params) {
@@ -54,17 +47,14 @@ class ScheduleEvents {
   }
 
   _addPermission (params) {
-    return new Promise((resolve, reject) => {
-      const _params = this._addPermissionParams(params)
-      this.lambda.addPermission(_params, (err, data) => {
-        if (err) {
-          if (err.code !== 'ResourceConflictException') reject(err)
-          // If it exists it will result in an error but there is no problem.
-          resolve('Permission already set')
-        }
-        resolve(data)
-      })
-    })
+    const _params = this._addPermissionParams(params)
+    try {
+      return this.lambdaClient.send(new AddPermissionCommand(_params))
+    } catch (err) {
+      if (err.code !== 'ResourceConflictException') throw err
+      // If it exists it will result in an error but there is no problem.
+      return 'Permission already set'
+    }
   }
 
   _putTargetsParams (params) {
@@ -79,14 +69,10 @@ class ScheduleEvents {
   }
 
   _putTargets (params) {
-    return new Promise((resolve, reject) => {
-      const _params = this._putTargetsParams(params)
-      this.cloudwatchevents.putTargets(_params, (err, data) => {
-        // even if it is already registered, it will not be an error.
-        if (err) reject(err)
-        resolve(data)
-      })
-    })
+    // even if it is already registered, it will not be an error.
+    return this.cweClient.send(
+      new PutTargetsCommand(this._putTargetsParams(params))
+    )
   }
 
   add (params) {