moonshot 2.0.0.beta3 → 2.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36e066b2e7b8b790bbdf2a6ae2f0ff2b460be924
-  data.tar.gz: ca20969b8fe43fe8cf7296ab3559a9af2132505c
+  metadata.gz: c356399f35faaaf5a8607cdd8981be62eeae1ec5
+  data.tar.gz: 5b84246b209003da95a2ec5debcd5418786efe93
 SHA512:
-  metadata.gz: afd2ff66f8f3892cebd6c66c32c90af442eb2d518b86b2c6fd315da716dba8d5097a0c16f9563ad3f85ba6664d905a1dfc0e4790c03ed83eac5288f75f0072c6
-  data.tar.gz: 76667b1b524cabecd1b6994c29d5ecc7b38e80fb92bfcce9d55f6620d4d1566873d612d6177ce58ca50136116e898415e4b2d74d3b2c7bc9fe3cd2ca163f1cb1
+  metadata.gz: 329a31f99d19662734d917c41036dbeef77398319feb9afe93e7375c3b57d1cbbda4a368e9b05d22a64620db4cc49d6a6f5359cfeeccac6e08b60fb504e325df
+  data.tar.gz: a7917a5b06f86e4442e03ee976b48b6360eb7eef12c87634774a76b2f3983fca3a373a2391ec94a0088788c28620c916492f5fba421ae51ee186b8f0fc3d2d8d

data/lib/moonshot/build_mechanism/github_release.rb

@@ -17,10 +17,20 @@ module Moonshot::BuildMechanism
     def_delegator :@build_mechanism, :output_file
 
     # @param build_mechanism Delegates building after GitHub release is created.
-    def initialize(build_mechanism, ci_status_timeout: 600, max_tag_find_timeout: 240)
+    def initialize(build_mechanism,
+                   ci_status_timeout: 600,
+                   max_tag_find_timeout: 240,
+                   skip_ci_status: false)
       @build_mechanism = build_mechanism
       @ci_status_timeout = ci_status_timeout
       @max_tag_find_timeout = max_tag_find_timeout
+      @skip_ci_status = skip_ci_status
+    end
+
+    def build_cli_hook(parser)
+      parser.on('-s', '--[no-]skip-ci-status', 'Skips checks on CI jobs', TrueClass) do |value|
+        @skip_ci_status = value
+      end
     end
 
     def doctor_hook
@@ -159,7 +169,7 @@ module Moonshot::BuildMechanism
       sh_step(cmd, msg: "Validate commit #{@sha}.") do |_, out|
         @commit_detail = out
       end
-      @ci_statuses = check_ci_status(@sha)
+      @ci_statuses = check_ci_status(@sha) if @skip_ci_status == false
     end
 
     def validate_changelog(version)

data/lib/moonshot/command_line.rb

@@ -111,6 +111,8 @@ module Moonshot
         command_name = commandify(klass)
         @commands[command_name] = klass
       end
+
+      @commands = @commands.sort_by { |k, _v| k.to_s }.to_h
     end
 
     def commandify(klass)

data/lib/moonshot/controller_config.rb

@@ -26,6 +26,7 @@ module Moonshot
     attr_accessor :ssh_command
     attr_accessor :ssh_config
     attr_accessor :ssh_instance
+    attr_accessor :template_s3_bucket
 
     def initialize
       @default_parameter_source = AskUserSource.new

data/lib/moonshot/stack.rb

@@ -176,14 +176,39 @@ module Moonshot
       raise "Could not describe stack: #{name}"
     end
 
+    def upload_template_to_s3
+      unless @config.template_s3_bucket
+        raise 'The S3 bucket to store the template in is not configured.'
+      end
+
+      s3_object_key = "#{@name}-#{Time.now.getutc.to_i}-#{File.basename(template.filename)}"
+      template_url = "http://#{@config.template_s3_bucket}.s3.amazonaws.com/#{s3_object_key}"
+
+      @ilog.start "Uploading template to #{template_url}" do |s|
+        s3_client.put_object(
+          bucket: @config.template_s3_bucket,
+          key: s3_object_key,
+          body: template.body
+        )
+        s.success "Template has been uploaded successfully to #{template_url}"
+      end
+
+      template_url
+    end
+
     def create_stack
-      cf_client.create_stack(
+      parameters = {
         stack_name: @name,
-        template_body: template.body,
         capabilities: %w(CAPABILITY_IAM CAPABILITY_NAMED_IAM),
         parameters: @config.parameters.values.map(&:to_cf),
         tags: make_tags
-      )
+      }
+      if @config.template_s3_bucket
+        parameters[:template_url] = upload_template_to_s3
+      else
+        parameters[:template_body] = template.body
+      end
+      cf_client.create_stack(parameters)
     rescue Aws::CloudFormation::Errors::AccessDenied
       raise 'You are not authorized to perform create_stack calls.'
     end
@@ -195,14 +220,20 @@ module Moonshot
         Time.now.utc.to_i.to_s
       ].join('-')
 
-      cf_client.create_change_set(
+      parameters = {
         change_set_name: change_set_name,
         description: "Moonshot update command for application '#{Moonshot.config.app_name}'",
         stack_name: @name,
-        template_body: template.body,
         capabilities:  %w(CAPABILITY_IAM CAPABILITY_NAMED_IAM),
         parameters: @config.parameters.values.map(&:to_cf)
-      )
+      }
+      if @config.template_s3_bucket
+        parameters[:template_url] = upload_template_to_s3
+      else
+        parameters[:template_body] = template.body
+      end
+
+      cf_client.create_change_set(parameters)
 
       change_set_name
     end
@@ -289,7 +320,12 @@ module Moonshot
     end
 
     def doctor_check_template_against_aws
-      cf_client.validate_template(template_body: template.body)
+      if @config.template_s3_bucket
+        parameters[:template_url] = upload_template_to_s3
+      else
+        parameters[:template_body] = template.body
+      end
+      cf_client.validate_template(parameters)
       success('CloudFormation template is valid.')
     rescue => e
       critical('Invalid CloudFormation template!', e.message)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moonshot
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta3
+  version: 2.0.0.beta4
 platform: ruby
 authors:
 - Cloud Engineering <engineering@acquia.com>
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk