From e7c59a22a0561343fe281079bf20ae2463a7baf0 Mon Sep 17 00:00:00 2001 From: Young Chen Date: Fri, 17 Mar 2023 17:29:28 -0400 Subject: [PATCH 1/3] Support using Ref in FunctionName --- lib/main.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/main.js b/lib/main.js index 1c84946..644820a 100644 --- a/lib/main.js +++ b/lib/main.js @@ -38,7 +38,6 @@ Lambda.prototype._resolve_refs = function( $config ) { $config.AWS_SECRET = process.env[ $config.AWS_SECRET.Ref.split('env.')[1] ] } - if ( (typeof $config.Role === "object") && Object.prototype.hasOwnProperty.call( $config.Role , 'Ref') && @@ -49,6 +48,16 @@ Lambda.prototype._resolve_refs = function( $config ) { $config.Role = process.env[ $config.Role.Ref.split('env.')[1] ] } + if ( + (typeof $config.FunctionName === "object") && + Object.prototype.hasOwnProperty.call( $config.FunctionName , 'Ref') && + (typeof $config.FunctionName.Ref === "string") && + ($config.FunctionName.Ref.indexOf('env.') === 0) + ) { + this.envs[ $config.FunctionName.Ref.split('env.')[1] ] = process.env[ $config.FunctionName.Ref.split('env.')[1] ] + $config.FunctionName = process.env[ $config.FunctionName.Ref.split('env.')[1] ] + } + return $config; } From 6be5f1f736c66b1f7b7c8ba8cf3e379fe4634fc6 Mon Sep 17 00:00:00 2001 From: Young Chen Date: Sat, 18 Mar 2023 16:21:53 -0400 Subject: [PATCH 2/3] Support FunctionName Ref on deploy --- lib/main.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/main.js b/lib/main.js index 644820a..725682f 100644 --- a/lib/main.js +++ b/lib/main.js @@ -174,6 +174,16 @@ Lambda.prototype.deploy = function( program ) { ) $config.Role = process.env[ $config.Role.Ref.split('env.')[1] ] + if ( + (typeof $config.FunctionName === "object") && + Object.prototype.hasOwnProperty.call( $config.FunctionName , 'Ref') && + (typeof $config.FunctionName.Ref === "string") && + ($config.FunctionName.Ref.indexOf('env.') === 0) + ) { + this.envs[ $config.FunctionName.Ref.split('env.')[1] ] = process.env[ $config.FunctionName.Ref.split('env.')[1] ] + $config.FunctionName = process.env[ $config.FunctionName.Ref.split('env.')[1] ] + } + if (!$config.FunctionName) $config.FunctionName = program.split('/').slice(-1)[0] From de466b9a0bc4c598b314e47d74c6c63c3e668e24 Mon Sep 17 00:00:00 2001 From: Young Chen Date: Sat, 18 Mar 2023 16:27:22 -0400 Subject: [PATCH 3/3] Don't set env on deploy --- lib/main.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/main.js b/lib/main.js index 725682f..3e1a2d5 100644 --- a/lib/main.js +++ b/lib/main.js @@ -180,7 +180,6 @@ Lambda.prototype.deploy = function( program ) { (typeof $config.FunctionName.Ref === "string") && ($config.FunctionName.Ref.indexOf('env.') === 0) ) { - this.envs[ $config.FunctionName.Ref.split('env.')[1] ] = process.env[ $config.FunctionName.Ref.split('env.')[1] ] $config.FunctionName = process.env[ $config.FunctionName.Ref.split('env.')[1] ] }