Fixed #5

Author: horike37

index.js

@@ -166,13 +166,13 @@ class ServerlessStepFunctions {
   getIamRoleName() {
     let name = `${this.service}-${this.region}-${this.stage}-${this.options.state}-`;
     name += 'ssf-exerole';
-    return name;
+    return name.substr(0, 64);
   }
 
   getIamPolicyName() {
     let name = `${this.service}-${this.region}-${this.stage}-${this.options.state}-`;
     name += 'ssf-exepolicy';
-    return name;
+    return name.substr(0, 64);
   }
 
   getStateMachineName() {
@@ -403,15 +403,14 @@ class ServerlessStepFunctions {
       throw new this.serverless.classes.Error(errorMessage);
     }
 
-    _.forEach(this.stepFunctions[this.options.state].States, (value, key) => {
-      if (value.Resource && !value.Resource.match(/arn:aws:lambda/)) {
-        this.stepFunctions[this.options.state].States[key].Resource
-        = this.functionArns[value.Resource];
-      }
-    });
-
     this.awsStateLanguage[this.options.state] =
       JSON.stringify(this.stepFunctions[this.options.state]);
+
+    _.forEach(this.functionArns, (value, key) => {
+      const regExp = new RegExp(`"Resource":"${key}"`, 'g');
+      this.awsStateLanguage[this.options.state] =
+        this.awsStateLanguage[this.options.state].replace(regExp, `"Resource":"${value}"`);
+    });
     return BbPromise.resolve();
   }
 }

index.test.js

@@ -476,7 +476,7 @@ describe('ServerlessStepFunctions', () => {
   });
 
   describe('#compile()', () => {
-    beforeEach(() => {
+    it('should comple with correct params', () => {
       serverlessStepFunctions.stepFunctions = {
         stateMachine: {
           States: {
@@ -487,17 +487,36 @@ describe('ServerlessStepFunctions', () => {
         },
       };
       serverlessStepFunctions.functionArns.first = 'lambdaArn';
-    });
-
-    it('should comple with correct params'
-    , () => serverlessStepFunctions.compile()
-      .then(() => {
-        expect(serverlessStepFunctions.stepFunctions.stateMachine.States.HelloWorld.Resource)
-        .to.be.equal('lambdaArn');
+      serverlessStepFunctions.compile().then(() => {
         expect(serverlessStepFunctions.awsStateLanguage.stateMachine)
         .to.be.equal('{"States":{"HelloWorld":{"Resource":"lambdaArn"}}}');
-      })
-    );
+      });
+    });
+
+    it('should comple with correct params when nested Resource', () => {
+      serverlessStepFunctions.stepFunctions = {
+        stateMachine: {
+          States: {
+            HelloWorld: {
+              Resource: 'first',
+              HelloWorld: {
+                Resource: 'first',
+                HelloWorld: {
+                  Resource: 'first',
+                },
+              },
+            },
+          },
+        },
+      };
+
+      let a = '{"States":{"HelloWorld":{"Resource":"lambdaArn","HelloWorld"';
+      a += ':{"Resource":"lambdaArn","HelloWorld":{"Resource":"lambdaArn"}}}}}';
+      serverlessStepFunctions.functionArns.first = 'lambdaArn';
+      serverlessStepFunctions.compile().then(() => {
+        expect(serverlessStepFunctions.awsStateLanguage.stateMachine).to.be.equal(a);
+      });
+    });
   });
 });