[Improvement] * - Revert Custom Resource workaround introduced on Nov…

… 2019 (commit 0194e26)
MousomGITHub · Mar 5, 2020 · af6f3a7 · af6f3a7
1 parent 7368557
commit af6f3a7
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/jenkins/jenkins2-ha-agents.yaml b/jenkins/jenkins2-ha-agents.yaml
@@ -2198,7 +2198,7 @@ Resources:
       Code:
         ZipFile: |
           'use strict';
-          const response = require('./cfn-response');
+          const response = require('cfn-response');
           exports.handler = (event, context, cb) => {
             const throughput = parseInt(event.ResourceProperties.ThroughputInMibps, 10);
             const threshold = Math.round(throughput * 1048576 * 600 * 0.9);

diff --git a/jenkins/jenkins2-ha.yaml b/jenkins/jenkins2-ha.yaml
@@ -1019,7 +1019,7 @@ Resources:
       Code:
         ZipFile: |
           'use strict';
-          const response = require('./cfn-response');
+          const response = require('cfn-response');
           exports.handler = (event, context, cb) => {
             const throughput = parseInt(event.ResourceProperties.ThroughputInMibps, 10);
             const threshold = Math.round(throughput * 1048576 * 600 * 0.9);

diff --git a/security/account-password-policy.yaml b/security/account-password-policy.yaml
@@ -142,29 +142,29 @@ Resources:
         ZipFile: |
           'use strict';
           const AWS = require('aws-sdk');
-          const response = require('./cfn-response');
+          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) => {
+            function 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') {
-              let params = {
-                AllowUsersToChangePassword: event.ResourceProperties.AllowUsersToChangePassword === 'true',
-                HardExpiry: event.ResourceProperties.HardExpiry === 'true',
+              const params = {
                 MinimumPasswordLength: parseInt(event.ResourceProperties.MinimumPasswordLength, 10),
-                RequireLowercaseCharacters: event.ResourceProperties.RequireLowercaseCharacters === 'true',
-                RequireNumbers: event.ResourceProperties.RequireNumbers === 'true',
                 RequireSymbols: event.ResourceProperties.RequireSymbols === 'true',
+                RequireNumbers: event.ResourceProperties.RequireNumbers === 'true',
                 RequireUppercaseCharacters: event.ResourceProperties.RequireUppercaseCharacters === 'true',
+                RequireLowercaseCharacters: event.ResourceProperties.RequireLowercaseCharacters === 'true',
+                AllowUsersToChangePassword: event.ResourceProperties.AllowUsersToChangePassword === 'true',
+                HardExpiry: event.ResourceProperties.HardExpiry === 'true'
               };
               if (parseInt(event.ResourceProperties.MaxPasswordAge, 10) > 0) {
                 params.MaxPasswordAge = parseInt(event.ResourceProperties.MaxPasswordAge, 10);

diff --git a/state/elasticache-memcached.yaml b/state/elasticache-memcached.yaml
@@ -241,7 +241,7 @@ Resources:
       Code:
         ZipFile: |
           'use strict';
-          const response = require('./cfn-response');
+          const response = require('cfn-response');
           exports.handler = (event, context, cb) => {
             const nodes = parseInt(event.ResourceProperties.NumCacheNodes, 10);
             const azs = event.ResourceProperties.AvailabilityZones.split(',');

diff --git a/vpc/vpc-vpn-bastion.yaml b/vpc/vpc-vpn-bastion.yaml
@@ -852,7 +852,7 @@ Resources:
       Code:
         ZipFile: |
           'use strict';
-          const response = require('./cfn-response');
+          const response = require('cfn-response');
           exports.handler = (event, context, cb) => {
             const throughput = parseInt(event.ResourceProperties.ThroughputInMibps, 10);
             const threshold = Math.round(throughput * 1048576 * 600 * 0.9);

diff --git a/wordpress/wordpress-ha-aurora.yaml b/wordpress/wordpress-ha-aurora.yaml
@@ -1191,7 +1191,7 @@ Resources:
       Code:
         ZipFile: |
           'use strict';
-          const response = require('./cfn-response');
+          const response = require('cfn-response');
           exports.handler = (event, context, cb) => {
             const throughput = parseInt(event.ResourceProperties.ThroughputInMibps, 10);
             const threshold = Math.round(throughput * 1048576 * 600 * 0.9);

diff --git a/wordpress/wordpress-ha.yaml b/wordpress/wordpress-ha.yaml
@@ -1163,7 +1163,7 @@ Resources:
       Code:
         ZipFile: |
           'use strict';
-          const response = require('./cfn-response');
+          const response = require('cfn-response');
           exports.handler = (event, context, cb) => {
             const throughput = parseInt(event.ResourceProperties.ThroughputInMibps, 10);
             const threshold = Math.round(throughput * 1048576 * 600 * 0.9);