fix(Variables): Fix support for ${self:}

serverless · Oct 5, 2020 · ac34110 · ac34110
1 parent fd451ca
commit ac34110
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/lib/classes/Service.js b/lib/classes/Service.js
@@ -20,7 +20,7 @@ class Service {
     this.serviceObject = null;
     this.provider = {
       stage: 'dev',
-      variableSyntax: '\\${([^{}:]+?(?:\\(|:)[^:{}][^{}]*?)}',
+      variableSyntax: '\\${([^{}:]+?(?:\\(|:)(?:[^:{}][^{}]*?)?)}',
     };
     this.custom = {};
     this.plugins = [];

diff --git a/lib/classes/Variables.test.js b/lib/classes/Variables.test.js
@@ -2769,5 +2769,8 @@ module.exports = {
     it('should support ${self:key} syntax', () => {
       expect(processedConfig.custom.selfReference).to.equal('bar');
     });
+    it('should support ${self:} syntax', () => {
+      expect(processedConfig.custom.serviceReference).to.equal(processedConfig);
+    });
   });
 });
diff --git a/test/fixtures/variables/serverless.yml b/test/fixtures/variables/serverless.yml
@@ -10,3 +10,4 @@ custom:
   awsVariable: ${AWS::Region}
   cloudFormationReference: ${AnotherResource}
   selfReference: ${self:custom.importedFileWithKey}
+  serviceReference: ${self:}