sumomo 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c26b0a3b7272251c44640055c93cd3e985c47d60abb14a14f50584eda5b65184
-  data.tar.gz: c08fc6ccc59a029ab43ef96c4e2a5e687189300998aaa34b9fd417c276339488
+  metadata.gz: d12954eb075b3c25afec4ba1455de77317d36ccbd2c4a79ad54657f1d130688f
+  data.tar.gz: f4c056344d60a16fbc66892ba9573c5b60658ea66b4e23588e7b179d58546cf3
 SHA512:
-  metadata.gz: '08aa5eda9cc8144d2c5df4ba8622f65bef1f2f66ae54e30538afe8e943325ffcbd1e151bef541d58e47637e64fa759e405e9b4b3011038340ccc720b595cd301'
-  data.tar.gz: b74848ddce1200d78c020e56ff0fcff3625fe22b6195b8167ad6338bc66449e5fb1613f96042a4497f962e6e764a4b68a61eb2703610c1844e0da2df3897bed4
+  metadata.gz: be41e7ed63492155a08c6ce68c16f66952e11d52b66d3d886d240a4946fd64d9203d19815630fba2ca24034e6f1bda2847070741457f1143f8ce4238301c0de3
+  data.tar.gz: 572f764ae21888889ff48fdae709648d3df0c41242e878fb884a7c8f9df28ce8432cbcf77f2935dbbdfe2ed1d7620608d072dcb7d1af1c13d3fbfc0da07928e9

data/data/sumomo/custom_resources/Echo.js

@@ -0,0 +1,25 @@
+function success()
+{
+  Cloudformation.send(
+    request,
+    context,
+    Cloudformation.SUCCESS,
+    {},
+    "Success",
+    request.ResourceProperties.Value);
+}
+
+if (request.RequestType == "Create")
+{
+  success()
+}
+
+if (request.RequestType == "Update")
+{
+  success()
+}
+
+if (request.RequestType == "Delete")
+{
+  success()
+}

data/data/sumomo/custom_resources/TempS3Bucket.js

@@ -4,7 +4,7 @@ var copy_from_dir = request.ResourceProperties.CopyFromDirectory;
 var copy_from_bucket = request.ResourceProperties.CopyFromBucket;
 var success_obj = {
   Arn: "arn:aws:s3:::" + name,
-  DomainName: name + ".s3.amazonaws.com"
+  DomainName: name + ".s3-" + request.ResourceProperties.Region + ".amazonaws.com"
 }
 var error_extra = "";
 
@@ -74,7 +74,12 @@ function copy_files(success, fail)
 
 function create_bucket(name, success, fail)
 {
-  var create_params = { Bucket: name };
+  var create_params = {
+    Bucket: name,
+    CreateBucketConfiguration: {
+      LocationConstraint: request.ResourceProperties.Region
+    }
+  };
 
   s3.createBucket(create_params, function(err, data)
   {

data/data/sumomo/custom_resources/USEastCertificate.js

@@ -1,5 +1,7 @@
 var acm = new aws.ACM({region: "us-east-1"}); // MUST be us-east-1.
 
+var return_properties = {};
+
 function extractRootDomain(domain)
 {
   var splitArr = domain.split('.');
@@ -15,39 +17,46 @@ function extractRootDomain(domain)
 
 function wait_for_approval(domain_name, on_success, on_fail)
 {
-  setTimeout(function()
+  get_domain(domain_name, function(data)
   {
-    get_domain(domain_name, function(data)
-    {
-      var params = {
-        CertificateArn: data.arn
-      };
-      acm.describeCertificate(params, function(err, cert_data) {
-        if (err)
+    var params = {
+      CertificateArn: data.arn
+    };
+
+    acm.describeCertificate(params, function(err, cert_data) {
+      if (err)
+      {
+        on_fail(err);
+      }
+      else
+      {
+        // Do not wait if we requested DNS validation        
+        if (request.ResourceProperties.ValidationMethod === "DNS")
+        {
+          return_properties.RecordName = cert_data.Certificate.DomainValidationOptions[0].ResourceRecord.Name;
+          return_properties.RecordType = cert_data.Certificate.DomainValidationOptions[0].ResourceRecord.Type;
+          return_properties.RecordValue = cert_data.Certificate.DomainValidationOptions[0].ResourceRecord.Value;
+          return on_success(data.arn);
+        }
+
+        if (cert_data.Certificate.DomainValidationOptions[0].ValidationStatus === "SUCCESS")
+        {
+          on_success(data.arn);
+        }
+        else if (cert_data.Certificate.DomainValidationOptions[0].ValidationStatus === "FAILED")
         {
-          on_fail(err);
+          on_fail("Verification Failed");
         }
         else
         {
-          if (cert_data.Certificate.DomainValidationOptions[0].ValidationStatus === "SUCCESS")
-          {
-            on_success(data.arn);
-          }
-          else if (cert_data.Certificate.DomainValidationOptions[0].ValidationStatus === "FAILED")
-          {
-            on_fail("Verification Failed");
-          }
-          else
+          setTimeout(function()
           {
             wait_for_approval(domain_name, on_success, on_fail);
-          }
+          }, 3000);
         }
-      });
-
-    }, on_fail);
-
-
-  }, 3000);
+      }
+    });
+  }, on_fail);
 }
 
 function create(domain_name, on_success, on_fail)
@@ -62,6 +71,11 @@ function create(domain_name, on_success, on_fail)
     ]
   }
 
+  if (request.ResourceProperties.ValidationMethod === "DNS")
+  {
+    params.ValidationMethod = "DNS";
+  }
+
   console.log("Requesting Cert");
   acm.requestCertificate(params, function(err, data)
   {
@@ -129,12 +143,11 @@ function fail(err)
   Cloudformation.send(request, context, Cloudformation.FAILED, {}, "Error: " + err);
 }
 
-
 if (request.RequestType == "Create")
 {
   create(request.ResourceProperties.DomainName, function(data)
   {
-    Cloudformation.send(request, context, Cloudformation.SUCCESS, {}, "Success", data);
+    Cloudformation.send(request, context, Cloudformation.SUCCESS, return_properties, "Success", data);
   }, fail);
 }
 
@@ -144,14 +157,14 @@ if (request.RequestType == "Update")
   {
     create(request.ResourceProperties.DomainName, function(data)
     {
-      Cloudformation.send(request, context, Cloudformation.SUCCESS, {}, "Success", data);
+      Cloudformation.send(request, context, Cloudformation.SUCCESS, return_properties, "Success", data);
     }, fail);
   }
   else
   {
     get_domain(function(data)
     {
-      Cloudformation.send(request, context, Cloudformation.SUCCESS, {}, "Success", data.arn);
+      Cloudformation.send(request, context, Cloudformation.SUCCESS, return_properties, "Success", data.arn);
     }, fail);
   }
 }
@@ -160,10 +173,10 @@ if (request.RequestType == "Delete")
 {
   destroy(request.ResourceProperties.DomainName, function()
   {
-    Cloudformation.send(request, context, Cloudformation.SUCCESS, {}, "Success", "(deleted)");
+    Cloudformation.send(request, context, Cloudformation.SUCCESS, return_properties, "Success", "(deleted)");
   }, 
   function()
   {
-    Cloudformation.send(request, context, Cloudformation.SUCCESS, {}, "Success", "(don't care)");
+    Cloudformation.send(request, context, Cloudformation.SUCCESS, return_properties, "Success", "(don't care)");
   });
 }

data/data/sumomo/custom_resources/USEastCertificateWaiter.js

@@ -0,0 +1,60 @@
+var acm = new aws.ACM({region: "us-east-1"}); // MUST be us-east-1.
+
+var arn = request.ResourceProperties.Certificate;
+
+function wait_for_approval(on_success, on_fail)
+{
+  var params = {
+    CertificateArn: arn
+  };
+
+  acm.describeCertificate(params, function(err, cert_data) {
+    if (err)
+    {
+      on_fail(err);
+    }
+    else
+    {
+      if (cert_data.Certificate.DomainValidationOptions[0].ValidationStatus === "SUCCESS")
+      {
+        on_success();
+      }
+      else if (cert_data.Certificate.DomainValidationOptions[0].ValidationStatus === "FAILED")
+      {
+        on_fail("Verification Failed");
+      }
+      else
+      {
+        setTimeout(function()
+        {
+          wait_for_approval(on_success, on_fail);
+        }, 3000);
+      }
+    }
+  });
+}
+
+function fail(err)
+{
+  Cloudformation.send(request, context, Cloudformation.FAILED, {}, "Error: " + err);
+}
+
+function success()
+{
+  Cloudformation.send(request, context, Cloudformation.SUCCESS, {}, "Success");
+}
+
+if (request.RequestType == "Create")
+{
+  wait_for_approval(success, fail);
+}
+
+if (request.RequestType == "Update")
+{
+  wait_for_approval(success, fail);
+}
+
+if (request.RequestType == "Delete")
+{
+  success();
+}

data/lib/sumomo.rb

@@ -80,6 +80,7 @@ module Sumomo
       @s3 = s3
       @has_dummy = true
       @dummy_vpc = nil
+      @timeout = nil
 
       instance_eval(&block)
 
@@ -113,7 +114,7 @@ module Sumomo
       cf.update_stack(update_options)
     rescue StandardError => e
       if e.message.end_with? 'does not exist'
-        update_options[:timeout_in_minutes] = 30
+        update_options[:timeout_in_minutes] = @timeout if @timeout
         update_options[:notification_arns] = sns_arn if sns_arn
         cf.create_stack(update_options)
       else

data/lib/sumomo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sumomo
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - David Siaw
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-06 00:00:00.000000000 Z
+date: 2019-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -2521,11 +2521,13 @@ files:
 - data/sumomo/custom_resources/AvailabilityZones.js
 - data/sumomo/custom_resources/CloudflareDNSEntry.js
 - data/sumomo/custom_resources/DeployTime.js
+- data/sumomo/custom_resources/Echo.js
 - data/sumomo/custom_resources/ListLength.js
 - data/sumomo/custom_resources/OriginAccessIdentity.js
 - data/sumomo/custom_resources/SelectSpot.js
 - data/sumomo/custom_resources/TempS3Bucket.js
 - data/sumomo/custom_resources/USEastCertificate.js
+- data/sumomo/custom_resources/USEastCertificateWaiter.js
 - data/sumomo/sources/spot-watcher-poller.sh
 - data/sumomo/sources/spot-watcher.sh
 - exe/sumomo