Merge pull request serverless#4859 from erikerikson/self-service-rewrite

Re-write `self:service.[...]` to `self:serviceObject.[...]`

Author: horike37

lib/classes/Variables.js

@@ -525,6 +525,7 @@ class Variables {
   }
 
   getValueFromSelf(variableString) {
+    const selfServiceRex = /self:service\./;
     let variable = variableString;
     // ###################################################################
     // ## KEEP SYNCHRONIZED WITH EQUIVALENT IN ~/lib/classes/Service.js ##
@@ -534,8 +535,9 @@ class Variables {
     // Account for these so that user's reference to their file populate properly
     if (variable === 'self:service.name') {
       variable = 'self:service';
-    }
-    if (variable === 'self:provider') {
+    } else if (variable.match(selfServiceRex)) {
+      variable = variable.replace(selfServiceRex, 'self:serviceObject.');
+    } else if (variable === 'self:provider') {
       variable = 'self:provider.name';
     }
     const valueToPopulate = this.service;

lib/classes/Variables.test.js

@@ -1156,6 +1156,18 @@ module.exports = {
       };
       return serverless.variables.getValueFromSelf('self:provider').should.become('aws');
     });
+    it('should redirect ${self:service.awsKmsKeyArn} to ${self:serviceObject.awsKmsKeyArn}', () => {
+      const keyArn = 'arn:aws:kms:us-east-1:xxxxxxxxxxxx:key/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx';
+      serverless.variables.service = {
+        service: 'testService',
+        serviceObject: {
+          name: 'testService',
+          awsKmsKeyArn: keyArn,
+        },
+      };
+      return serverless.variables.getValueFromSelf('self:service.awsKmsKeyArn')
+        .should.become(keyArn);
+    });
     it('should handle self-references to the root of the serverless.yml file', () => {
       serverless.variables.service = {
         service: 'testService',