fix linting issues

obonyojimmy · Sep 7, 2018 · 59b30a5 · 59b30a5
1 parent 7a5c8a6
commit 59b30a5
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 38 deletions.
diff --git a/security/account-password-policy.yaml b/security/account-password-policy.yaml
@@ -130,40 +130,39 @@ Resources:
     Type: 'AWS::Lambda::Function'
     Properties:
       Code:
-        ZipFile:
-          !Sub |
-            'use strict';
-            const AWS = require('aws-sdk');
-            const response = require('cfn-response');
-            const iam = new AWS.IAM({apiVersion: '2010-05-08'});
-            exports.handler = (event, context, cb) => {
-              console.log(`Invoke: ${!JSON.stringify(event)}`);
-              const done = (err) => {
-                if (err) {
-                  console.log(`Error: ${!JSON.stringify(err)}`);
-                  response.send(event, context, response.FAILED, {});
-                } else {
-                  response.send(event, context, response.SUCCESS, {});
-                }
-              };
-              if (event.RequestType === 'Delete') {
-                iam.deleteAccountPasswordPolicy({}, done);
-              } else if (event.RequestType === 'Create' || event.RequestType === 'Update') {
-                iam.updateAccountPasswordPolicy({
-                  AllowUsersToChangePassword: Boolean(event.ResourceProperties.AllowUsersToChangePassword),
-                  HardExpiry: Boolean(event.ResourceProperties.HardExpiry),
-                  MaxPasswordAge: event.ResourceProperties.MaxPasswordAge,
-                  MinimumPasswordLength: event.ResourceProperties.MinimumPasswordLength,
-                  PasswordReusePrevention: event.ResourceProperties.PasswordReusePrevention,
-                  RequireLowercaseCharacters: Boolean(event.ResourceProperties.RequireLowercaseCharacters),
-                  RequireNumbers: Boolean(event.ResourceProperties.RequireNumbers),
-                  RequireSymbols: Boolean(event.ResourceProperties.RequireSymbols),
-                  RequireUppercaseCharacters: Boolean(event.ResourceProperties.RequireUppercaseCharacters),
-                }, done);
+        ZipFile: |
+          'use strict';
+          const AWS = require('aws-sdk');
+          const response = require('cfn-response');
+          const iam = new AWS.IAM({apiVersion: '2010-05-08'});
+          exports.handler = (event, context, cb) => {
+            console.log(`Invoke: ${JSON.stringify(event)}`);
+            const done = (err) => {
+              if (err) {
+                console.log(`Error: ${JSON.stringify(err)}`);
+                response.send(event, context, response.FAILED, {});
               } else {
-                cb(new Error(`unsupported RequestType: ${!event.RequestType}`));
+                response.send(event, context, response.SUCCESS, {});
               }
             };
+            if (event.RequestType === 'Delete') {
+              iam.deleteAccountPasswordPolicy({}, done);
+            } else if (event.RequestType === 'Create' || event.RequestType === 'Update') {
+              iam.updateAccountPasswordPolicy({
+                AllowUsersToChangePassword: Boolean(event.ResourceProperties.AllowUsersToChangePassword),
+                HardExpiry: Boolean(event.ResourceProperties.HardExpiry),
+                MaxPasswordAge: event.ResourceProperties.MaxPasswordAge,
+                MinimumPasswordLength: event.ResourceProperties.MinimumPasswordLength,
+                PasswordReusePrevention: event.ResourceProperties.PasswordReusePrevention,
+                RequireLowercaseCharacters: Boolean(event.ResourceProperties.RequireLowercaseCharacters),
+                RequireNumbers: Boolean(event.ResourceProperties.RequireNumbers),
+                RequireSymbols: Boolean(event.ResourceProperties.RequireSymbols),
+                RequireUppercaseCharacters: Boolean(event.ResourceProperties.RequireUppercaseCharacters),
+              }, done);
+            } else {
+              cb(new Error(`unsupported RequestType: ${event.RequestType}`));
+            }
+          };
       Handler: 'index.handler'
       MemorySize: 128
       Role: !GetAtt 'LambdaRole.Arn'

diff --git a/security/auth-proxy-ha-github-orga.yaml b/security/auth-proxy-ha-github-orga.yaml
@@ -623,7 +623,7 @@ Resources:
               nginx: []
           files:
             '/etc/nginx/conf.d/http2https.conf':
-              content: !Sub |
+              content: |
                 server {
                   listen 8080 default_server;
                   server_name _;
@@ -654,7 +654,7 @@ Resources:
               owner: root
               group: root
             '/etc/init.d/oauth2_proxy':
-              content: !Sub |
+              content: |
                 #!/bin/sh
                 ### BEGIN INIT INFO
                 # Provides:

diff --git a/security/cloudtrail.yaml b/security/cloudtrail.yaml
@@ -104,7 +104,7 @@ Resources:
     Type: 'AWS::SNS::TopicPolicy'
     Properties:
       PolicyDocument:
-        Version: '2008-10-17'
+        Version: '2012-10-17'
         Statement:
         - Sid: AWSCloudTrailSNSPolicy
           Effect: Allow

diff --git a/wordpress/wordpress-ha-aurora.yaml b/wordpress/wordpress-ha-aurora.yaml
@@ -768,7 +768,7 @@ Resources:
               httpd: []
           files:
             '/root/php.sh':
-              content: !Sub |
+              content: |
                 #!/bin/bash -ex
                 sed -i 's/max_execution_time = 30/max_execution_time = 300/' /etc/php.ini
                 sed -i 's/max_input_time = 60/max_input_time = 300/' /etc/php.ini
@@ -789,7 +789,7 @@ Resources:
               owner: root
               group: root
             '/etc/httpd/conf.d/wordpress.conf':
-              content: !Sub |
+              content: |
                 <Directory "/var/www/html">
                 Options Indexes FollowSymLinks
                 AllowOverride All

diff --git a/wordpress/wordpress-ha.yaml b/wordpress/wordpress-ha.yaml
@@ -756,7 +756,7 @@ Resources:
               httpd: []
           files:
             '/root/php.sh':
-              content: !Sub |
+              content: |
                 #!/bin/bash -ex
                 sed -i 's/max_execution_time = 30/max_execution_time = 300/' /etc/php.ini
                 sed -i 's/max_input_time = 60/max_input_time = 300/' /etc/php.ini
@@ -777,7 +777,7 @@ Resources:
               owner: root
               group: root
             '/etc/httpd/conf.d/wordpress.conf':
-              content: !Sub |
+              content: |
                 <Directory "/var/www/html">
                 Options Indexes FollowSymLinks
                 AllowOverride All