cfndk 0.0.7 → 0.1.2

data/bin/cfndk

@@ -1,22 +1,7 @@
 #!/usr/bin/env ruby
 
-require 'bundler/setup'
-
-require 'rainbow/ext/string'
-require 'optparse'
-require 'fileutils'
-require 'pathname'
-require 'erb'
-require 'yaml'
-require 'json'
-require 'aws-sdk'
-require 'terminal-table'
-require 'securerandom'
-require 'logger'
-
-require 'cfndk.rb'
-
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 
-c = CFnDK::Command.new
-exit c.execute
+require 'cfndk'
+
+exit CFnDK::Command.start(ARGV)

data/cfndk.gemspec

@@ -18,11 +18,20 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
-  spec.add_development_dependency 'rake', '~> 11.1.2'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'aruba'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'awspec'
+  spec.add_development_dependency 'parallel_tests'
 
-  spec.add_dependency 'rainbow', '~> 3.0.0'
-  spec.add_dependency 'aws-sdk', '~> 3'
-  spec.add_dependency 'camelizable', '~> 0.0.3'
-  spec.add_dependency 'terminal-table', '~> 1'
+  spec.add_dependency 'bundler'
+  spec.add_dependency 'thor'
+  spec.add_dependency 'rainbow'
+  spec.add_dependency 'rubyzip', '1.3.0'
+  spec.add_dependency 'aws-sdk'
+  spec.add_dependency 'camelizable'
+  spec.add_dependency 'terminal-table'
+  spec.add_dependency 'diff-lcs'
+  spec.add_dependency 'polyfill'
 end

data/docker/Dockerfile

@@ -0,0 +1,8 @@
+FROM ruby:2.6-alpine
+
+RUN gem install bundler --version 1.14.6
+RUN gem install cfndk
+
+WORKDIR /home/cfndk
+ENTRYPOINT ["sh", "-c", "cfndk $@", ""]
+CMD ["help"]

data/docker/build.sh

@@ -0,0 +1,3 @@
+#!/bin/bash 
+
+docker build  -t cfndk:latest ./

data/docker/cfndk.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+WORK_DIR=`pwd`
+
+docker run \
+  -v $WORK_DIR:/home/cfndk \
+  -v $HOME/.aws:/root/.aws \
+  -e AWS_PROFILE=$AWS_PROFILE \
+  -e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID \
+  -e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY \
+  -e AWS_SESSION_TOKEN=$AWS_SESSION_TOKEN \
+  -w /home/cfndk \
+  -it amakata/cfndk:latest \
+  "$@"

data/lib/cfndk.rb

@@ -1,12 +1,48 @@
+require 'bundler/setup'
+
+require 'rainbow/ext/string'
+require 'camelizable'
+require 'fileutils'
+require 'pathname'
+require 'ostruct'
+require 'erb'
+require 'yaml'
+require 'json'
+require 'zip'
+require 'aws-sdk'
+require 'terminal-table'
+require 'securerandom'
+require 'logger'
+require 'thor'
+require 'diff/lcs'
+require 'diff/lcs/hunk'
+require 'polyfill'
+
+if ENV['CFNDK_COVERAGE']
+  require 'simplecov'
+  root = File.expand_path('../../', __FILE__)
+  SimpleCov.root(root)
+end
+
 require 'cfndk/version'
 require 'cfndk/stack'
 require 'cfndk/stacks'
 require 'cfndk/key_pair'
 require 'cfndk/key_pairs'
 require 'cfndk/erb_string'
+require 'cfndk/global_config'
 require 'cfndk/logger'
 require 'cfndk/credential_provider_chain'
+require 'cfndk/subcommand_help_returnable'
+require 'cfndk/credential_resolvable'
+require 'cfndk/config_file_loadable'
+require 'cfndk/key_pair_command'
+require 'cfndk/stack_command'
+require 'cfndk/change_set_command'
 require 'cfndk/command'
+require 'cfndk/template_packager'
+require 'cfndk/diff'
+require 'cfndk/uuid'
 
 module CFnDK
 end

data/lib/cfndk/change_set_command.rb

@@ -0,0 +1,103 @@
+module CFnDK
+  class ChangeSetCommand < Thor
+    include SubcommandHelpReturnable
+    include ConfigFileLoadable
+    include CredentialResolvable
+
+    class_option :verbose, type: :boolean, aliases: 'v', desc: 'More verbose output.'
+    class_option :color, type: :boolean, default: true, desc: 'Use colored output'
+    class_option :config_path, type: :string, aliases: 'c', default: "#{Dir.getwd}/cfndk.yml", desc: 'The configuration file to use'
+    class_option :stack_names, type: :array, aliases: 's', desc: 'Target stack names'
+
+    desc 'create', 'Create change set'
+    option :uuid, type: :string, aliases: 'u', default: ENV['CFNDK_UUID'] || nil, desc: 'Use UUID'
+    option :change_set_uuid, type: :string, default: ENV['CFNDK_CHANGE_SET_UUID'] || nil, desc: 'Use Change Set UUID'
+    option :properties, type: :hash, aliases: 'p', default: {}, desc: 'Set property'
+    def create
+      CFnDK.logger.info 'create...'.color(:green)
+      data = load_config_data(options)
+      credentials = resolve_credential(data, options)
+      global_config = CFnDK::GlobalConfig.new(data, options)
+      stacks = CFnDK::Stacks.new(data, options, credentials)
+
+      global_config.pre_command_execute
+      stacks.pre_command_execute
+      stacks.validate
+      stacks.create_change_set
+      stacks.post_command_execute
+      global_config.post_command_execute
+      return 0
+    rescue => e
+      CFnDK.logger.error "#{e.class}: #{e.message}".color(:red)
+      e.backtrace_locations.each do |line|
+        CFnDK.logger.debug line
+      end
+      return 1
+    end
+
+    desc 'execute', 'Execute change set'
+    option :uuid, type: :string, aliases: 'u', default: ENV['CFNDK_UUID'] || nil, desc: 'Use UUID'
+    option :change_set_uuid, type: :string, default: ENV['CFNDK_CHANGE_SET_UUID'] || nil, desc: 'Use Change Set UUID'
+    def execute
+      CFnDK.logger.info 'execute...'.color(:green)
+      data = load_config_data(options)
+      credentials = resolve_credential(data, options)
+      stacks = CFnDK::Stacks.new(data, options, credentials)
+
+      stacks.execute_change_set
+      return 0
+    rescue => e
+      CFnDK.logger.error "#{e.class}: #{e.message}".color(:red)
+      e.backtrace_locations.each do |line|
+        CFnDK.logger.debug line
+      end
+      return 1
+    end
+
+    desc 'destroy', 'Destroy change set'
+    option :force, type: :boolean, aliases: 'f', default: false, desc: 'Say yes to all prompts for confirmation'
+    option :uuid, type: :string, aliases: 'u', default: ENV['CFNDK_UUID'] || nil, desc: 'Use UUID'
+    option :change_set_uuid, type: :string, default: ENV['CFNDK_CHANGE_SET_UUID'] || nil, desc: 'Use Change Set UUID'
+    def destroy
+      CFnDK.logger.info 'destroy...'.color(:green)
+      data = load_config_data(options)
+      credentials = resolve_credential(data, options)
+
+      stacks = CFnDK::Stacks.new(data, options, credentials)
+
+      if options[:force] || yes?('Are you sure you want to destroy? (y/n)', :yellow)
+        stacks.delete_change_set
+        return 0
+      else
+        CFnDK.logger.info 'destroy command was canceled'.color(:green)
+        return 2
+      end
+    rescue => e
+      CFnDK.logger.error "#{e.class}: #{e.message}".color(:red)
+      e.backtrace_locations.each do |line|
+        CFnDK.logger.debug line
+      end
+      return 1
+    end
+
+    desc 'report', 'Report change set'
+    option :uuid, type: :string, aliases: 'u', default: ENV['CFNDK_UUID'] || nil, desc: 'Use UUID'
+    option :change_set_uuid, type: :string, default: ENV['CFNDK_CHANGE_SET_UUID'] || nil, desc: 'Use Change Set UUID'
+    option :types, type: :array, default: %w(tag parameter changes), desc: 'Report type'
+    def report
+      CFnDK.logger.info 'report...'.color(:green)
+      data = load_config_data(options)
+      credentials = resolve_credential(data, options)
+
+      stacks = CFnDK::Stacks.new(data, options, credentials)
+      stacks.report_change_set
+      return 0
+    rescue => e
+      CFnDK.logger.error "#{e.class}: #{e.message}".color(:red)
+      e.backtrace_locations.each do |line|
+        CFnDK.logger.debug line
+      end
+      return 1
+    end
+  end
+end

data/lib/cfndk/command.rb

@@ -1,136 +1,142 @@
 module CFnDK
-  class Command
-    def initialize
-      @cur_dir = Dir.getwd
-      @option = {
-        config_path: "#{@cur_dir}/cfndk.yml",
-        uuid: ENV['CFNDK_UUID'] || nil,
-        properties: {},
-        stack_names: nil,
-        force: false,
-      }
-
-      @opt = OptionParser.new do |o|
-        o.version = CFnDK::VERSION
-        o.summary_indent = ' ' * 4
-        o.banner = "Version: #{CFnDK::VERSION} \nUsage: cfndk [cmd] [options]"
-        o.on_head('[cmd]',
-                  '    init                  create config YAML file',
-                  '    create                create stacks',
-                  '    update                update stacks',
-                  '    create-or-changeset   create stacks or create changeset',
-                  '    destroy               destroy stacks',
-                  '    generate-uuid         generate UUID',
-                  '    report-event          report stack event',
-                  '    report-stack          report stack',
-                  '    report-stack-resource report stack resource',
-                  '[enviroment variables]',
-                  "    AWS_PROFILE: #{ENV['AWS_PROFILE']}",
-                  "    AWS_DEFAULT_REGION: #{ENV['AWS_DEFAULT_REGION']}",
-                  "    AWS_REGION: #{ENV['AWS_REGION']}",
-                  "    AWS_ACCESS_KEY_ID: #{ENV['AWS_ACCESS_KEY_ID']}",
-                  "    AWS_SECRET_ACCESS_KEY: #{ENV['AWS_SECRET_ACCESS_KEY']}",
-                  "    AWS_SESSION_TOKEN: #{ENV['AWS_SECRET_ACCESS_KEY']}",
-                  "    AWS_CONTAINER_CREDENTIALS_RELATIVE_URI: #{ENV['AWS_CONTAINER_CREDENTIALS_RELATIVE_URI']}",
-                  '[options]')
-        o.on('-v', '--verbose', 'verbose mode') { |v| @option[:v] = v }
-        o.on('-c', '--config_path cfndi.yml', "config path (default: #{@option[:config_path]})") { |v| @option[:config_path] = v }
-        o.on('-p', '--properties name=value', 'properties') do |v|
-          md = v.match(/^([a-zA-Z_]+[a-zA-Z0-9_]*)=(.*)$/)
-          if md
-            @option[:properties][md[0]] = md[1]
-          else
-            raise "invalid properties: '#{v}'" unless md
-          end
-        end
-        o.on('-a', '--auto-uuid') { @option[:uuid] = SecureRandom.uuid }
-        o.on('-u', '--uuid uuid') { |v| @option[:uuid] = v }
-        o.on('-n', '--stack-names name1,name2') { |v| @option[:stack_names] = v.split(/\s*,\s*/) }
-        o.on('--no-color') { |b| Rainbow.enabled = false }
-        o.on('-f', '--force') { |b| @option[:force] = true }
-        o.permute!(ARGV)
+  class Command < Thor
+    include Thor::Actions
+    include ConfigFileLoadable
+    include CredentialResolvable
+
+    class << self
+      def exit_on_failure?
+        true
       end
-      @logger = CFnDK::Logger.new(@option)
     end
 
-    def execute
-      if ARGV.length != 1
-        puts @opt.help
-        return 2
-      elsif ARGV[0] == 'generate-uuid'
-        puts SecureRandom.uuid
-        return 0
-      elsif ARGV[0] == 'init'
-        if File.file?(@option[:config_path])
-          @logger.error "File exist. #{@option[:config_path]}".color(:red)
-          return 1
-        end
-        @logger.info 'init...'.color(:green)
-        FileUtils.cp_r(Dir.glob(File.dirname(__FILE__) + '/../../skel/*'), './')
-        @logger.info "create #{@option[:config_path]}".color(:green)
-        return 0
-      end
+    def help(command = nil, subcommand = false)
+      super(command, subcommand)
+      2
+    end
 
-      unless File.file?(@option[:config_path])
-        @logger.error "File does not exist. #{@option[:config_path]}".color(:red)
+    class_option :verbose, type: :boolean, aliases: 'v', desc: 'More verbose output.'
+    class_option :color, type: :boolean, default: true, desc: 'Use colored output'
+
+    desc 'generate-uuid', 'Print UUID'
+    def generate_uuid
+      puts SecureRandom.uuid
+      0
+    end
+
+    desc 'version', 'Print version'
+    def version
+      puts CFnDK::VERSION
+      0
+    end
+
+    desc 'init', 'Craete sample cfndk.yml & CloudFormation yaml & json files.'
+    def init
+      config_path = "#{Dir.getwd}/cfndk.yml"
+      if File.file?(config_path)
+        CFnDK.logger.error "File exist. #{config_path}".color(:red)
         return 1
       end
+      CFnDK.logger.info 'init...'.color(:green)
+      FileUtils.cp_r(Dir.glob(File.dirname(__FILE__) + '/../../skel/*'), './')
+      CFnDK.logger.info "create #{config_path}".color(:green)
+    end
+
+    desc 'create', 'Create keypair & stack'
+    option :config_path, type: :string, aliases: 'c', default: "#{Dir.getwd}/cfndk.yml", desc: 'The configuration file to use'
+    option :uuid, type: :string, aliases: 'u', default: ENV['CFNDK_UUID'] || nil, desc: 'Use UUID'
+    option :properties, type: :hash, aliases: 'p', default: {}, desc: 'Set property'
+    option :stack_names, type: :array, aliases: 's', desc: 'Target stack names'
+    option :keypair_names, type: :array, desc: 'Target keypair names'
+    def create
+      CFnDK.logger.info 'create...'.color(:green)
+      data = load_config_data(options)
+      credentials = resolve_credential(data, options)
+      global_config = CFnDK::GlobalConfig.new(data, options)
+      stacks = CFnDK::Stacks.new(data, options, credentials)
+      keypairs = CFnDK::KeyPairs.new(data, options, credentials)
 
-      data = open(@option[:config_path], 'r') { |f| YAML.load(f) } if File.file?(@option[:config_path])
-      credentials = CFnDK::CredentialProviderChain.new.resolve
-      stacks = CFnDK::Stacks.new(data, @option, credentials)
-      keypairs = CFnDK::KeyPairs.new(data, @option, credentials)
-
-      if ARGV[0] == 'create'
-        @logger.info 'create...'.color(:green)
-        stacks.validate
-        keypairs.create
-        stacks.create
-      elsif ARGV[0] == 'update'
-        @logger.info 'update...'.color(:green)
-        stacks.validate
-        stacks.update
-      elsif ARGV[0] == 'create-or-changeset'
-        @logger.info 'create or changeset...'.color(:green)
-        stacks.validate
-        stacks.create_or_changeset
-      elsif ARGV[0] == 'destroy'
-        @logger.info 'destroy...'.color(:green)
-        if destroy?
-          stacks.destroy
-          keypairs.destroy
-        end
-      elsif ARGV[0] == 'validate'
-        @logger.info 'validate...'.color(:green)
-        stacks.validate
-      elsif ARGV[0] == 'report-event'
-        @logger.info 'report event...'.color(:green)
-        stacks.report_event
-      elsif ARGV[0] == 'report-stack'
-        @logger.info 'report stack...'.color(:green)
-        stacks.report_stack
-      elsif ARGV[0] == 'report-stack-resource'
-        @logger.info 'report stack resource...'.color(:green)
-        stacks.report_stack_resource
+      global_config.pre_command_execute
+      stacks.pre_command_execute
+      stacks.validate
+      keypairs.pre_command_execute
+      keypairs.create
+      keypairs.post_command_execute
+      stacks.create
+      stacks.post_command_execute
+      global_config.post_command_execute
+      return 0
+    rescue => e
+      CFnDK.logger.error "#{e.class}: #{e.message}".color(:red)
+      e.backtrace_locations.each do |line|
+        CFnDK.logger.debug line
+      end
+      return 1
+    end
+
+    desc 'destroy', 'Destroy keypair & stack'
+    option :config_path, type: :string, aliases: 'c', default: "#{Dir.getwd}/cfndk.yml", desc: 'The configuration file to use'
+    option :force, type: :boolean, aliases: 'f', default: false, desc: 'Say yes to all prompts for confirmation'
+    option :uuid, type: :string, aliases: 'u', default: ENV['CFNDK_UUID'] || nil, desc: 'Use UUID'
+    def destroy
+      CFnDK.logger.info 'destroy...'.color(:green)
+      data = load_config_data(options)
+      credentials = resolve_credential(data, options)
+
+      stacks = CFnDK::Stacks.new(data, options, credentials)
+      keypairs = CFnDK::KeyPairs.new(data, options, credentials)
+
+      if options[:force] || yes?('Are you sure you want to destroy? (y/n)', :yellow)
+        stacks.destroy
+        keypairs.destroy
+        return 0
       else
-        puts @opt.help
+        CFnDK.logger.info 'destroy command was canceled'.color(:green)
         return 2
       end
-      0
+    rescue => e
+      CFnDK.logger.error "#{e.class}: #{e.message}".color(:red)
+      e.backtrace_locations.each do |line|
+        CFnDK.logger.debug line
+      end
+      return 1
     end
 
-    def destroy?
-      return true if @option[:force]
-      loop do
-        print 'destroy? [yes|no]:'
-        res = STDIN.gets
-        case res
-        when /^yes/
-          return true
-        when /^no/, /^$/
-          return false
-        end
+    desc 'report', 'Report stack'
+    option :config_path, type: :string, aliases: 'c', default: "#{Dir.getwd}/cfndk.yml", desc: 'The configuration file to use'
+    option :uuid, type: :string, aliases: 'u', default: ENV['CFNDK_UUID'] || nil, desc: 'Use UUID'
+    option :stack_names, type: :array, aliases: 's', desc: 'Target stack names'
+    option :types, type: :array, default: %w(tag output parameter resource event), desc: 'Report type'
+    def report
+      CFnDK.logger.info 'report...'.color(:green)
+
+      data = load_config_data(options)
+      credentials = resolve_credential(data, options)
+
+      stacks = CFnDK::Stacks.new(data, options, credentials)
+      stacks.report
+      return 0
+    rescue => e
+      CFnDK.logger.error "#{e.class}: #{e.message}".color(:red)
+      e.backtrace_locations.each do |line|
+        CFnDK.logger.debug line
       end
+      return 1
     end
+
+    no_commands do
+      def invoke_command(command, *args)
+        CFnDK.logger = CFnDKLogger.new(options)
+        Rainbow.enabled = false unless options[:color]
+        super
+      end
+    end
+
+    desc 'keypair SUBCOMMAND ...ARGS', 'Manage keypair'
+    subcommand 'keypair', KeyPairCommand
+    desc 'stack SUBCOMMAND ...ARGS', 'Manage stack'
+    subcommand 'stack', StackCommand
+    desc 'changeset SUBCOMMAND ...ARGS', 'Manage change set'
+    subcommand 'changeset', ChangeSetCommand
   end
 end