Merge pull request #504 from MarletteFunding/feature/cw_events_iamrole_intrinsic_fcns

feat: allow setting intrinsic functions for CW Events iamRole

Author: lopburny

lib/deploy/events/cloudWatchEvent/compileCloudWatchEventEvents.js

@@ -51,7 +51,7 @@ module.exports = {
               Description = eventRule.description;
               Name = eventRule.name;
               EventBusName = JSON.stringify(eventRule.eventBusName);
-              IamRole = eventRule.iamRole;
+              IamRole = JSON.stringify(eventRule.iamRole);
               DeadLetterConfig = JSON.stringify(eventRule.deadLetterConfig);
 
               if ([Input, InputPath, InputTransformer].filter(Boolean).length > 1) {
@@ -117,7 +117,7 @@ module.exports = {
                     "Arn": { "Ref": "${stateMachineLogicalId}" },
                     "Id": "${cloudWatchId}",
                     ${DeadLetterConfig ? `"DeadLetterConfig":{ "Arn" : ${DeadLetterConfig} },` : ''}
-                    ${IamRole ? `"RoleArn":"${IamRole}"` : `"RoleArn": {
+                    ${IamRole ? `"RoleArn": ${IamRole}` : `"RoleArn": {
                       "Fn::GetAtt": [
                         "${cloudWatchIamRoleLogicalId}",
                         "Arn"

lib/deploy/events/cloudWatchEvent/compileCloudWatchEventEvents.test.js

@@ -520,6 +520,66 @@ describe('awsCompileCloudWatchEventEvents', () => {
         .FirstEventsRuleCloudWatchEvent1.Properties.Targets[0].Input).to.equal('{"key":"value"}');
     });
 
+    itParam('should respect iamRole variable', ['cloudwatchEvent', 'eventBridge'], (source) => {
+      serverlessStepFunctions.serverless.service.stepFunctions = {
+        stateMachines: {
+          first: {
+            events: [
+              {
+                [source]: {
+                  event: {
+                    source: ['aws.ec2'],
+                    'detail-type': ['EC2 Instance State-change Notification'],
+                    detail: { state: ['pending'] },
+                  },
+                  enabled: false,
+                  input: '{"key":"value"}',
+                  name: 'test-event-name',
+                  iamRole: 'arn:aws:iam::012345678910:role/my-role',
+                },
+              },
+            ],
+          },
+        },
+      };
+
+      serverlessStepFunctions.compileCloudWatchEventEvents();
+
+      expect(serverlessStepFunctions.serverless.service
+        .provider.compiledCloudFormationTemplate.Resources.FirstEventsRuleCloudWatchEvent1
+        .Properties.Targets[0].RoleArn).to.equal('arn:aws:iam::012345678910:role/my-role');
+    });
+
+    itParam('should respect iamRole intrinsic function', ['cloudwatchEvent', 'eventBridge'], (source) => {
+      serverlessStepFunctions.serverless.service.stepFunctions = {
+        stateMachines: {
+          first: {
+            events: [
+              {
+                [source]: {
+                  event: {
+                    source: ['aws.ec2'],
+                    'detail-type': ['EC2 Instance State-change Notification'],
+                    detail: { state: ['pending'] },
+                  },
+                  enabled: false,
+                  input: '{"key":"value"}',
+                  name: 'test-event-name',
+                  iamRole: '{"Fn::GetAtt": ["StepFunctionsRole", "Arn"]}',
+                },
+              },
+            ],
+          },
+        },
+      };
+
+      serverlessStepFunctions.compileCloudWatchEventEvents();
+
+      expect(serverlessStepFunctions.serverless.service
+        .provider.compiledCloudFormationTemplate.Resources.FirstEventsRuleCloudWatchEvent1
+        .Properties.Targets[0].RoleArn).to.equal('{"Fn::GetAtt": ["StepFunctionsRole", "Arn"]}');
+    });
+
     it('should not create corresponding resources when events are not given', () => {
       serverlessStepFunctions.serverless.service.stepFunctions = {
         stateMachines: {