fix cfn

Author: devksingh4

cloudformation/iam.yml

@@ -1,6 +1,7 @@
 AWSTemplateFormatVersion: "2010-09-09"
 Description: Stack IAM Roles
 Transform: AWS::Serverless-2016-10-31
+
 Parameters:
   RunEnvironment:
     Type: String
@@ -14,6 +15,7 @@ Parameters:
     Type: String
   SqsQueueArn:
     Type: String
+
 Resources:
   SqsLambdaIAMRole:
     Type: AWS::IAM::Role
@@ -30,23 +32,25 @@ Resources:
               Service:
                 - lambda.amazonaws.com
       Policies:
-        - PolicyDocument:
-          Version: "2012-10-17"
-          Statement:
-            - Action:
-                - ses:SendEmail
-                - ses:SendRawEmail
-              Effect: Allow
-              Resource: "*"
-              Condition:
-                StringEquals:
-                  ses:FromAddress:
-                    Fn::Sub: "membership@${SesEmailDomain}"
-                ForAllValues:StringLike:
-                  ses:Recipients:
-                    - "*@illinois.edu"
-          PolicyName: ses-membership
-        - PolicyDocument:
+        - PolicyName: ses-membership
+          PolicyDocument:
+            Version: "2012-10-17"
+            Statement:
+              - Action:
+                  - ses:SendEmail
+                  - ses:SendRawEmail
+                Effect: Allow
+                Resource: "*"
+                Condition:
+                  StringEquals:
+                    ses:FromAddress:
+                      Fn::Sub: "membership@${SesEmailDomain}"
+                  ForAllValues:StringLike:
+                    ses:Recipients:
+                      - "*@illinois.edu"
+
+        - PolicyName: lambda-logs
+          PolicyDocument:
             Version: "2012-10-17"
             Statement:
               - Action:
@@ -56,18 +60,20 @@ Resources:
                 Effect: Allow
                 Resource:
                   - Fn::Sub: arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/lambda/${LambdaFunctionName}:*
-        - PolicyDocument:
-            Version: 2012-10-17
+
+        - PolicyName: lambda-db-secrets
+          PolicyDocument:
+            Version: "2012-10-17"
             Statement:
               - Action:
                   - secretsmanager:GetSecretValue
                 Effect: Allow
                 Resource:
                   - Fn::Sub: arn:aws:secretsmanager:${AWS::Region}:${AWS::AccountId}:secret:infra-core-api-config*
-          PolicyName: lambda-db-secrets
 
-        - PolicyDocument:
-            Version: 2012-10-17
+        - PolicyName: lambda-dynamo
+          PolicyDocument:
+            Version: "2012-10-17"
             Statement:
               - Sid: DynamoDBTableAccess
                 Effect: Allow
@@ -90,7 +96,6 @@ Resources:
                 Action:
                   - dynamodb:DescribeLimits
                 Resource: "*"
-          PolicyName: lambda-dynamo
 
   ApiLambdaIAMRole:
     Type: AWS::IAM::Role
@@ -105,16 +110,18 @@ Resources:
               Service:
                 - lambda.amazonaws.com
       Policies:
-        - PolicyDocument:
+        - PolicyName: lambda-sqs
+          PolicyDocument:
             Version: "2012-10-17"
             Statement:
               - Action:
                   - sqs:SendMessage
                 Effect: Allow
                 Resource:
-                  Fn::Ref: SqsQueueArn
-          PolicyName: lambda-sqs
-        - PolicyDocument:
+                  - Fn::Sub: "${SqsQueueArn}"
+
+        - PolicyName: lambda-logs
+          PolicyDocument:
             Version: "2012-10-17"
             Statement:
               - Action:
@@ -124,18 +131,20 @@ Resources:
                 Effect: Allow
                 Resource:
                   - Fn::Sub: arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/lambda/${LambdaFunctionName}:*
-          PolicyName: lambda
-        - PolicyDocument:
-            Version: 2012-10-17
+
+        - PolicyName: lambda-db-secrets
+          PolicyDocument:
+            Version: "2012-10-17"
             Statement:
               - Action:
                   - secretsmanager:GetSecretValue
                 Effect: Allow
                 Resource:
                   - Fn::Sub: arn:aws:secretsmanager:${AWS::Region}:${AWS::AccountId}:secret:infra-core-api-config*
-          PolicyName: lambda-db-secrets
-        - PolicyDocument:
-            Version: 2012-10-17
+
+        - PolicyName: lambda-dynamo
+          PolicyDocument:
+            Version: "2012-10-17"
             Statement:
               - Sid: DynamoDBIndexAccess
                 Effect: Allow
@@ -186,14 +195,15 @@ Resources:
                 Action:
                   - dynamodb:DescribeLimits
                 Resource: "*"
-          PolicyName: lambda-dynamo
+
 Outputs:
   MainFunctionRoleArn:
     Description: Main API IAM role ARN
     Value:
       Fn::GetAtt:
         - ApiLambdaIAMRole
         - Arn
+
   SqsFunctionRoleArn:
     Description: Sqs IAM role ARN
     Value:

cloudformation/main.yml

@@ -218,8 +218,7 @@ Resources:
       MemorySize: 512
       Role:
         Fn::GetAtt: AppSecurityRoles.Outputs.SqsFunctionRoleArn
-      Timeout:
-        Fn::Ref: SqsLambdaTimeout
+      Timeout: !Ref SqsLambdaTimeout
       LoggingConfig:
         LogGroup: !Sub /aws/lambda/${ApplicationPrefix}-lambda
       Environment: