sumomo 0.8.17 → 0.8.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 861b39ec9371ce0ecf43abc366deedd675c34e38e3489712797acb7231361c54
-  data.tar.gz: a5411af6f6cb532a72c80ca5cf575e0ba5a2f1cce9ef7742e4a9d50ebfb704c6
+  metadata.gz: 35f25db9aa077d872665229ae4c73d9ca26756b1dd321c50fc5d71e42d091227
+  data.tar.gz: 6dd294034dcca5b060397c3452b144484cf017448c73a5f73e9b1f93d4fd4596
 SHA512:
-  metadata.gz: 948c3afa11295e67d58e4c487be8fd296026ff392f5da3c50d9c718875524c47dfeb76cea0ec00a6fc436844800aeea6a59d5d559193bc3016428e285d14d659
-  data.tar.gz: 07f8164e9b86b8dcce2c50f9bec120078cb5cf2acf7b6a37e489972309e3e3aab6a55aba2bac70f057d8bde06e25f7c43d1bff0e793edc6eaf0b4e8b5989aef1
+  metadata.gz: b6d83f89c5ff4f4a5b2a76dad74234faa148c38104e4155f34978aa072ee977d641b4084bdb5b31c5e501ef75747f6a14dbe92e117d2b085dc32591d36932e85
+  data.tar.gz: 7336f10b0bf428c5c327d14d9e12c33c5a02373cda72109cc17dadfcc8d47d7b55f0a183576d3896cfddcbbefea14a6bcd15ba3cadfe0e5b67394383800e2d55

data/data/sumomo/custom_resources/VPCDestroyENI.js

@@ -0,0 +1,70 @@
+var ec2 = new aws.EC2();
+function success()
+{
+  Cloudformation.send(
+    request,
+    context,
+    Cloudformation.SUCCESS,
+    {},
+    "Success",
+    request.ResourceProperties.SecurityGroups.join(','));
+}
+
+function fail(err)
+{
+  console.log('Errored.');
+  console.log(err);
+  Cloudformation.send(
+    request,
+    context,
+    Cloudformation.FAILED,
+    {},
+    "Error: " + err
+  );
+}
+
+if (request.RequestType == "Create")
+{
+  success()
+}
+
+if (request.RequestType == "Update")
+{
+  success()
+}
+
+if (request.RequestType == "Delete")
+{
+  var params = {
+    Filters: [
+      {
+        Name: 'group-id',
+        Values: request.ResourceProperties.SecurityGroups
+      },
+      {
+        Name: 'description',
+        Values: ['AWS Lambda VPC ENI: *']
+      }
+    ]
+  };
+  console.log("Deleting attachments!");
+
+  // Detach all network-interface attachments
+  ec2.describeNetworkInterfaces(params).promise().then(function(data) {
+    console.log("Got Interfaces:\n", JSON.stringify(data));
+    return Promise.all(data.NetworkInterfaces.map(function(networkInterface) {
+      var networkInterfaceId = networkInterface.NetworkInterfaceId;
+      var attachmentId = networkInterface.Attachment.AttachmentId;
+      return ec2.detachNetworkInterface({AttachmentId: attachmentId}).promise().then(function(data) {
+        return ec2.waitFor('networkInterfaceAvailable', {NetworkInterfaceIds: [networkInterfaceId]}).promise();
+      }).then(function(data) {
+        console.log("Detached Interface, deleting:\n", networkInterfaceId);
+        return ec2.deleteNetworkInterface({NetworkInterfaceId: networkInterfaceId}).promise();
+      });
+    }));
+  }).then(function(data) {
+    success()
+  }).catch(function(err) {
+    fail(err)
+  });
+}

data/exe/sumomo

@@ -62,7 +62,7 @@ cmd_opts = case cmd
               gsub(/(.{64}) /, "\\1\n")
              File.write('key.pem', key)
              `chmod 0600 key.pem`
-             exec "ssh -i 'key.pem' ec2-user@#{ARGV[1]} #{ARGV[2]}"
+             exec "ssh -i -hostkey=* 'key.pem' ec2-user@#{ARGV[1]} #{ARGV[2]}"
 
            when 'testapi'
              local_opts = Trollop.options do

data/lib/sumomo/ec2.rb

@@ -268,7 +268,7 @@ module Sumomo
       docker_password: '',
       eip: nil,
       policies: [],
-      scalein_protection: true,
+      scalein_protection: false,
       &block
     )
 

data/lib/sumomo/stack.rb

@@ -64,6 +64,10 @@ module Sumomo
           VpcId network.vpc
         end
 
+        make 'Custom::VPCDestroyENI' do
+          SecurityGroups [lambda_sec_group]
+        end
+
         subnetids = network.subnets[layer].map { |x| x[:name] }
         vpcconfig = {
           SecurityGroupIds: [lambda_sec_group],
@@ -84,10 +88,22 @@ module Sumomo
         Runtime runtime
         Timeout timeout
         Role role.Arn
-        VpcConfig vpcconfig unless vpcconfig.nil?
+        
         Environment do
           Variables env
         end
+
+        if !vpcconfig.nil?
+          VpcConfig vpcconfig
+
+          vpcconfig[:SecurityGroupIds].each do |x|
+            depends_on x
+          end
+
+          vpcconfig[:SubnetIds].each do |x|
+            depends_on x
+          end
+        end
       end
 
       if enable_logging

data/lib/sumomo/version.rb

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

data/lib/sumomo.rb

@@ -117,10 +117,11 @@ module Sumomo
       stack_name: name,
       template_url: store.url('cloudformation/template'),
       parameters: hidden_values,
-      disable_rollback: false,
       capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM']
     }
 
+    update_options[disable_rollback] = false if !changeset
+
     begin
       if changeset
         cf.create_change_set(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sumomo
 version: !ruby/object:Gem::Version
-  version: 0.8.17
+  version: 0.8.20
 platform: ruby
 authors:
 - David Siaw
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-16 00:00:00.000000000 Z
+date: 2022-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -2556,6 +2556,7 @@ files:
 - data/sumomo/custom_resources/OriginAccessIdentity.js
 - data/sumomo/custom_resources/SelectSpot.js
 - data/sumomo/custom_resources/TempS3Bucket.js
+- data/sumomo/custom_resources/VPCDestroyENI.js
 - data/sumomo/sources/spot-watcher-poller.sh
 - data/sumomo/sources/spot-watcher.sh
 - exe/sumomo