Fixed cfn-lint

kyhau · Aug 30, 2024 · a2e305c · a2e305c
1 parent 449eaeb
commit a2e305c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 178 deletions.
diff --git a/APIGateway/cfn/ApigwInit-LambdaInit-andPolicies.template.yaml b/APIGateway/cfn/ApigwInit-LambdaInit-andPolicies.template.yaml
@@ -213,7 +213,7 @@ Resources:
           - Effect: Allow
             Action:
               - iam:Passrole
-            Resource: !Sub arn:${AWS::Partition}:iam::${AWS::AccountId}/:role/${LambdaExecuteRoleName}
+            Resource: !Sub arn:${AWS::Partition}:iam::${AWS::AccountId}:role/${LambdaExecuteRoleName}
           - Effect: Allow
             Action:
               - lambda:InvokeFunction

diff --git a/CloudFront/cfn/CloudFront-S3-WebDistribution-UseCustomOrigin.template.yaml b/CloudFront/cfn/CloudFront-S3-WebDistribution-UseCustomOrigin.template.yaml
@@ -27,9 +27,6 @@ Parameters:
     Description: The file name of the error document (e.g. error.html).
     Type: String
     Default: index.html
-  IAMCertificateId:
-    Description: Custom SSL certificate to use with CloudFront distribution.
-    Type: String
   IndexDoc:
     Description: The file name of the index document (e.g. index.html).
     Type: String
@@ -75,10 +72,6 @@ Conditions:
   IsProduction: !Equals
     - prod
     - !Ref 'StageName'
-  UseCustomSSLCertificate: !Not
-    - !Equals
-      - !Ref 'IAMCertificateId'
-      - ''
 Resources:
   RootBucket:
     Type: AWS::S3::Bucket
@@ -263,19 +256,7 @@ Resources:
         HttpVersion: http2
         PriceClass: !Ref 'CloudFrontPriceClass'
         ViewerCertificate:
-          CloudFrontDefaultCertificate: !Ref 'AWS::NoValue'
-          IamCertificateId: !If
-            - UseCustomSSLCertificate
-            - !Ref 'IAMCertificateId'
-            - !Ref 'AWS::NoValue'
-          MinimumProtocolVersion: !If
-            - UseCustomSSLCertificate
-            - TLSv1
-            - !Ref 'AWS::NoValue'
-          SslSupportMethod: !If
-            - UseCustomSSLCertificate
-            - sni-only
-            - !Ref 'AWS::NoValue'
+          CloudFrontDefaultCertificate: true
 Outputs:
   CloudFrontDistributionID:
     Value: !Ref 'CloudFront'

diff --git a/CloudFront/cfn/CloudFront-S3-WebDistribution-UseS3Origin.template.yaml b/CloudFront/cfn/CloudFront-S3-WebDistribution-UseS3Origin.template.yaml
@@ -27,9 +27,6 @@ Parameters:
     Description: The file name of the error document (e.g. error.html).
     Type: String
     Default: index.html
-  IAMCertificateId:
-    Description: Custom SSL certificate to use with CloudFront distribution.
-    Type: String
   IndexDoc:
     Description: The file name of the index document (e.g. index.html).
     Type: String
@@ -75,10 +72,6 @@ Conditions:
   IsProduction: !Equals
     - prod
     - !Ref 'StageName'
-  UseCustomSSLCertificate: !Not
-    - !Equals
-      - !Ref 'IAMCertificateId'
-      - ''
 Resources:
   RootBucket:
     Type: AWS::S3::Bucket
@@ -259,19 +252,7 @@ Resources:
         HttpVersion: http2
         PriceClass: !Ref 'CloudFrontPriceClass'
         ViewerCertificate:
-          CloudFrontDefaultCertificate: !Ref 'AWS::NoValue'
-          IamCertificateId: !If
-            - UseCustomSSLCertificate
-            - !Ref 'IAMCertificateId'
-            - !Ref 'AWS::NoValue'
-          MinimumProtocolVersion: !If
-            - UseCustomSSLCertificate
-            - TLSv1
-            - !Ref 'AWS::NoValue'
-          SslSupportMethod: !If
-            - UseCustomSSLCertificate
-            - sni-only
-            - !Ref 'AWS::NoValue'
+          CloudFrontDefaultCertificate: true
 Outputs:
   CloudFrontDistributionID:
     Value: !Ref 'CloudFront'

diff --git a/EKS/cfn/basic-eks.yaml b/EKS/cfn/basic-eks.yaml
@@ -49,10 +49,13 @@ Resources:
           IpProtocol: -1
         - CidrIpv6: ::/0
           IpProtocol: -1
-      SecurityGroupIngress:
-        - IpProtocol: -1
-          FromPort: '0'
-          ToPort: '65535'
+
+  ControlPlaneSGIngress:
+    Type: AWS::EC2::SecurityGroupIngress
+    Properties:
+      GroupId: !Ref ControlPlaneSG
+      SourceSecurityGroupId: !Ref ControlPlaneSG
+      IpProtocol: -1
 
   EKSNodeRole:
     Type: AWS::IAM::Role

diff --git a/Lambda/cfn/EventsRule-Schedule-Invoke-Lambda-With-Parameter.yaml b/Lambda/cfn/EventsRule-Schedule-Invoke-Lambda-With-Parameter.yaml
@@ -33,7 +33,6 @@ Resources:
                 "custom_operation": "${LambdaParameter}"
             }
   PermissionForEventsToInvokeLambda:
-    DependsOn: ScheduledEventsRule
     Type: AWS::Lambda::Permission
     Properties:
       FunctionName: !Ref LambdaFunctionName

diff --git a/Q-Developer/README.md b/Q-Developer/README.md
@@ -5,8 +5,11 @@ Jump to
 - [Useful Articles and Blogs](#useful-articles-and-blogs)
 
 ---
+
 ## Useful Libs and Tools
 
+- [aws-samples/amazon-q-slack-gateway](https://github.com/aws-samples/amazon-q-slack-gateway)
+
 
 ## Useful Articles and Blogs
 - [10 ways to build applications faster with Amazon CodeWhisperer](https://aws.amazon.com/blogs/devops/10-ways-to-build-applications-faster-with-amazon-codewhisperer/), AWS, 2023-04-26

diff --git a/RDS-Aurora/cfn/RDS-PostgreSQL.template.yaml b/RDS-Aurora/cfn/RDS-PostgreSQL.template.yaml