@brunwig/mup-aws-beanstalk 0.8.6 → 2.0.3

package/lib/certificates.js

@@ -1,57 +1,60 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = ensureSSLConfigured;
-var _aws = require("./aws");
-var _utils = require("./utils");
-var _ebConfig = require("./eb-config");
-var _envReady = require("./env-ready");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureSSLConfigured = ensureSSLConfigured;
+const aws_1 = require("./aws");
+const utils_1 = require("./utils");
+const eb_config_1 = require("./eb-config");
+const env_ready_1 = require("./env-ready");
 async function ensureSSLConfigured(config, certificateArn) {
-  const {
-    app,
-    environment
-  } = (0, _utils.names)(config);
-  const ebConfig = [{
-    Namespace: 'aws:elbv2:listener:443',
-    OptionName: 'SSLCertificateArns',
-    Value: certificateArn
-  }, {
-    Namespace: 'aws:elbv2:listener:443',
-    OptionName: 'DefaultProcess',
-    Value: 'default'
-  }, {
-    Namespace: 'aws:elbv2:listener:443',
-    OptionName: 'ListenerEnabled',
-    Value: 'true'
-  }, {
-    Namespace: 'aws:elbv2:listener:443',
-    OptionName: 'Protocol',
-    Value: 'HTTPS'
-  }];
-  const domains = config.app.sslDomains;
-
-  // we use domains to decide if we need to do something about SSL
-  if (!domains || domains.length === 0) {
-    return;
-  }
-  const {
-    ConfigurationSettings
-  } = await _aws.beanstalk.describeConfigurationSettings({
-    EnvironmentName: environment,
-    ApplicationName: app
-  }).promise();
-  const current = ConfigurationSettings[0].OptionSettings.reduce(_ebConfig.convertToObject, {});
-  const desired = ebConfig.reduce(_ebConfig.convertToObject, {});
-  const needToUpdate = Object.keys(desired).find(key => !current[key] || current[key].Value !== desired[key].Value);
-  if (!needToUpdate) {
-    return;
-  }
-  await _aws.beanstalk.updateEnvironment({
-    EnvironmentName: environment,
-    OptionSettings: ebConfig
-  }).promise();
-  await (0, _envReady.waitForEnvReady)(config, true);
+    const { app, environment } = (0, utils_1.names)(config);
+    const ebConfig = [{
+            Namespace: 'aws:elbv2:listener:443',
+            OptionName: 'SSLCertificateArns',
+            Value: certificateArn
+        }, {
+            Namespace: 'aws:elbv2:listener:443',
+            OptionName: 'DefaultProcess',
+            Value: 'default'
+        }, {
+            Namespace: 'aws:elbv2:listener:443',
+            OptionName: 'ListenerEnabled',
+            Value: 'true'
+        }, {
+            Namespace: 'aws:elbv2:listener:443',
+            OptionName: 'Protocol',
+            Value: 'HTTPS'
+        },
+        // Force SSLv3
+        {
+            Namespace: 'aws:elbv2:listener:443',
+            OptionName: 'SSLPolicy',
+            Value: 'ELBSecurityPolicy-TLS13-1-2-2021-06'
+        }
+    ];
+    const domains = config.app.sslDomains;
+    // we use domains to decide if we need to do something about SSL
+    if (!domains || domains.length === 0) {
+        return;
+    }
+    const { ConfigurationSettings } = await aws_1.beanstalk
+        .describeConfigurationSettings({
+        EnvironmentName: environment,
+        ApplicationName: app,
+    });
+    console.log("--->", "ensureSSLConfigured", ConfigurationSettings);
+    const firstConfig = ConfigurationSettings === null || ConfigurationSettings === void 0 ? void 0 : ConfigurationSettings[0];
+    const current = firstConfig.OptionSettings.reduce(eb_config_1.convertToObject, {});
+    const desired = ebConfig.reduce(eb_config_1.convertToObject, {});
+    const needToUpdate = Object.keys(desired).find((key) => !current[key] || current[key].Value !== desired[key].Value);
+    if (!needToUpdate) {
+        return;
+    }
+    console.log("--->", "ensureSSLConfigured updateEnvironment", environment, ebConfig);
+    await aws_1.beanstalk
+        .updateEnvironment({
+        EnvironmentName: environment,
+        OptionSettings: ebConfig,
+    });
+    await (0, env_ready_1.waitForEnvReady)(config, true);
 }
 //# sourceMappingURL=certificates.js.map

package/lib/certificates.js.map

@@ -1 +1 @@
-{"version":3,"file":"certificates.js","names":["_aws","require","_utils","_ebConfig","_envReady","ensureSSLConfigured","config","certificateArn","app","environment","names","ebConfig","Namespace","OptionName","Value","domains","sslDomains","length","ConfigurationSettings","beanstalk","describeConfigurationSettings","EnvironmentName","ApplicationName","promise","current","OptionSettings","reduce","convertToObject","desired","needToUpdate","Object","keys","find","key","updateEnvironment","waitForEnvReady"],"sources":["../src/certificates.js"],"sourcesContent":["import { beanstalk } from './aws';\nimport { names } from './utils';\nimport { convertToObject } from './eb-config';\nimport { waitForEnvReady } from './env-ready';\n\nexport default async function ensureSSLConfigured(config, certificateArn) {\n  const {\n    app,\n    environment\n  } = names(config);\n\n  const ebConfig = [{\n    Namespace: 'aws:elbv2:listener:443',\n    OptionName: 'SSLCertificateArns',\n    Value: certificateArn\n  }, {\n    Namespace: 'aws:elbv2:listener:443',\n    OptionName: 'DefaultProcess',\n    Value: 'default'\n  }, {\n    Namespace: 'aws:elbv2:listener:443',\n    OptionName: 'ListenerEnabled',\n    Value: 'true'\n  }, {\n    Namespace: 'aws:elbv2:listener:443',\n    OptionName: 'Protocol',\n    Value: 'HTTPS'\n  }];\n\n  const domains = config.app.sslDomains;\n\n  // we use domains to decide if we need to do something about SSL\n  if (!domains || domains.length === 0) {\n    return;\n  }\n\n  const { ConfigurationSettings } = await beanstalk\n    .describeConfigurationSettings({\n      EnvironmentName: environment,\n      ApplicationName: app,\n    })\n    .promise();\n\n  const current = ConfigurationSettings[0].OptionSettings.reduce(\n    convertToObject,\n    {}\n  );\n  const desired = ebConfig.reduce(convertToObject, {});\n\n  const needToUpdate = Object.keys(desired).find(\n    (key) => !current[key] || current[key].Value !== desired[key].Value\n  );\n\n  if (!needToUpdate) {\n    return;\n  }\n\n  await beanstalk\n    .updateEnvironment({\n      EnvironmentName: environment,\n      OptionSettings: ebConfig,\n    })\n    .promise();\n  await waitForEnvReady(config, true);\n}\n"],"mappings":";;;;;;AAAA,IAAAA,IAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AACA,IAAAG,SAAA,GAAAH,OAAA;AAEe,eAAeI,mBAAmBA,CAACC,MAAM,EAAEC,cAAc,EAAE;EACxE,MAAM;IACJC,GAAG;IACHC;EACF,CAAC,GAAG,IAAAC,YAAK,EAACJ,MAAM,CAAC;EAEjB,MAAMK,QAAQ,GAAG,CAAC;IAChBC,SAAS,EAAE,wBAAwB;IACnCC,UAAU,EAAE,oBAAoB;IAChCC,KAAK,EAAEP;EACT,CAAC,EAAE;IACDK,SAAS,EAAE,wBAAwB;IACnCC,UAAU,EAAE,gBAAgB;IAC5BC,KAAK,EAAE;EACT,CAAC,EAAE;IACDF,SAAS,EAAE,wBAAwB;IACnCC,UAAU,EAAE,iBAAiB;IAC7BC,KAAK,EAAE;EACT,CAAC,EAAE;IACDF,SAAS,EAAE,wBAAwB;IACnCC,UAAU,EAAE,UAAU;IACtBC,KAAK,EAAE;EACT,CAAC,CAAC;EAEF,MAAMC,OAAO,GAAGT,MAAM,CAACE,GAAG,CAACQ,UAAU;;EAErC;EACA,IAAI,CAACD,OAAO,IAAIA,OAAO,CAACE,MAAM,KAAK,CAAC,EAAE;IACpC;EACF;EAEA,MAAM;IAAEC;EAAsB,CAAC,GAAG,MAAMC,cAAS,CAC9CC,6BAA6B,CAAC;IAC7BC,eAAe,EAAEZ,WAAW;IAC5Ba,eAAe,EAAEd;EACnB,CAAC,CAAC,CACDe,OAAO,CAAC,CAAC;EAEZ,MAAMC,OAAO,GAAGN,qBAAqB,CAAC,CAAC,CAAC,CAACO,cAAc,CAACC,MAAM,CAC5DC,yBAAe,EACf,CAAC,CACH,CAAC;EACD,MAAMC,OAAO,GAAGjB,QAAQ,CAACe,MAAM,CAACC,yBAAe,EAAE,CAAC,CAAC,CAAC;EAEpD,MAAME,YAAY,GAAGC,MAAM,CAACC,IAAI,CAACH,OAAO,CAAC,CAACI,IAAI,CAC3CC,GAAG,IAAK,CAACT,OAAO,CAACS,GAAG,CAAC,IAAIT,OAAO,CAACS,GAAG,CAAC,CAACnB,KAAK,KAAKc,OAAO,CAACK,GAAG,CAAC,CAACnB,KAChE,CAAC;EAED,IAAI,CAACe,YAAY,EAAE;IACjB;EACF;EAEA,MAAMV,cAAS,CACZe,iBAAiB,CAAC;IACjBb,eAAe,EAAEZ,WAAW;IAC5BgB,cAAc,EAAEd;EAClB,CAAC,CAAC,CACDY,OAAO,CAAC,CAAC;EACZ,MAAM,IAAAY,yBAAe,EAAC7B,MAAM,EAAE,IAAI,CAAC;AACrC","ignoreList":[]}
+{"version":3,"file":"certificates.js","sourceRoot":"","sources":["../src/certificates.ts"],"names":[],"mappings":";;AAMA,kDAsEC;AA5ED,+BAAkC;AAClC,mCAAgC;AAChC,2CAA8C;AAC9C,2CAA8C;AAGvC,KAAK,UAAU,mBAAmB,CACvC,MAAiB,EACjB,cAAuB;IAEvB,MAAM,EACJ,GAAG,EACH,WAAW,EACZ,GAAG,IAAA,aAAK,EAAC,MAAM,CAAC,CAAC;IAElB,MAAM,QAAQ,GAAG,CAAC;YAChB,SAAS,EAAE,wBAAwB;YACnC,UAAU,EAAE,oBAAoB;YAChC,KAAK,EAAE,cAAc;SACtB,EAAE;YACD,SAAS,EAAE,wBAAwB;YACnC,UAAU,EAAE,gBAAgB;YAC5B,KAAK,EAAE,SAAS;SACjB,EAAE;YACD,SAAS,EAAE,wBAAwB;YACnC,UAAU,EAAE,iBAAiB;YAC7B,KAAK,EAAE,MAAM;SACd,EAAE;YACD,SAAS,EAAE,wBAAwB;YACnC,UAAU,EAAE,UAAU;YACtB,KAAK,EAAE,OAAO;SACf;QACD,cAAc;QACd;YACE,SAAS,EAAE,wBAAwB;YACnC,UAAU,EAAE,WAAW;YACvB,KAAK,EAAE,qCAAqC;SAC7C;KACA,CAAC;IAEF,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC;IAEtC,gEAAgE;IAChE,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrC,OAAO;IACT,CAAC;IACD,MAAM,EAAE,qBAAqB,EAAE,GAAG,MAAM,eAAS;SAChD,6BAA6B,CAAC;QAC7B,eAAe,EAAE,WAAW;QAC5B,eAAe,EAAE,GAAG;KACrB,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,qBAAqB,EAAE,qBAAqB,CAAC,CAAA;IAEjE,MAAM,WAAW,GAAG,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAG,CAAC,CAAC,CAAC;IAC/C,MAAM,OAAO,GAAG,WAAY,CAAC,cAAe,CAAC,MAAM,CACjD,2BAAe,EACf,EAAwB,CACzB,CAAC;IAEF,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,2BAAe,EAAE,EAAE,CAAC,CAAC;IAErD,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAC5C,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,CACpE,CAAC;IAEF,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO;IACT,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,uCAAuC,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAA;IAEnF,MAAM,eAAS;SACZ,iBAAiB,CAAC;QACjB,eAAe,EAAE,WAAW;QAC5B,cAAc,EAAE,QAAQ;KACzB,CAAC,CAAC;IACL,MAAM,IAAA,2BAAe,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACtC,CAAC"}