sumomo 0.8.14 → 0.8.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14cea3c6a1850dccbf4f44fc0de5aac2f55082d2d881bd6b09486715b1514629
-  data.tar.gz: 2e8b573a332ba356006ee19f00cc92150faf04ad0b4bd05e1515f6ad150532d7
+  metadata.gz: 4b360df868147cde0facdac9c5ff2f76944db409ce8eb0fd8b0e9e4544b8d3fb
+  data.tar.gz: 720f37705fc0f3d7f7555c3f9465229ed50472b75350671a6a163e2084fa9f94
 SHA512:
-  metadata.gz: 0c12ab52d9b883043cc9aa335ca2ce44420061c328831708c25a7a66f76289e7e913dc8c09b271e33067fbe2a9c98bc43403830ffbadadb3831b75529f5dcf27
-  data.tar.gz: 21bc6b234abed78dc5effb72cf516200b5ae9a1f104bcbc22b629c9df5ed8a702ba8142063bc2e950b6fea86b026da00c731d4a556c281c55b4e6d23b7b7c435
+  metadata.gz: 397367ad6b32f8a982e22e7c4d43fa111e152c676a49f4b0fe328aab5ac865be88cb22c9a8c8b67a103f70e2a48dc3576c1e9ad38f848b25b328bae9bd1bf47c
+  data.tar.gz: 455ae961e13af305fcc9f3b4ac29036837fa39c97a2cf8c8ec9bcaf190bd1bb7cd7b94ef9d564d57feef5d647e0fc7796f5178b7cf479d96b3afeaf42256131e

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/api.rb

@@ -163,10 +163,13 @@ module Sumomo
         domain_name,
         name:,
         script: nil,
+        env: {},
         dns: nil,
         cert: nil,
         mtls_truststore: nil,
         logging: true,
+        network: nil,
+        layer: nil,
         with_statements: [], &block)
 
       api = make 'AWS::ApiGateway::RestApi', name: name do
@@ -221,6 +224,9 @@ module Sumomo
 
       fun = make_lambda(
         name: "#{name}Lambda#{@version_number}",
+        env: env,
+        network: network,
+        layer: layer,
         files: files, 
         role: custom_resource_exec_role(with_statements: with_statements) )
 

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/stack.rb

@@ -24,8 +24,11 @@ module Sumomo
                     function_key: "cloudformation/lambda/function_#{name}",
                     handler: 'index.handler',
                     runtime: 'nodejs14.x',
+                    env: {},
                     memory_size: 128,
                     timeout: 30,
+                    network: nil,
+                    layer: nil,
                     enable_logging: true,
                     role: nil)
 
@@ -45,6 +48,29 @@ module Sumomo
         end
       end
 
+      vpcconfig = nil
+
+      if network != nil
+
+        layer ||= network.subnets.keys.first
+
+        ingress = [allow_port(:all)]
+        egress = [allow_port(:all)]
+
+        lambda_sec_group = make 'AWS::EC2::SecurityGroup' do
+          GroupDescription "Lambda Security group for layer: #{layer}"
+          SecurityGroupIngress ingress
+          SecurityGroupEgress egress
+          VpcId network.vpc
+        end
+
+        subnetids = network.subnets[layer].map { |x| x[:name] }
+        vpcconfig = {
+          SecurityGroupIds: [lambda_sec_group],
+          SubnetIds: subnetids
+        }
+      end
+
       @store.set_raw(function_key, stringio.string)
 
       stack = self
@@ -58,6 +84,10 @@ module Sumomo
         Runtime runtime
         Timeout timeout
         Role role.Arn
+        VpcConfig vpcconfig unless vpcconfig.nil?
+        Environment do
+          Variables env
+        end
       end
 
       if enable_logging

data/lib/sumomo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sumomo
-  VERSION = '0.8.14'
+  VERSION = '0.8.16'
 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.16
 platform: ruby
 authors:
 - David Siaw
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2022-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler