sumomo 0.8.9 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85ea8b9717493794761cd6651e7595ea4056994972508fd8af43965852a7a653
-  data.tar.gz: 5ceac9bf30af9b4e632a680bb0c414daca770b05c35ed5fd1aa29700f5227a51
+  metadata.gz: 44594639cdb423778a130d3debb64caa315d70a6a983a4a5b5fb7b6ed67793f5
+  data.tar.gz: 7f6bfa09705119de6682275516395b89362b50aa491e5e48ee64709cd55c8e17
 SHA512:
-  metadata.gz: cdf4b4055e84d51971a94a479830bb3cc5e8bfdab565fec391db7bca5426e720489b5a7f95e4da899c2a9ebfead5ea120e2873efb544f38c549b53584cf668f9
-  data.tar.gz: d819e57bec186f3e3c08a54b50f379ade66b9e9cc5e4b362ba427e0c12ac85a0ddcde969d9aa2ee89b407fd41a42c16679559a9448df92a426c2b898287d2766
+  metadata.gz: a336692e9a46532499c5bb4c64dcab1a8c0e485dba942090c707f07dae3c888c542d93a7e012187dae0013d564c1348e6e17061fb4e394a302aea4833c78ce0b
+  data.tar.gz: 85927305c489ef72b87a271caddde2fd09696a9dee63f2bbbbd96724f587238195458080285820868a1d2df8f7fdfb73d8dfce3e4689cdb9865349374b559634

data/exe/sumomo

@@ -34,7 +34,7 @@ cmd_opts = case cmd
              local_opts = Trollop.options do
                opt :filename, 'File that describes the stack', type: :string, default: 'Sumomofile'
              end
-             Sumomo.create_stack(name: ARGV[0], region: global_opts[:region]) do
+             Sumomo.send("#{cmd}_stack", name: ARGV[0], region: global_opts[:region]) do
                proc = proc {}
                eval File.read(local_opts[:filename]), proc.binding, local_opts[:filename]
              end
@@ -49,7 +49,7 @@ cmd_opts = case cmd
              key = JSON.parse(File.read('x.txt'))['value']
              File.write('key.pem', key)
              `chmod 0600 key.pem`
-             exec "ssh -i 'key.pem' ec2-user@#{ARGV[1]}"
+             exec "ssh -i 'key.pem' ec2-user@#{ARGV[1]} #{ARGV[2]}"
 
            when 'testapi'
              local_opts = Trollop.options do

data/lib/sumomo.rb

@@ -26,6 +26,16 @@ module Sumomo
     "cloudformation/#{make_master_key_name(name: name)}.pem"
   end
 
+  def self.create_stack(name:, region:, sns_arn: nil, &block)
+    cf = Aws::CloudFormation::Client.new(region: region)
+    begin
+      cf.describe_stacks(stack_name: name)
+      raise "There is already a stack named '#{name}'"
+    rescue Aws::CloudFormation::Errors::ValidationError
+      update_stack(name: name, region: region, sns_arn: sns_arn, &block)
+    end
+  end
+
   def self.update_stack(name:, region:, sns_arn: nil, &block)
     cf = Aws::CloudFormation::Client.new(region: region)
     s3 = Aws::S3::Client.new(region: region)
@@ -249,6 +259,4 @@ module Sumomo
 
     map
   end
-
-  singleton_class.send(:alias_method, :create_stack, :update_stack)
 end

data/lib/sumomo/ec2.rb

@@ -254,6 +254,7 @@ module Sumomo
       has_public_ips: true,
       ingress: nil,
       egress: nil,
+      security_groups: [],
       machine_tag: nil,
       ec2_sns_arn: nil,
       ami_name: nil,
@@ -297,10 +298,12 @@ module Sumomo
 
       bucket_name = @bucket_name
 
-      script += "\n#{task_script}\n"
+      script_arr = [script]
+
+      script_arr << task_script
 
       if ecs_cluster
-        script += <<~ECS_START
+        script_arr << <<~ECS_START
 
           yum update
           yum groupinstall "Development Tools"
@@ -318,12 +321,12 @@ module Sumomo
       end
 
       if eip
-        script += <<~EIP_ALLOCATE
+        script_arr << <<~EIP_ALLOCATE
           aws ec2 associate-address --region `cat /etc/aws_region` --instance-id `curl http://169.254.169.254/latest/meta-data/instance-id` --allocation-id `cat /etc/eip_allocation_id`
         EIP_ALLOCATE
       end
 
-      script += "\nservice spot-watcher start" if spot_price && ec2_sns_arn
+      script_arr << "service spot-watcher start" if(spot_price && ec2_sns_arn)
 
       unless ingress.is_a? Array
         raise 'ec2: ingress option needs to be an array'
@@ -339,7 +342,7 @@ module Sumomo
 
       wait_handle = make 'AWS::CloudFormation::WaitConditionHandle'
 
-      user_data = initscript(wait_handle, name, script)
+      user_data = initscript(wait_handle, name, call('Fn::Join', "\n", script_arr))
 
       role_policy_doc = {
         'Version' => '2012-10-17',
@@ -407,7 +410,7 @@ module Sumomo
       launch_config = make 'AWS::AutoScaling::LaunchConfiguration' do
         AssociatePublicIpAddress has_public_ips
         KeyName keypair
-        SecurityGroups [web_sec_group]
+        SecurityGroups [web_sec_group] + security_groups
         ImageId ami_name
         UserData user_data
         InstanceType type

data/lib/sumomo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sumomo
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.10
 platform: ruby
 authors:
 - David Siaw
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2021-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -2548,7 +2548,7 @@ homepage: https://github.com/davidsiaw/sumomo
 licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -2563,8 +2563,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: An advanced infrastructure description language for AWS
 test_files: []