stax 0.1.5 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75641822b021f927037f37d69b733a2a6fd2a894f20da3094ff922b9af846bd5
-  data.tar.gz: ecfa6da9d9b67ce326c199c94e4709e6f3debcf223636d57e0f0e466884e6eef
+  metadata.gz: 184e068dc00c13a187864710303862b2049ec3f353cdf7bda094dc94fe711201
+  data.tar.gz: a2fa06ab9dad658167b57cfbbaf7411a73cbfeccf1cb2eb4ab4c5a50beea9c97
 SHA512:
-  metadata.gz: a4ff5cdf4ffeb7bd24f5bcf2df160e725d84b45a13feb40d4886ccb351ae2f3abacff951159855da0aa23fd92025adcc620875c5b07c8ca406139268e3243903
-  data.tar.gz: fb6672ac0878c1bd28266d5a06ce90d9bd477c911ed0755200c9246ba5836be35d9d12add0c8d8015432d94166fc395374c03e457afd401db348b7af691d3b84
+  metadata.gz: 6491ccdb338d2883cc657eceab4255d14b6202bea65494f3a9ef71a6e459affa813252a5bdb766fb9e12a10d4d3a2121ebe39b80f7ef7803c0f0894b10eba326
+  data.tar.gz: 76e87f6dc9e8569d025ab23fc6ac662e30bb00439b8f06c6e7cfb7a0cc42c7e12046a76627e7de3c6b0f493764ecef8f77e52a66fb7e68d98c0899266d6340fe

data/lib/stax/aws/cfn.rb

@@ -7,6 +7,7 @@ module Stax
         CREATE_IN_PROGRESS CREATE_FAILED CREATE_COMPLETE
         ROLLBACK_IN_PROGRESS ROLLBACK_FAILED ROLLBACK_COMPLETE
         DELETE_IN_PROGRESS DELETE_FAILED
+        IMPORT_IN_PROGRESS IMPORT_COMPLETE IMPORT_ROLLBACK_IN_PROGRESS IMPORT_ROLLBACK_FAILED IMPORT_ROLLBACK_COMPLETE
         UPDATE_IN_PROGRESS UPDATE_COMPLETE_CLEANUP_IN_PROGRESS UPDATE_COMPLETE
         UPDATE_ROLLBACK_IN_PROGRESS UPDATE_ROLLBACK_FAILED UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS UPDATE_ROLLBACK_COMPLETE
         REVIEW_IN_PROGRESS
@@ -17,6 +18,7 @@ module Stax
         CREATE_COMPLETE:      :green,
         DELETE_COMPLETE:      :green,
         UPDATE_COMPLETE:      :green,
+        IMPORT_COMPLETE:      :green,
         CREATE_FAILED:        :red,
         DELETE_FAILED:        :red,
         UPDATE_FAILED:        :red,
@@ -24,6 +26,7 @@ module Stax
         ROLLBACK_COMPLETE:    :red,
         ## resource action
         Add:    :green,
+        Import: :green,
         Modify: :yellow,
         Remove: :red,
       }
@@ -170,4 +173,4 @@ module Stax
 
     end
   end
-end
+end

data/lib/stax/base.rb

@@ -1,6 +1,9 @@
 require 'thor'
 require 'stax/aws/sts'
 
+## clean exit on ctrl-c for all methods
+trap('SIGINT', 'EXIT')
+
 module Stax
   class Base < Thor
 
@@ -68,7 +71,9 @@ module Stax
         end
       end
 
-      def color(string, hash)
+      ## color a string according to current class COLORS hash
+      def color(string, hash = nil)
+        hash ||= self.class::COLORS
         set_color(string, hash.fetch(string.to_sym, :yellow))
       end
 
@@ -118,6 +123,7 @@ module Stax
 
       ## convert a diff in seconds to d h m s
       def human_time_diff(t, n = 5)
+        t = t.round # handle fractional seconds
         mm, ss = t.divmod(60)
         hh, mm = mm.divmod(60)
         dd, hh = hh.divmod(24)

data/lib/stax/cli/crud.rb

@@ -56,10 +56,11 @@ module Stax
     end
 
     desc 'delete', 'meta delete task'
+    method_option :notail, aliases: '-n', type: :boolean, default: false, description: 'do not tail stack events'
     def delete
       stack_objects.reverse.each do |s|
         if s.exists?
-          s.delete
+          s.invoke(:delete, [], options)
         else
           say("#{s.stack_name} does not exist", :green)
         end
@@ -67,4 +68,4 @@ module Stax
     end
 
   end
-end
+end

data/lib/stax/mixin/rds.rb

@@ -14,6 +14,7 @@ module Stax
 
       COLORS = {
         available: :green,
+        'in-sync': :green,
         Complete:  :green,
         Active:    :green,
       }
@@ -40,13 +41,36 @@ module Stax
         def stack_db_subnet_groups
           Aws::Cfn.resources_by_type(my.stack_name, 'AWS::RDS::DBSubnetGroup')
         end
+
+        def print_rds_events(opt)
+          Aws::Rds.client.describe_events(opt).map(&:events).flatten.map do |e|
+            [ e.date, e.message ]
+          end.tap(&method(:print_table))
+        end
+
+      end
+
+      desc 'ls', 'list clusters with members'
+      def ls
+        debug("RDS databases for #{my.stack_name}")
+        stack_rds_clusters.map do |c|
+          cluster = [ c.db_cluster_identifier, 'cluster', color(c.status), c.engine ]
+          instances = c.db_cluster_members.map do |m|
+            role = m.is_cluster_writer ? 'writer' : 'reader'
+            i = Aws::Rds.instances(filters: [ { name: 'db-instance-id', values: [ m.db_instance_identifier ] } ]).first
+            [ '- ' + i.db_instance_identifier, role, color(i.db_instance_status), i.engine, i.availability_zone, i.db_instance_class ]
+          end
+          [ cluster ] + instances
+        end.flatten(1).tap do |list|
+          print_table list
+        end
       end
 
       desc 'clusters', 'list db clusters for stack'
       def clusters
         debug("RDS DB clusters for #{my.stack_name}")
         print_table stack_rds_clusters.map { |c|
-          [c.db_cluster_identifier, c.engine, c.engine_version, color(c.status, COLORS), c.cluster_create_time]
+          [c.db_cluster_identifier, c.engine, c.engine_version, color(c.status), c.cluster_create_time]
         }
       end
 
@@ -65,7 +89,7 @@ module Stax
       def instances
         debug("RDS DB instances for #{my.stack_name}")
         print_table stack_rds_instances.map { |i|
-          [i.db_instance_identifier, i.engine, i.engine_version, color(i.db_instance_status, COLORS), i.db_instance_class, i.db_subnet_group&.vpc_id, i.availability_zone]
+          [i.db_instance_identifier, i.engine, i.engine_version, color(i.db_instance_status), i.db_instance_class, i.db_subnet_group&.vpc_id, i.availability_zone]
         }
       end
 
@@ -92,11 +116,48 @@ module Stax
         end.flatten.each do |g|
           debug("Subnets for group #{g.db_subnet_group_name}")
           print_table g.subnets.map { |s|
-            [s&.subnet_availability_zone&.name, s&.subnet_identifier, color(s&.subnet_status, COLORS)]
+            [s&.subnet_availability_zone&.name, s&.subnet_identifier, color(s&.subnet_status)]
           }
         end
       end
 
+      desc 'failover', 'failover clusters'
+      method_option :target, type: :string, default: nil, desc: 'id of instance to promote'
+      def failover
+        stack_rds_clusters.each do |c|
+          if yes?("Failover #{c.db_cluster_identifier}?", :yellow)
+            resp = Aws::Rds.client.failover_db_cluster(db_cluster_identifier: c.db_cluster_identifier, target_db_instance_identifier: options[:target])
+            puts "failing over #{resp.db_cluster.db_cluster_identifier}"
+          end
+        end
+      end
+
+      desc 'snapshots', 'list snapshots for stack clusters'
+      def snapshots
+        stack_db_clusters.map(&:physical_resource_id).each do |id|
+          debug("Snapshots for cluster #{id}")
+          Aws::Rds.client.describe_db_cluster_snapshots(db_cluster_identifier: id).map(&:db_cluster_snapshots).flatten.map do |s|
+            [ s.db_cluster_snapshot_identifier, s.snapshot_create_time, "#{s.allocated_storage}G", color(s.status), s.snapshot_type ]
+          end.tap do |list|
+            print_table list
+          end
+        end
+      end
+
+      desc 'events', 'list rds events for this stack'
+      option :duration, aliases: '-d', type: :numeric, default: 60*24, desc: 'duration in mins to show'
+      def events
+        stack_db_clusters.map(&:physical_resource_id).each do |id|
+          debug("Events for cluster #{id}")
+          print_rds_events(duration: options[:duration], source_type: 'db-cluster', source_identifier: id)
+        end
+
+        stack_db_instances.map(&:physical_resource_id).each do |id|
+          debug("Events for instance #{id}")
+          print_rds_events(duration: options[:duration], source_type: 'db-instance', source_identifier: id)
+        end
+      end
+
     end
   end
-end
+end

data/lib/stax/stack/changeset.rb

@@ -30,6 +30,23 @@ module Stax
         fail_task(e.message)
       end
 
+      ## create change set to import a resource
+      def change_set_import(resource)
+        Aws::Cfn.changeset(
+          change_set_type: :IMPORT,
+          resources_to_import: [ resource ],
+          stack_name: stack_name,
+          template_body: cfn_template_body,
+          template_url: cfn_template_url,
+          parameters: cfn_parameters_update,
+          capabilities: cfn_capabilities,
+          notification_arns: cfn_notification_arns,
+          change_set_name: change_set_name,
+        ).id
+      rescue ::Aws::CloudFormation::Errors::ValidationError => e
+        fail_task(e.message)
+      end
+
       ## wait and return true if changeset ready for execute
       def change_set_complete?(id)
         begin
@@ -71,11 +88,15 @@ module Stax
       end
 
       def change_set_unlock
-        Aws::Cfn.set_policy(stack_name: stack_name, stack_policy_body: stack_policy_during_update)
+        unless stack_policy_during_update.nil?
+          Aws::Cfn.set_policy(stack_name: stack_name, stack_policy_body: stack_policy_during_update)
+        end
       end
 
       def change_set_lock
-        Aws::Cfn.set_policy(stack_name: stack_name, stack_policy_body: stack_policy)
+        unless stack_policy.nil?
+          Aws::Cfn.set_policy(stack_name: stack_name, stack_policy_body: stack_policy)
+        end
       end
     end
 
@@ -90,5 +111,32 @@ module Stax
       change_set_lock
     end
 
+    desc 'import', 'create and execute changeset to import a resource'
+    option :type,  aliases: '-t', type: :string, default: nil, desc: 'cfn resource (e.g. AWS::DynamoDB::Table)'
+    option :id,    aliases: '-i', type: :string, default: nil, desc: 'logical id (e.g. OrdersTable)'
+    option :key,   aliases: '-k', type: :string, default: nil, desc: 'resource key (e.g. TableName)'
+    option :value, aliases: '-v', type: :string, default: nil, desc: 'resource value (e.g. orders)'
+    def import
+      ## prompt for missing options
+      %i[type id key value].each do |opt|
+        options[opt] ||= ask("Resource #{opt}?", :yellow)
+      end
+
+      ## create import changeset
+      debug("Creating import change set for #{stack_name}")
+      id = change_set_import(
+        resource_type: options[:type],
+        logical_resource_id: options[:id],
+        resource_identifier: {
+          options[:key] => options[:value]
+        }
+      )
+
+      ## wait for changeset, prompt for changes, and execute
+      change_set_complete?(id) || fail_task(change_set_reason(id))
+      change_set_changes(id)
+      change_set_execute(id) && tail && update_warn_imports
+    end
+
   end
-end
+end

data/lib/stax/stack/crud.rb

@@ -24,28 +24,31 @@ module Stax
         }
       end
 
-      ## policy to lock the stack to all updates
+      ## policy to lock the stack to all updates, for example:
+      ## {
+      ##   Statement: [
+      ##     Effect:    'Deny',
+      ##     Action:    'Update:*',
+      ##     Principal: '*',
+      ##     Resource:  '*'
+      ##   ]
+      ## }.to_json
       def stack_policy
-        {
-          Statement: [
-            Effect:    'Deny',
-            Action:    'Update:*',
-            Principal: '*',
-            Resource:  '*'
-          ]
-        }.to_json
+        nil
       end
 
-      ## temporary policy during updates; modify this to restrict resources
+      ## tmp policy during updates, in case a deny was set in stack_policy()
+      ## for example:
+      ## {
+      ##   Statement: [
+      ##     Effect:    'Allow',
+      ##     Action:    'Update:*',
+      ##     Principal: '*',
+      ##     Resource:  '*'
+      ##   ]
+      ## }.to_json
       def stack_policy_during_update
-        {
-          Statement: [
-            Effect:    'Allow',
-            Action:    'Update:*',
-            Principal: '*',
-            Resource:  '*'
-          ]
-        }.to_json
+        nil
       end
 
       ## cleanup sometimes needs to wait
@@ -206,11 +209,12 @@ module Stax
     end
 
     desc 'delete', 'delete stack'
+    method_option :notail, aliases: '-n', type: :boolean, default: false, description: 'do not tail stack events'
     def delete
       delete_warn_imports
       if yes? "Really delete stack #{stack_name}?", :yellow
         Aws::Cfn.delete(stack_name)
-        tail
+        tail unless options[:notail]
       end
     rescue ::Aws::CloudFormation::Errors::ValidationError => e
       fail_task(e.message)

data/lib/stax/stack/{imports.rb → exports.rb}

@@ -21,8 +21,8 @@ module Stax
       end
     end
 
-    desc 'imports', 'list imports from this stack'
-    def imports
+    desc 'exports', 'list exports from this stack, and stacks that import them'
+    def exports
       debug("Stacks that import from #{stack_name}")
       print_table Aws::Cfn.exports(stack_name).map { |e|
         imports = (i = Aws::Cfn.imports(e.export_name)).empty? ? '-' : i.join('  ')
@@ -30,5 +30,11 @@ module Stax
       }.sort
     end
 
+    desc 'imports', 'deprecated: use exports'
+    def imports
+      warn("deprecated method: please use 'exports' instead")
+      exports
+    end
+
   end
-end
+end

data/lib/stax/version.rb

@@ -1,3 +1,3 @@
 module Stax
-  VERSION = '0.1.5'
+  VERSION = '0.1.9'
 end

data/lib/stax.rb

@@ -16,7 +16,7 @@ require 'stax/stack/crud'
 require 'stax/stack/changeset'
 require 'stax/stack/parameters'
 require 'stax/stack/outputs'
-require 'stax/stack/imports'
+require 'stax/stack/exports'
 require 'stax/stack/resources'
 require 'stax/stack/drift'
 

data/stax.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "docile", "1.2.0"
   spec.add_development_dependency "stax-examples"
 
   spec.add_dependency('aws-sdk-cloudformation')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stax
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.9
 platform: ruby
 authors:
 - Richard Lister
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-25 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: docile
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: stax-examples
   requirement: !ruby/object:Gem::Requirement
@@ -596,7 +582,7 @@ files:
 - lib/stax/stack/changeset.rb
 - lib/stax/stack/crud.rb
 - lib/stax/stack/drift.rb
-- lib/stax/stack/imports.rb
+- lib/stax/stack/exports.rb
 - lib/stax/stack/outputs.rb
 - lib/stax/stack/parameters.rb
 - lib/stax/stack/resources.rb
@@ -624,7 +610,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Control Cloudformation stack and other stuff.