Skip to content

chore: migrate AWS SDK for JavaScript v2 APIs to v3 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore: migrate AWS SDK for JavaScript v2 APIs to v3 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 27 additions & 33 deletions lib/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ Lambda.prototype._parse_config_file = function( program ) {


Lambda.prototype.deploy = function( program ) {
var aws = require( "aws-sdk" )
const { Lambda: AWSLambda } = require('@aws-sdk/client-lambda')

if (process.env.AWSPILOT_DOCKER_WORKDIR)
process.chdir(process.env.AWSPILOT_DOCKER_WORKDIR)
Expand Down Expand Up @@ -173,15 +173,14 @@ Lambda.prototype.deploy = function( program ) {
process.exit(-1);
}

aws.config.update({
accessKeyId: $config.AWS_KEY,
secretAccessKey: $config.AWS_SECRET,
region: $config.AWS_REGION
var lambdaV2 = new AWSLambda({
credentials: {
accessKeyId: $config.AWS_KEY,
secretAccessKey: $config.AWS_SECRET,
},
region: $config.AWS_REGION,
})

var lambdaV2 = new aws.Lambda( { apiVersion: "2015-03-31" } )


var _this = this

var tmpfile = path.join( os.tmpdir(), $config.FunctionName + "-" + new Date().getTime() + ".zip" )
Expand Down Expand Up @@ -271,15 +270,15 @@ Lambda.prototype.deploy = function( program ) {
fs.unlinkSync( tmpfile )

lambdaV2.createFunction( paramsV2, function( err ) {
if ( err && err.code !== 'ResourceConflictException') {
if ( err && err.name !== 'ResourceConflictException') {
console.log("ERROR:", err )
if ( _this.settings.exitOnError !== false )
process.exit(-1);

return
}

if ( err && err.code === 'ResourceConflictException') {
if ( err && err.name === 'ResourceConflictException') {

// console.log("function exists, should update config and code")
var paramsV2 = {
Expand Down Expand Up @@ -355,7 +354,7 @@ Lambda.prototype.deploy = function( program ) {
}

Lambda.prototype.delete = function( program ) {
var aws = require( "aws-sdk" )
const { Lambda: AWSLambda } = require('@aws-sdk/client-lambda')

if (program.substr(-7) === '.lambda')
program = program.substr(0,program.length - 7)
Expand Down Expand Up @@ -405,26 +404,24 @@ Lambda.prototype.delete = function( program ) {
)
$config.Role = process.env[ $config.Role.Ref.split('env.')[1] ]


aws.config.update({
accessKeyId: $config.AWS_KEY,
secretAccessKey: $config.AWS_SECRET,
region: $config.AWS_REGION
})

if (!$config.FunctionName)
$config.FunctionName = program.split('/').slice(-1)[0]

var lambdaV2 = new aws.Lambda( { apiVersion: "2015-03-31" } )

var lambdaV2 = new AWSLambda({
credentials: {
accessKeyId: $config.AWS_KEY,
secretAccessKey: $config.AWS_SECRET,
},
region: $config.AWS_REGION,
})

lambdaV2.deleteFunction({ FunctionName: $config.FunctionName }, function( err ) {
if ( err && err.code !== 'ResourceNotFoundException') {
if ( err && err.name !== 'ResourceNotFoundException') {
console.log("delete error:", err )
process.exit(-1)
}

if ( err && err.code === 'ResourceNotFoundException')
if ( err && err.name === 'ResourceNotFoundException')
console.log("WARNING: deleteFunction ",$config.FunctionName,": ResourceNotFoundException " )
else
console.log( "Deleted!" );
Expand All @@ -433,7 +430,7 @@ Lambda.prototype.delete = function( program ) {


Lambda.prototype.invoke = function( program ) {
var aws = require( "aws-sdk" )
const { Lambda: AWSLambda } = require('@aws-sdk/client-lambda')

if (program.substr(-7) === '.lambda')
program = program.substr(0,program.length - 7)
Expand Down Expand Up @@ -483,19 +480,16 @@ Lambda.prototype.invoke = function( program ) {
)
$config.Role = process.env[ $config.Role.Ref.split('env.')[1] ]


aws.config.update({
accessKeyId: $config.AWS_KEY,
secretAccessKey: $config.AWS_SECRET,
region: $config.AWS_REGION
})

if (!$config.FunctionName)
$config.FunctionName = program.split('/').slice(-1)[0]


var lambdaV2 = new aws.Lambda( { apiVersion: "2015-03-31" } )

var lambdaV2 = new AWSLambda({
credentials: {
accessKeyId: $config.AWS_KEY,
secretAccessKey: $config.AWS_SECRET,
},
region: $config.AWS_REGION,
})

var paramsV2 = {
FunctionName: $config.FunctionName,
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"lambda": "./bin/lambda"
},
"dependencies": {
"aws-sdk": "^2.814.0",
"@aws-sdk/client-lambda": "3.45.0",
"js-yaml": "^3.14.1",
"watchpack": "^2.0.0-beta.10",
"commander": "^3.0.2"
Expand Down