sumomo 0.8.14 → 0.8.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14cea3c6a1850dccbf4f44fc0de5aac2f55082d2d881bd6b09486715b1514629
-  data.tar.gz: 2e8b573a332ba356006ee19f00cc92150faf04ad0b4bd05e1515f6ad150532d7
+  metadata.gz: 2d31828749cf57f094afad4100d0a2c41e1e23db623f4d83c7af92ea09973a2b
+  data.tar.gz: 2651d1c3f796f9153199aee4077f7f5ee3aa2c65d35fa764d01309fc90e7b117
 SHA512:
-  metadata.gz: 0c12ab52d9b883043cc9aa335ca2ce44420061c328831708c25a7a66f76289e7e913dc8c09b271e33067fbe2a9c98bc43403830ffbadadb3831b75529f5dcf27
-  data.tar.gz: 21bc6b234abed78dc5effb72cf516200b5ae9a1f104bcbc22b629c9df5ed8a702ba8142063bc2e950b6fea86b026da00c731d4a556c281c55b4e6d23b7b7c435
+  metadata.gz: ea85e42594b8bd2c22396d9904277b97307256335f1a2a95c397ecd5cde7b90a2fdbd4a909576080d5e371c2d7130c7c5f3043d6e0086d7a8fbd965b6e7ad700
+  data.tar.gz: f963dd40b6a1ba5a4de069310d6c44e1d55254008093bbc7933ad37096e797b8a10faabc0936b6c591f6bea85a9ac80bb9f3862b33315b8bc7825c5921dd64ac

data/data/sumomo/custom_resources/ACMCertificate.js

@@ -4,6 +4,8 @@ var acm = new aws.ACM({region: cert_region});
 
 var return_properties = {};
 
+var retries = 0;
+
 function extractRootDomain(domain)
 {
   var splitArr = domain.split('.');
@@ -12,26 +14,55 @@ function extractRootDomain(domain)
   //extracting the root domain here
   if (arrLen > 2)
   {
-      domain = splitArr[arrLen - 2] + '.' + splitArr[arrLen - 1];
+      domain = splitArr.slice(1).join(".");
   }
   return domain;
 }
 
 function wait_for_approval(domain_name, on_success, on_fail)
 {
+  console.log('read domain: ', domain_name);
   get_domain(domain_name, function(data)
   {
+    console.log('loaded domain data: ');
+    console.log(data);
+
     var params = {
       CertificateArn: data.arn
     };
 
     acm.describeCertificate(params, function(err, cert_data) {
+      console.log('received certificate data');
+      console.log(cert_data);
+      console.log(cert_data.Certificate.DomainValidationOptions);
+      console.log(cert_data.Certificate.DomainValidationOptions[0]);
+
+
       if (err)
       {
         on_fail(err);
       }
       else
       {
+        if (!cert_data.Certificate.DomainValidationOptions[0].ResourceRecord)
+        {
+          // damn AWS now does not return this information immediately
+          // and we have to wait for it.
+          return setTimeout(function()
+          {
+            console.log('no ResourceRecord found, retrying...', "attempts:", retries);
+            if (retries < 60)
+            {
+              wait_for_approval(domain_name, on_success, on_fail);
+              retries += 1;
+            }
+            else
+            {
+              on_fail('AWS did not return ResourceRecord. (AWS issue)');
+            }
+            
+          }, 1000);
+        }
         // Do not wait if we requested DNS validation        
         if (request.ResourceProperties.ValidationMethod === "DNS")
         {

data/data/sumomo/custom_resources/ACMCertificateWaiter.js

@@ -11,6 +11,8 @@ function wait_for_approval(on_success, on_fail)
   };
 
   acm.describeCertificate(params, function(err, cert_data) {
+    console.log('describe certificate data');
+    console.log(cert_data);;
     if (err)
     {
       on_fail(err);
@@ -38,6 +40,8 @@ function wait_for_approval(on_success, on_fail)
 
 function fail(err)
 {
+  console.log('Errored.');
+  console.log(err);
   Cloudformation.send(request, context, Cloudformation.FAILED, {}, "Error: " + err);
 }
 

data/lib/sumomo/ec2.rb

@@ -268,6 +268,7 @@ module Sumomo
       docker_password: '',
       eip: nil,
       policies: [],
+      scalein_protection: true,
       &block
     )
 
@@ -464,6 +465,8 @@ module Sumomo
 
         VPCZoneIdentifier subnet_ids
 
+        NewInstancesProtectedFromScaleIn scalein_protection
+
         LaunchConfigurationName launch_config
         LoadBalancerNames [elb] if elb
 

data/lib/sumomo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sumomo
-  VERSION = '0.8.14'
+  VERSION = '0.8.15'
 end

data/lib/sumomo.rb

@@ -118,7 +118,7 @@ module Sumomo
       template_url: store.url('cloudformation/template'),
       parameters: hidden_values,
       disable_rollback: false,
-      capabilities: ['CAPABILITY_IAM']
+      capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM']
     }
 
     begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sumomo
 version: !ruby/object:Gem::Version
-  version: 0.8.14
+  version: 0.8.15
 platform: ruby
 authors:
 - David Siaw
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2022-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler