sumomo 0.10.0 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 346a647def575daedb5dc3e3eba04a73024c441be3ae92740cf9edb668992e44
-  data.tar.gz: 379cbf589f7ace6b8da717054ab71754604ed6b863808aadf3b6996a18df292f
+  metadata.gz: 7438e8125e7b38488797c60d301417efc9ffba234848ae101e25df6bd663d23c
+  data.tar.gz: 2d0fa2741b9e03230d72a56e9b29dffeedf685792423606b2ec10cbe0743822c
 SHA512:
-  metadata.gz: a0cd59b9b12bf2ec4e1b968f37962c505e9c9e6b7e47ed8846ad7af3737c162f5947bd4e01bfa1cdddfd4d347c378803db10c25ceadf56c5d7d31e0cecbe6b26
-  data.tar.gz: ed8757d5ca20a22791c1ded35a453ffd00f51260e6f5a96fb38adc9cc55df4617d30dbfa4a83bad353d2758bdc1232f51183e1bdbf09591c6142f6e92d98ff84
+  metadata.gz: 70f9ffcc5462638f922f862c7388c0347a649a2d384824438e05e7e2f4ae388c3ce521221a16b4935e80bcaaa0d1f29039eecc4ae6df77ae7468065acb1d7c51
+  data.tar.gz: 346d98d824627a7dd7c66a766faffa38996663945f0a8488d7465fa87f4458b42f5d081e2b9be49f73ea093de7e77be2f414536e704c531aca8bb6b3777c0203

data/exe/sumomo

@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'trollop'
+require 'optimist'
 require 'sumomo'
 require 'yaml'
 
 SUB_COMMANDS = %w[delete create update outputs show diff testapi].freeze
-global_opts = Trollop.options do
+global_opts = Optimist.options do
   banner <<-USAGE
   Sumomo v#{Sumomo::VERSION}
 
@@ -26,49 +26,67 @@ p ENV['AWS_PROFILE']
 
 cmd = ARGV.shift # get the subcommand
 
-cmd_opts = case cmd
-           when 'delete'
-             Sumomo.delete_stack(name: ARGV[0], region: global_opts[:region])
-
-           when 'create', 'update', 'show', 'diff'
-             local_opts = Trollop.options do
-               opt :filename, 'File that describes the stack', type: :string, default: 'Sumomofile'
-               opt :changeset, 'Create a changeset instead of directly update', type: :boolean, default: false
-             end
-             Sumomo.manage_stack(name: ARGV[0], cmd: cmd, changeset: !!local_opts[:changeset], region: global_opts[:region]) do
-               proc = proc {}
-               eval File.read(local_opts[:filename]), proc.binding, local_opts[:filename]
-             end
-
-           when 'outputs'
-             puts "Outputs for stack #{ARGV[0]}"
-             puts Sumomo.get_stack_outputs(name: ARGV[0], region: global_opts[:region]).to_yaml
-
-           when 'login'
-             puts "Login to stack #{ARGV[0]} instance at #{ARGV[1]}"
-             `aws s3 cp s3://#{ARGV[0]}/cloudformation/#{ARGV[0]}_master_key.pem x.txt`
-             key = JSON.parse(File.read('x.txt'))['value'].
-              gsub('-----BEGIN RSA PRIVATE KEY----- ', "-----BEGIN RSA PRIVATE KEY-----\n").
-              gsub(' -----END RSA PRIVATE KEY-----', "\n-----END RSA PRIVATE KEY-----").
-              gsub(/(.{64}) /, "\\1\n")
-             File.write('key.pem', key)
-             `chmod 0600 key.pem`
-             exec "ssh -i 'key.pem' ec2-user@#{ARGV[1]} #{ARGV[2]}"
-
-           when 'testapi'
-             local_opts = Trollop.options do
-               opt :filename, 'File that describes the stack', type: :string, default: 'Sumomofile'
-               opt :apiname, 'Name of the API you want to test', type: :string
-               opt :prettyprint, 'Test API outputs JSON with nice indentation', type: :boolean, default: true
-             end
-             puts 'API Test Mode'
-             Sumomo.test_api(local_opts[:apiname], local_opts[:prettyprint]) do
-               proc = proc {}
-               eval File.read(local_opts[:filename]), proc.binding, local_opts[:filename]
-             end
-             exit(0)
-           else
-             Trollop.die "Unknown subcommand #{cmd.inspect}"
+case cmd
+  when 'delete'
+    Sumomo.delete_stack(name: ARGV[0], region: global_opts[:region])
+
+  when 'rollback'
+    Sumomo.rollback_stack(name: ARGV[0], region: global_opts[:region])
+
+  when 'create', 'update', 'show', 'diff'
+    local_opts = Optimist.options do
+      opt :filename, 'File that describes the stack', type: :string, default: 'Sumomofile'
+      opt :changeset, 'Create a changeset instead of directly update', type: :boolean, default: false
+      opt :rollback, 'Specify whether or not to rollback. Allowed values are [enable, disable]', type: :string, default: 'unspecified'
+    end
+
+    changeset = !!local_opts[:changeset]
+    rollback = local_opts[:rollback].to_sym
+
+    if rollback == :disable && local_opts[:changeset] == false
+      Optimist.die "Rollback cannot be set to disable when changeset is set to false, because we will end up in an update-failed state"
+    end
+
+    Sumomo.manage_stack(
+      name: ARGV[0], 
+      cmd: cmd, 
+      changeset: changeset, 
+      region: global_opts[:region],
+      rollback: rollback) do
+
+      proc = proc {}
+      eval File.read(local_opts[:filename]), proc.binding, local_opts[:filename]
+    end
+
+  when 'outputs'
+    puts "Outputs for stack #{ARGV[0]}"
+    puts Sumomo.get_stack_outputs(name: ARGV[0], region: global_opts[:region]).to_yaml
+
+  when 'login'
+    puts "Login to stack #{ARGV[0]} instance at #{ARGV[1]}"
+      `aws s3 cp s3://#{ARGV[0]}/cloudformation/#{ARGV[0]}_master_key.pem x.txt`
+    key = JSON.parse(File.read('x.txt'))['value'].
+      gsub('-----BEGIN RSA PRIVATE KEY----- ', "-----BEGIN RSA PRIVATE KEY-----\n").
+      gsub(' -----END RSA PRIVATE KEY-----', "\n-----END RSA PRIVATE KEY-----").
+      gsub(/(.{64}) /, "\\1\n")
+    File.write('key.pem', key)
+    `chmod 0600 key.pem`
+    exec "ssh -i 'key.pem' ec2-user@#{ARGV[1]} #{ARGV[2]}"
+
+  when 'testapi'
+    local_opts = Optimist.options do
+      opt :filename, 'File that describes the stack', type: :string, default: 'Sumomofile'
+      opt :apiname, 'Name of the API you want to test', type: :string
+      opt :prettyprint, 'Test API outputs JSON with nice indentation', type: :boolean, default: true
+    end
+    puts 'API Test Mode'
+    Sumomo.test_api(local_opts[:apiname], local_opts[:prettyprint]) do
+      proc = proc {}
+      eval File.read(local_opts[:filename]), proc.binding, local_opts[:filename]
+    end
+    exit(0)
+  else
+    Optimist.die "Unknown subcommand #{cmd.inspect}"
 end
 
 unless %w[show diff].include?(cmd)

data/lib/sumomo/stack.rb

@@ -203,7 +203,7 @@ module Sumomo
         statements: [
           {
             'Effect' => 'Allow',
-            'Action' => ['logs:CreateLogStream', 'logs:PutLogEvents'],
+            'Action' => ['logs:CreateLogGroup', 'logs:CreateLogStream', 'logs:PutLogEvents'],
             'Resource' => 'arn:aws:logs:*:*:*'
           },
           {

data/lib/sumomo/version.rb

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

data/lib/sumomo.rb

@@ -26,7 +26,14 @@ module Sumomo
     "cloudformation/#{make_master_key_name(name: name)}.pem"
   end
 
-  def self.manage_stack(name:, region:, cmd:'update', sns_arn: nil, changeset: false, &block)
+  def self.manage_stack(
+    name:, 
+    region:, 
+    cmd:'update', 
+    sns_arn: nil, 
+    rollback: :unspecified, 
+    changeset: false, &block)
+
     cf = Aws::CloudFormation::Client.new(region: region)
     s3 = Aws::S3::Client.new(region: region)
     ec2 = Aws::EC2::Client.new(region: region)
@@ -35,6 +42,8 @@ module Sumomo
       s3.head_bucket(bucket: name)
     rescue Aws::S3::Errors::NotFound => e
       s3.create_bucket(bucket: name)
+    rescue => e
+      exit 1
     end
 
     store = S3Cabinet::S3Cabinet.new(nil, nil, name, region)
@@ -167,8 +176,6 @@ module Sumomo
       capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM']
     }
 
-    update_options[:disable_rollback] = false if !changeset
-
     begin
       if changeset
         cf.create_change_set(
@@ -176,7 +183,10 @@ module Sumomo
           change_set_name: "Change#{curtimestr}"
         )
       else
-        cf.update_stack(update_options)
+        cf.update_stack({
+          disable_rollback: rollback == :disable,
+          **update_options
+        })
       end
 
     rescue StandardError => e
@@ -185,7 +195,7 @@ module Sumomo
         update_options[:notification_arns] = sns_arn if sns_arn
         cf.create_stack(update_options)
       else
-        p e
+        p update_options
         puts "Error: #{e.message}"
       end
     end
@@ -448,6 +458,12 @@ module Sumomo
     end
   end
 
+  def self.rollback_stack(name:, region:)
+    cf = Aws::CloudFormation::Client.new(region: region)
+
+    cf.rollback_stack(stack_name: name)
+  end
+
   def self.get_stack_outputs(name:, region:)
     cf = Aws::CloudFormation::Client.new(region: region)
 

data/sumomo.gemspec

@@ -38,6 +38,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'momo', '0.4.1'
   spec.add_dependency 'rubyzip'
   spec.add_dependency 's3cabinet'
-  spec.add_dependency 'trollop'
+  spec.add_dependency 'optimist'
   spec.add_dependency 'webrick'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sumomo
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.2
 platform: ruby
 authors:
 - David Siaw
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-08 00:00:00.000000000 Z
+date: 2023-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -2593,7 +2593,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: An advanced infrastructure description language for AWS