stackup 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a60dfe3184679f98c43d28590feadf40faa968bf5b75531951510d96d38a02f
-  data.tar.gz: ab5010d36407547ba7c1f5b09e190c776023303227b72881ea80b2b49a41b717
+  metadata.gz: 281a4cc419891f70b5a8251d52c080a678e21d2a76a57a0e715b478987c5d967
+  data.tar.gz: e1848f7cccad92a7a6883f3947daa68e70d1b72ad00bfa72727f0def2590ee89
 SHA512:
-  metadata.gz: cf63917e39f450c29d98e420f872aa5f1d7bd00fbd2543eece6d81795ec64ec349e66ba507230e212d30961a390a8a9f587c0dc45e08b823c78c518f700425ff
-  data.tar.gz: 15a86e361a985ca59c7714025fa47308a4e165b5abdf2f0bf8e3020d13a73636e219a6693b208f6d51e4fed8aa28587e7dbd1dda03a654d471a8a432ca4e4632
+  metadata.gz: 59cd63007ce56b284e7176c82f354174bb78dec2fba84443e2b1a28465df5ed68cd0bc1ccd2474dab7572c61ebb85d9de328e12216395d0e68c8101863b0110a
+  data.tar.gz: 3acf8d1d83307ef2851001558c7880c4d43692f740254531369713e4cb7d38f3595398195cfd8f67460b10c1bd94cd7dca08a833fdf51371ef0a1c914addcffc

data/CHANGES.md

@@ -1,5 +1,9 @@
 # CHANGES
 
+## 1.6.0 (2020-11-19)
+
+* Feature: Support --service-role-arn on "change-set create"
+
 ## 1.5.1 (2020-11-16)
 
 * Fix: Recognise that template is in S3 when URL is formatted like `s3.REGION.amazonaws.com`

data/README.md

@@ -216,6 +216,8 @@ You can also create, list, inspect, apply and delete [change sets](http://docs.a
 
 The change-set name defaults to "pending", but can be overridden using `--name`.
 
+The `change-set create` subcommand, like the `up` command, supports `--service-role-arn` to specify a service role.
+
 ## Programmatic usage
 
 Get a handle to a `Stack` object as follows:
@@ -300,13 +302,19 @@ This policy grants the principal all actions required by `stackup up` for any cl
 }
 ```
 
-## Releasing
+## Development
+
+### Running tests
+
+`auto/test` will run the tests in a Docker container.
+
+### Releasing
 
-The release process will push tags to GitHub, push the gem to rubygems and push the docker image to DockerHub.
+Releasing is done manually, not by CI. The release process will push tags to GitHub, push the gem to rubygems and push the docker image to DockerHub.
 
 Prerequisites:
 
-* logged into dockerhub via `docker login`. Your user must have permission to push to `realestate/stackup`
+* You must be logged into docker hub via `docker login`. Your user must have permission to push to `realestate/stackup`
 * You must have a rubygems account with permission to push to the `stackup` gem. (`auto/release` will ask for your username and password)
 * You must have cloned this repo via HTTPS and have a github account with permission to push. (`auto/release` will ask for your username and a GitHub personal access token)
 

data/bin/stackup

@@ -2,552 +2,9 @@
 
 $LOAD_PATH << File.expand_path("../lib", __dir__)
 
-require "clamp"
-require "console_logger"
-require "multi_json"
-require "securerandom"
-require "stackup"
-require "stackup/differ"
-require "stackup/source"
-require "stackup/version"
-require "stackup/yaml"
+require "stackup/main_command"
 
 $stdout.sync = true
 $stderr.sync = true
 
-Clamp do
-
-  option ["-L", "--list"], :flag, "list stacks" do
-    list_stacks
-    exit 0
-  end
-
-  option ["-Y", "--yaml"], :flag, "output data in YAML format"
-
-  option ["--region"], "REGION", "set region" do |arg|
-    raise ArgumentError, "#{arg.inspect} doesn't look like a region" unless arg =~ /^[a-z]{2}-[a-z]+-\d$/
-
-    arg
-  end
-
-  option ["--with-role"], "ROLE_ARN", "assume this role",
-         :attribute_name => :role_arn
-
-  option ["--retry-limit"], "N", "maximum number of retries for API calls",
-         :environment_variable => "AWS_API_RETRY_LIMIT" do |arg|
-    Integer(arg)
-  end
-
-  option ["--[no-]wait"], :flag, "wait for stack updates to complete",
-         :default => true
-
-  option ["--wait-poll-interval"], "N", "polling interval (in seconds) while waiting for updates",
-         :default => 5, &method(:Integer)
-
-  option "--debug", :flag, "enable debugging"
-
-  option ["--version"], :flag, "display version" do
-    puts "stackup v#{Stackup::VERSION}"
-    exit 0
-  end
-
-  parameter "NAME", "Name of stack", :attribute_name => :stack_name
-
-  def run(arguments)
-    super(arguments)
-  rescue Stackup::Source::ReadError => e
-    signal_error e.message
-  rescue Stackup::ServiceError => e
-    signal_error e.message
-  rescue Aws::Errors::MissingCredentialsError
-    signal_error "no credentials provided"
-  rescue Aws::Errors::ServiceError => e
-    signal_error e.message
-  end
-
-  private
-
-  def logger
-    @logger ||= ConsoleLogger.new($stdout, debug?)
-  end
-
-  def format_data(data)
-    if yaml?
-      YAML.dump(data)
-    else
-      MultiJson.dump(data, :pretty => true)
-    end
-  end
-
-  def display_data(data)
-    puts format_data(data)
-  end
-
-  def role_arn=(arg)
-    raise ArgumentError, "#{arg.inspect} doesn't look like a role ARN" unless arg =~ %r{^arn:aws:iam::\d+:role/}
-
-    @role_arn = arg
-  end
-
-  def stackup
-    Stackup(aws_config)
-  end
-
-  def base_aws_config
-    {
-      :log_level => :debug,
-      :logger => logger,
-      :region => region,
-      :retry_limit => retry_limit
-    }.reject { |_k, v| v.nil? }
-  end
-
-  def aws_config
-    return base_aws_config unless role_arn
-
-    assumed_credentials = Aws::AssumeRoleCredentials.new(
-      :client => Aws::STS::Client.new(base_aws_config),
-      :role_arn => role_arn,
-      :role_session_name => "stackup-#{SecureRandom.hex(8)}"
-    )
-    base_aws_config.merge(:credentials => assumed_credentials)
-  end
-
-  def stack
-    stackup.stack(stack_name, :wait => wait?, :wait_poll_interval => wait_poll_interval)
-  end
-
-  def list_stacks
-    stackup.stack_names.each do |name|
-      puts name
-    end
-  end
-
-  def report_change
-    final_status = yield
-    puts final_status unless final_status.nil?
-  end
-
-  subcommand "status", "Print stack status." do
-
-    def execute
-      puts stack.status
-    end
-
-  end
-
-  module HasParameters
-
-    extend Clamp::Option::Declaration
-
-    option ["-p", "--parameters"], "FILE", "parameters file (last wins)",
-           :multivalued => true,
-           :attribute_name => :parameter_sources,
-           &Stackup::Source.method(:new)
-
-    option ["-o", "--override"], "PARAM=VALUE", "parameter overrides",
-           :multivalued => true,
-           :attribute_name => :override_list
-
-    private
-
-    def parameters
-      parameters_from_files.merge(parameter_overrides)
-    end
-
-    def parameters_from_files
-      parameter_sources.map do |src|
-        Stackup::Parameters.new(src.data).to_hash
-      end.inject({}, :merge)
-    end
-
-    def parameter_overrides
-      {}.tap do |result|
-        override_list.each do |override|
-          key, value = override.split("=", 2)
-          result[key] = value
-        end
-      end
-    end
-
-  end
-
-  subcommand "up", "Create/update the stack." do
-
-    option ["-t", "--template"], "FILE", "template source",
-           :attribute_name => :template_source,
-           &Stackup::Source.method(:new)
-
-    option ["-T", "--use-previous-template"], :flag,
-           "reuse the existing template"
-
-    option ["-P", "--preserve-template-formatting"], :flag,
-           "do not normalise the template when calling the Cloudformation APIs; useful for preserving YAML and comments"
-
-    include HasParameters
-
-    option "--tags", "FILE", "stack tags file",
-           :attribute_name => :tag_source,
-           &Stackup::Source.method(:new)
-
-    option "--policy", "FILE", "stack policy file",
-           :attribute_name => :policy_source,
-           &Stackup::Source.method(:new)
-
-    option "--service-role-arn", "SERVICE_ROLE_ARN", "cloudformation service role ARN" do |arg|
-      raise ArgumentError, "#{arg.inspect} doesn't look like a role ARN" unless arg =~ %r{^arn:aws:iam::\d+:role/}
-
-      arg
-    end
-
-    option "--on-failure", "ACTION",
-           "when stack creation fails: DO_NOTHING, ROLLBACK, or DELETE",
-           :default => "ROLLBACK"
-
-    option "--capability", "CAPABILITY", "cloudformation capability",
-           :multivalued => true, :default => ["CAPABILITY_NAMED_IAM"]
-
-    def execute
-      unless template_source || use_previous_template?
-        signal_usage_error "Specify either --template or --use-previous-template"
-      end
-      options = {}
-      if template_source
-        if template_source.s3?
-          options[:template_url] = template_source.location
-        else
-          options[:template] = template_source.data
-          options[:template_orig] = template_source.body
-        end
-      end
-      options[:on_failure] = on_failure
-      options[:parameters] = parameters
-      options[:tags] = tag_source.data if tag_source
-      if policy_source
-        if policy_source.s3?
-          options[:stack_policy_url] = policy_source.location
-        else
-          options[:stack_policy] = policy_source.data
-        end
-      end
-      options[:role_arn] = service_role_arn if service_role_arn
-      options[:use_previous_template] = use_previous_template?
-      options[:capabilities] = capability_list
-      options[:preserve] = preserve_template_formatting?
-      report_change do
-        stack.create_or_update(options)
-      end
-    end
-
-  end
-
-  subcommand ["change-sets"], "List change-sets." do
-
-    def execute
-      stack.change_set_summaries.each do |change_set|
-        puts [
-          pad(change_set.change_set_name, 36),
-          pad(change_set.status, 20),
-          pad(change_set.execution_status, 24)
-        ].join("  ")
-      end
-    end
-
-    private
-
-    def pad(s, width)
-      (s || "").ljust(width)
-    end
-
-  end
-
-  subcommand ["change-set"], "Change-set operations." do
-
-    option "--name", "NAME", "Name of change-set",
-           :attribute_name => :change_set_name,
-           :default => "pending"
-
-    subcommand "create", "Create a change-set." do
-
-      option ["-d", "--description"], "DESC",
-             "Change-set description"
-
-      option ["-t", "--template"], "FILE", "template source",
-             :attribute_name => :template_source,
-             &Stackup::Source.method(:new)
-
-      option ["-T", "--use-previous-template"], :flag,
-             "reuse the existing template"
-
-      option ["-P", "--preserve-template-formatting"], :flag,
-             "do not normalise the template when calling the Cloudformation APIs; useful for preserving YAML and comments"
-
-      option ["--force"], :flag,
-             "replace existing change-set of the same name"
-
-      include HasParameters
-
-      option "--tags", "FILE", "stack tags file",
-             :attribute_name => :tag_source,
-             &Stackup::Source.method(:new)
-
-      option "--capability", "CAPABILITY", "cloudformation capability",
-             :multivalued => true, :default => ["CAPABILITY_NAMED_IAM"]
-
-      def execute
-        unless template_source || use_previous_template?
-          signal_usage_error "Specify either --template or --use-previous-template"
-        end
-        options = {}
-        if template_source
-          if template_source.s3?
-            options[:template_url] = template_source.location
-          else
-            options[:template] = template_source.data
-            options[:template_orig] = template_source.body
-          end
-        end
-        options[:parameters] = parameters
-        options[:description] = description if description
-        options[:tags] = tag_source.data if tag_source
-        options[:use_previous_template] = use_previous_template?
-        options[:force] = force?
-        options[:capabilities] = capability_list
-        options[:preserve] = preserve_template_formatting?
-        report_change do
-          change_set.create(options)
-        end
-      end
-
-    end
-
-    subcommand "changes", "Describe the change-set." do
-
-      def execute
-        display_data(change_set.describe.changes.map(&:to_h))
-      end
-
-    end
-
-    subcommand "inspect", "Show full change-set details." do
-
-      def execute
-        display_data(change_set.describe.to_h)
-      end
-
-    end
-
-    subcommand ["apply", "execute"], "Apply the change-set." do
-
-      def execute
-        report_change do
-          change_set.execute
-        end
-      end
-
-    end
-
-    subcommand "delete", "Delete the change-set." do
-
-      def execute
-        report_change do
-          change_set.delete
-        end
-      end
-
-    end
-
-    private
-
-    def change_set
-      stack.change_set(change_set_name)
-    end
-
-  end
-
-  subcommand "diff", "Compare template/params to current stack." do
-
-    option "--diff-format", "FORMAT", "'text', 'color', or 'html'", :default => "color"
-
-    option ["-C", "--context-lines"], "LINES", "number of lines of context to show", :default => 10_000
-
-    option ["-t", "--template"], "FILE", "template source",
-           :attribute_name => :template_source,
-           &Stackup::Source.method(:new)
-
-    include HasParameters
-
-    option "--tags", "FILE", "stack tags file",
-           :attribute_name => :tag_source,
-           &Stackup::Source.method(:new)
-
-    def execute
-      current = {}
-      planned = {}
-      if template_source
-        current["Template"] = stack.template
-        planned["Template"] = template_source.data
-      end
-      unless parameter_sources.empty?
-        current["Parameters"] = existing_parameters.sort.to_h
-        planned["Parameters"] = new_parameters.sort.to_h
-      end
-      if tag_source
-        current["Tags"] = stack.tags.sort.to_h
-        planned["Tags"] = tag_source.data.sort.to_h
-      end
-      signal_usage_error "specify '--template' or '--parameters'" if planned.empty?
-      puts differ.diff(current, planned, context_lines)
-    end
-
-    private
-
-    def differ
-      Stackup::Differ.new(diff_format, &method(:format_data))
-    end
-
-    def existing_parameters
-      @existing_parameters ||= stack.parameters
-    end
-
-    def new_parameters
-      existing_parameters.merge(parameters)
-    end
-
-  end
-
-  subcommand ["down", "delete"], "Remove the stack." do
-
-    def execute
-      report_change do
-        stack.delete
-      end
-    end
-
-  end
-
-  subcommand "cancel-update", "Cancel the update in-progress." do
-
-    def execute
-      report_change do
-        stack.cancel_update
-      end
-    end
-
-  end
-
-  subcommand "wait", "Wait until stack is stable." do
-
-    def execute
-      puts stack.wait
-    end
-
-  end
-
-  subcommand "events", "List stack events." do
-
-    option ["-f", "--follow"], :flag, "follow new events"
-    option ["--data"], :flag, "display events as data"
-
-    def execute
-      stack.watch(false) do |watcher|
-        loop do
-          watcher.each_new_event do |event|
-            display_event(event)
-          end
-          break unless follow?
-
-          sleep 5
-        end
-      end
-    end
-
-    private
-
-    def display_event(e)
-      if data?
-        display_data(event_data(e))
-      else
-        puts event_summary(e)
-      end
-    end
-
-    def event_data(e)
-      {
-        "timestamp" => e.timestamp.localtime,
-        "logical_resource_id" => e.logical_resource_id,
-        "physical_resource_id" => e.physical_resource_id,
-        "resource_status" => e.resource_status,
-        "resource_status_reason" => e.resource_status_reason
-      }.reject { |_k, v| blank?(v) }
-    end
-
-    def blank?(v)
-      v.nil? || v.respond_to?(:empty?) && v.empty?
-    end
-
-    def event_summary(e)
-      summary = "[#{e.timestamp.localtime.iso8601}] #{e.logical_resource_id}"
-      summary += " - #{e.resource_status}"
-      summary += " - #{e.resource_status_reason}" if e.resource_status_reason
-      summary
-    end
-
-  end
-
-  subcommand "template", "Display stack template." do
-
-    def execute
-      display_data(stack.template)
-    end
-
-  end
-
-  subcommand ["parameters", "params"], "Display stack parameters." do
-
-    def execute
-      display_data(stack.parameters)
-    end
-
-  end
-
-  subcommand "tags", "Display stack tags." do
-
-    def execute
-      display_data(stack.tags)
-    end
-
-  end
-
-  subcommand "resources", "Display stack resources." do
-
-    def execute
-      display_data(stack.resources)
-    end
-
-  end
-
-  subcommand "outputs", "Display stack outputs." do
-
-    def execute
-      display_data(stack.outputs)
-    end
-
-  end
-
-  subcommand "inspect", "Display stack particulars." do
-
-    def execute
-      data = {
-        "Status" => stack.status,
-        "Parameters" => stack.parameters,
-        "Tags" => stack.tags,
-        "Resources" => stack.resources,
-        "Outputs" => stack.outputs
-      }
-      display_data(data)
-    end
-
-  end
-
-end
+Stackup::MainCommand.run

data/lib/stackup/main_command.rb

@@ -0,0 +1,557 @@
+require "clamp"
+require "console_logger"
+require "multi_json"
+require "securerandom"
+require "stackup"
+require "stackup/differ"
+require "stackup/source"
+require "stackup/version"
+require "stackup/yaml"
+
+module Stackup
+
+  class MainCommand < Clamp::Command
+
+    option ["-L", "--list"], :flag, "list stacks" do
+      list_stacks
+      exit 0
+    end
+
+    option ["-Y", "--yaml"], :flag, "output data in YAML format"
+
+    option ["--region"], "REGION", "set region" do |arg|
+      raise ArgumentError, "#{arg.inspect} doesn't look like a region" unless arg =~ /^[a-z]{2}-[a-z]+-\d$/
+
+      arg
+    end
+
+    option ["--with-role"], "ROLE_ARN", "assume this role",
+           :attribute_name => :role_arn
+
+    option ["--retry-limit"], "N", "maximum number of retries for API calls",
+           :environment_variable => "AWS_API_RETRY_LIMIT" do |arg|
+      Integer(arg)
+    end
+
+    option ["--[no-]wait"], :flag, "wait for stack updates to complete",
+           :default => true
+
+    option ["--wait-poll-interval"], "N", "polling interval (in seconds) while waiting for updates",
+           :default => 5, &method(:Integer)
+
+    option "--debug", :flag, "enable debugging"
+
+    option ["--version"], :flag, "display version" do
+      puts "stackup v#{Stackup::VERSION}"
+      exit 0
+    end
+
+    parameter "NAME", "Name of stack", :attribute_name => :stack_name
+
+    def run(arguments)
+      super(arguments)
+    rescue Stackup::Source::ReadError => e
+      signal_error e.message
+    rescue Stackup::ServiceError => e
+      signal_error e.message
+    rescue Aws::Errors::MissingCredentialsError
+      signal_error "no credentials provided"
+    rescue Aws::Errors::ServiceError => e
+      signal_error e.message
+    end
+
+    private
+
+    def logger
+      @logger ||= ConsoleLogger.new($stdout, debug?)
+    end
+
+    def format_data(data)
+      if yaml?
+        YAML.dump(data)
+      else
+        MultiJson.dump(data, :pretty => true)
+      end
+    end
+
+    def display_data(data)
+      puts format_data(data)
+    end
+
+    def role_arn=(arg)
+      raise ArgumentError, "#{arg.inspect} doesn't look like a role ARN" unless arg =~ %r{^arn:aws:iam::\d+:role/}
+
+      @role_arn = arg
+    end
+
+    def stackup
+      Stackup(aws_config)
+    end
+
+    def base_aws_config
+      {
+        :log_level => :debug,
+        :logger => logger,
+        :region => region,
+        :retry_limit => retry_limit
+      }.reject { |_k, v| v.nil? }
+    end
+
+    def aws_config
+      return base_aws_config unless role_arn
+
+      assumed_credentials = Aws::AssumeRoleCredentials.new(
+        :client => Aws::STS::Client.new(base_aws_config),
+        :role_arn => role_arn,
+        :role_session_name => "stackup-#{SecureRandom.hex(8)}"
+      )
+      base_aws_config.merge(:credentials => assumed_credentials)
+    end
+
+    def stack
+      stackup.stack(stack_name, :wait => wait?, :wait_poll_interval => wait_poll_interval)
+    end
+
+    def list_stacks
+      stackup.stack_names.each do |name|
+        puts name
+      end
+    end
+
+    def report_change
+      final_status = yield
+      puts final_status unless final_status.nil?
+    end
+
+    subcommand "status", "Print stack status." do
+
+      def execute
+        puts stack.status
+      end
+
+    end
+
+    module HasParameters
+
+      extend Clamp::Option::Declaration
+
+      option ["-p", "--parameters"], "FILE", "parameters file (last wins)",
+             :multivalued => true,
+             :attribute_name => :parameter_sources,
+             &Stackup::Source.method(:new)
+
+      option ["-o", "--override"], "PARAM=VALUE", "parameter overrides",
+             :multivalued => true,
+             :attribute_name => :override_list
+
+      private
+
+      def parameters
+        parameters_from_files.merge(parameter_overrides)
+      end
+
+      def parameters_from_files
+        parameter_sources.map do |src|
+          Stackup::Parameters.new(src.data).to_hash
+        end.inject({}, :merge)
+      end
+
+      def parameter_overrides
+        {}.tap do |result|
+          override_list.each do |override|
+            key, value = override.split("=", 2)
+            result[key] = value
+          end
+        end
+      end
+
+    end
+
+    subcommand "up", "Create/update the stack." do
+
+      option ["-t", "--template"], "FILE", "template source",
+             :attribute_name => :template_source,
+             &Stackup::Source.method(:new)
+
+      option ["-T", "--use-previous-template"], :flag,
+             "reuse the existing template"
+
+      option ["-P", "--preserve-template-formatting"], :flag,
+             "do not normalise the template when calling the Cloudformation APIs; useful for preserving YAML and comments"
+
+      include HasParameters
+
+      option "--tags", "FILE", "stack tags file",
+             :attribute_name => :tag_source,
+             &Stackup::Source.method(:new)
+
+      option "--policy", "FILE", "stack policy file",
+             :attribute_name => :policy_source,
+             &Stackup::Source.method(:new)
+
+      option "--service-role-arn", "SERVICE_ROLE_ARN", "cloudformation service role ARN" do |arg|
+        raise ArgumentError, "#{arg.inspect} doesn't look like a role ARN" unless arg =~ %r{^arn:aws:iam::\d+:role/}
+
+        arg
+      end
+
+      option "--on-failure", "ACTION",
+             "when stack creation fails: DO_NOTHING, ROLLBACK, or DELETE",
+             :default => "ROLLBACK"
+
+      option "--capability", "CAPABILITY", "cloudformation capability",
+             :multivalued => true, :default => ["CAPABILITY_NAMED_IAM"]
+
+      def execute
+        unless template_source || use_previous_template?
+          signal_usage_error "Specify either --template or --use-previous-template"
+        end
+        options = {}
+        if template_source
+          if template_source.s3?
+            options[:template_url] = template_source.location
+          else
+            options[:template] = template_source.data
+            options[:template_orig] = template_source.body
+          end
+        end
+        options[:on_failure] = on_failure
+        options[:parameters] = parameters
+        options[:tags] = tag_source.data if tag_source
+        if policy_source
+          if policy_source.s3?
+            options[:stack_policy_url] = policy_source.location
+          else
+            options[:stack_policy] = policy_source.data
+          end
+        end
+        options[:role_arn] = service_role_arn if service_role_arn
+        options[:use_previous_template] = use_previous_template?
+        options[:capabilities] = capability_list
+        options[:preserve] = preserve_template_formatting?
+        report_change do
+          stack.create_or_update(options)
+        end
+      end
+
+    end
+
+    subcommand ["change-sets"], "List change-sets." do
+
+      def execute
+        stack.change_set_summaries.each do |change_set|
+          puts [
+            pad(change_set.change_set_name, 36),
+            pad(change_set.status, 20),
+            pad(change_set.execution_status, 24)
+          ].join("  ")
+        end
+      end
+
+      private
+
+      def pad(s, width)
+        (s || "").ljust(width)
+      end
+
+    end
+
+    subcommand ["change-set"], "Change-set operations." do
+
+      option "--name", "NAME", "Name of change-set",
+             :attribute_name => :change_set_name,
+             :default => "pending"
+
+      subcommand "create", "Create a change-set." do
+
+        option ["-d", "--description"], "DESC",
+               "Change-set description"
+
+        option ["-t", "--template"], "FILE", "template source",
+               :attribute_name => :template_source,
+               &Stackup::Source.method(:new)
+
+        option ["-T", "--use-previous-template"], :flag,
+               "reuse the existing template"
+
+        option ["-P", "--preserve-template-formatting"], :flag,
+               "do not normalise the template when calling the Cloudformation APIs; useful for preserving YAML and comments"
+
+        option ["--force"], :flag,
+               "replace existing change-set of the same name"
+
+        include HasParameters
+
+        option "--tags", "FILE", "stack tags file",
+               :attribute_name => :tag_source,
+               &Stackup::Source.method(:new)
+
+        option "--service-role-arn", "SERVICE_ROLE_ARN", "cloudformation service role ARN" do |arg|
+          raise ArgumentError, "#{arg.inspect} doesn't look like a role ARN" unless arg =~ %r{^arn:aws:iam::\d+:role/}
+
+          arg
+        end
+
+        option "--capability", "CAPABILITY", "cloudformation capability",
+               :multivalued => true, :default => ["CAPABILITY_NAMED_IAM"]
+
+        def execute
+          unless template_source || use_previous_template?
+            signal_usage_error "Specify either --template or --use-previous-template"
+          end
+          options = {}
+          if template_source
+            if template_source.s3?
+              options[:template_url] = template_source.location
+            else
+              options[:template] = template_source.data
+              options[:template_orig] = template_source.body
+            end
+          end
+          options[:parameters] = parameters
+          options[:description] = description if description
+          options[:tags] = tag_source.data if tag_source
+          options[:role_arn] = service_role_arn if service_role_arn
+          options[:use_previous_template] = use_previous_template?
+          options[:force] = force?
+          options[:capabilities] = capability_list
+          options[:preserve] = preserve_template_formatting?
+          report_change do
+            change_set.create(options)
+          end
+        end
+
+      end
+
+      subcommand "changes", "Describe the change-set." do
+
+        def execute
+          display_data(change_set.describe.changes.map(&:to_h))
+        end
+
+      end
+
+      subcommand "inspect", "Show full change-set details." do
+
+        def execute
+          display_data(change_set.describe.to_h)
+        end
+
+      end
+
+      subcommand ["apply", "execute"], "Apply the change-set." do
+
+        def execute
+          report_change do
+            change_set.execute
+          end
+        end
+
+      end
+
+      subcommand "delete", "Delete the change-set." do
+
+        def execute
+          report_change do
+            change_set.delete
+          end
+        end
+
+      end
+
+      private
+
+      def change_set
+        stack.change_set(change_set_name)
+      end
+
+    end
+
+    subcommand "diff", "Compare template/params to current stack." do
+
+      option "--diff-format", "FORMAT", "'text', 'color', or 'html'", :default => "color"
+
+      option ["-C", "--context-lines"], "LINES", "number of lines of context to show", :default => 10_000
+
+      option ["-t", "--template"], "FILE", "template source",
+             :attribute_name => :template_source,
+             &Stackup::Source.method(:new)
+
+      include HasParameters
+
+      option "--tags", "FILE", "stack tags file",
+             :attribute_name => :tag_source,
+             &Stackup::Source.method(:new)
+
+      def execute
+        current = {}
+        planned = {}
+        if template_source
+          current["Template"] = stack.template
+          planned["Template"] = template_source.data
+        end
+        unless parameter_sources.empty?
+          current["Parameters"] = existing_parameters.sort.to_h
+          planned["Parameters"] = new_parameters.sort.to_h
+        end
+        if tag_source
+          current["Tags"] = stack.tags.sort.to_h
+          planned["Tags"] = tag_source.data.sort.to_h
+        end
+        signal_usage_error "specify '--template' or '--parameters'" if planned.empty?
+        puts differ.diff(current, planned, context_lines)
+      end
+
+      private
+
+      def differ
+        Stackup::Differ.new(diff_format, &method(:format_data))
+      end
+
+      def existing_parameters
+        @existing_parameters ||= stack.parameters
+      end
+
+      def new_parameters
+        existing_parameters.merge(parameters)
+      end
+
+    end
+
+    subcommand ["down", "delete"], "Remove the stack." do
+
+      def execute
+        report_change do
+          stack.delete
+        end
+      end
+
+    end
+
+    subcommand "cancel-update", "Cancel the update in-progress." do
+
+      def execute
+        report_change do
+          stack.cancel_update
+        end
+      end
+
+    end
+
+    subcommand "wait", "Wait until stack is stable." do
+
+      def execute
+        puts stack.wait
+      end
+
+    end
+
+    subcommand "events", "List stack events." do
+
+      option ["-f", "--follow"], :flag, "follow new events"
+      option ["--data"], :flag, "display events as data"
+
+      def execute
+        stack.watch(false) do |watcher|
+          loop do
+            watcher.each_new_event do |event|
+              display_event(event)
+            end
+            break unless follow?
+
+            sleep 5
+          end
+        end
+      end
+
+      private
+
+      def display_event(e)
+        if data?
+          display_data(event_data(e))
+        else
+          puts event_summary(e)
+        end
+      end
+
+      def event_data(e)
+        {
+          "timestamp" => e.timestamp.localtime,
+          "logical_resource_id" => e.logical_resource_id,
+          "physical_resource_id" => e.physical_resource_id,
+          "resource_status" => e.resource_status,
+          "resource_status_reason" => e.resource_status_reason
+        }.reject { |_k, v| blank?(v) }
+      end
+
+      def blank?(v)
+        v.nil? || v.respond_to?(:empty?) && v.empty?
+      end
+
+      def event_summary(e)
+        summary = "[#{e.timestamp.localtime.iso8601}] #{e.logical_resource_id}"
+        summary += " - #{e.resource_status}"
+        summary += " - #{e.resource_status_reason}" if e.resource_status_reason
+        summary
+      end
+
+    end
+
+    subcommand "template", "Display stack template." do
+
+      def execute
+        display_data(stack.template)
+      end
+
+    end
+
+    subcommand ["parameters", "params"], "Display stack parameters." do
+
+      def execute
+        display_data(stack.parameters)
+      end
+
+    end
+
+    subcommand "tags", "Display stack tags." do
+
+      def execute
+        display_data(stack.tags)
+      end
+
+    end
+
+    subcommand "resources", "Display stack resources." do
+
+      def execute
+        display_data(stack.resources)
+      end
+
+    end
+
+    subcommand "outputs", "Display stack outputs." do
+
+      def execute
+        display_data(stack.outputs)
+      end
+
+    end
+
+    subcommand "inspect", "Display stack particulars." do
+
+      def execute
+        data = {
+          "Status" => stack.status,
+          "Parameters" => stack.parameters,
+          "Tags" => stack.tags,
+          "Resources" => stack.resources,
+          "Outputs" => stack.outputs
+        }
+        display_data(data)
+      end
+
+    end
+
+  end
+
+end

data/lib/stackup/version.rb

@@ -1,5 +1,5 @@
 module Stackup
 
-  VERSION = "1.5.1".freeze
+  VERSION = "1.6.0".freeze
 
 end

data/spec/stackup/main_command_spec.rb

@@ -0,0 +1,23 @@
+require "stackup/main_command"
+
+describe Stackup::MainCommand do
+  context "change-set create --service-role-arn"
+    it "invokes stack.change_set.create with role arn passed through" do
+      mock_stackup = double()
+      mock_stack = double()
+      mock_change_set = double()
+      allow_any_instance_of(Stackup::MainCommand).to receive(:Stackup).and_return(mock_stackup)
+      allow(mock_stackup).to receive(:stack).and_return(mock_stack)
+      allow(mock_stack).to receive(:change_set).and_return(mock_change_set)
+
+      expected_args = {
+        role_arn: "arn:aws:iam::000000000000:role/example"
+      }
+      expect(mock_change_set).to receive(:create).with(hash_including(expected_args))
+
+      Stackup::MainCommand.run("stackup", [
+        "STACK-NAME", "change-set", "create",
+        "--template", "examples/template.yml",
+        "--service-role-arn", "arn:aws:iam::000000000000:role/example"])
+    end
+end

data/spec/stackup/stack_spec.rb

@@ -342,6 +342,23 @@ describe Stackup::Stack do
           .with(hash_including(expected_args))
       end
 
+      it "passes options through to :create_change_set" do
+        options = {
+          :template_body => template,
+          :role_arn => "service role arn"
+        }
+        expected_args = {
+          :stack_name => stack_name,
+          :change_set_name => change_set_name,
+          :change_set_type => "CREATE",
+          :template_body => template,
+          :role_arn => "service role arn"
+        }
+        stack.change_set(change_set_name).create(options)
+        expect(cf_client).to have_received(:create_change_set)
+          .with(hash_including(expected_args))
+      end
+
       context "with :template as data" do
 
         let(:options) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stackup
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Mike Williams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-18 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudformation
@@ -99,6 +99,7 @@ files:
 - lib/stackup/differ.rb
 - lib/stackup/error_handling.rb
 - lib/stackup/errors.rb
+- lib/stackup/main_command.rb
 - lib/stackup/parameters.rb
 - lib/stackup/rake_tasks.rb
 - lib/stackup/service.rb
@@ -109,6 +110,7 @@ files:
 - lib/stackup/version.rb
 - lib/stackup/yaml.rb
 - spec/spec_helper.rb
+- spec/stackup/main_command_spec.rb
 - spec/stackup/parameters_spec.rb
 - spec/stackup/rake_tasks_spec.rb
 - spec/stackup/source_spec.rb
@@ -141,6 +143,7 @@ specification_version: 4
 summary: Manage CloudFormation stacks
 test_files:
 - spec/spec_helper.rb
+- spec/stackup/main_command_spec.rb
 - spec/stackup/parameters_spec.rb
 - spec/stackup/rake_tasks_spec.rb
 - spec/stackup/source_spec.rb