moonshot 1.1.0.beta4 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcd7bf169cbf27f74b4e6e4f16c59905fb8ed42c
-  data.tar.gz: 5ba58bf877dbbc8e339ef7ff0241633fa1ab5fc2
+  metadata.gz: 5d2a30d2ed3a9a3f146a0bcf4972f0bfc9baff41
+  data.tar.gz: 0087b7d90297d013cffd9b787f88b720dc357212
 SHA512:
-  metadata.gz: 46ed5758422fcad2d667c00936c776fb98f9215e4adfee08595a209bba25101db5414cc0dbcc9b074df1be8693f1ac15abdbb628e59cb1ec8c88b4513f1f7fae
-  data.tar.gz: 1ba2463d5e468c8564d6c07b75b736d4ff69d3454f7ec5a2a260ffcd3f446e83305576e95d8d127c39d6a7a3dc42c21e74dd4e0a21fb71e1c4397422898a6a8f
+  metadata.gz: 6c1e1938bd414ec74f03185c824cf45e4c3f101b7b4acbaabbec46d71f17bf018b56600201eb1445c6b8b9c14c9c81223819c428a4667f4f67e69a90ddde5ba2
+  data.tar.gz: c7262c61bd51cf6febe8f31cee9a8ef64831580aeaacba2b883725b5f36d38389db5337d456ba693c03249c1f24d68df3c29ab9d47cb088930793dd23aa9cfed

data/lib/moonshot/command_line_dispatcher.rb

@@ -16,7 +16,8 @@ module Moonshot
       parser = build_parser(handler)
       parser.parse!
 
-      unless @args.size == handler.method(:execute).arity
+      req_arguments = handler.method(:execute).parameters.select { |arg| arg[0] == :req }
+      if ARGV.size < req_arguments.size
         warn handler.parser.help
         raise "Invalid command line for '#{@command}'."
       end

data/lib/moonshot/deployment_mechanism/code_deploy.rb

@@ -307,9 +307,13 @@ class Moonshot::DeploymentMechanism::CodeDeploy # rubocop:disable ClassLength
       inst_summary.lifecycle_events.each do |event|
         next unless event.status == 'Failed'
 
-        ilog.error(event.diagnostics.message)
-        event.diagnostics.log_tail.each_line do |line|
-          ilog.error(line)
+        if event.diagnostics.nil?
+          ilog.error('Lifecycle event chain is not available.')
+        else
+          ilog.error(event.diagnostics.message)
+          event.diagnostics.log_tail.each_line do |line|
+            ilog.error(line)
+          end
         end
       end
     end

data/lib/plugins/backup.rb

@@ -1,23 +1,24 @@
 require 'rubygems/package'
 require 'zlib'
+require 'yaml'
 
 module Moonshot
   module Plugins
     # Moonshot plugin class for deflating and uploading files on given hooks
-    class Backup
+    class Backup # rubocop:disable Metrics/ClassLength
       include Moonshot::CredsHelper
 
       attr_accessor :bucket,
                     :buckets,
                     :files,
                     :hooks,
-                    :target_name
+                    :target_name,
+                    :backup_parameters,
+                    :backup_template
 
       def initialize
         yield self if block_given?
-        raise ArgumentError \
-          if @files.nil? || @files.empty? || @hooks.nil? || !(@bucket.nil? ^ @buckets.nil?)
-
+        validate_configuration
         @target_name ||= '%{app_name}_%{timestamp}_%{user}.tar.gz'
       end
 
@@ -29,10 +30,8 @@ module Moonshot
         raise ArgumentError if bucket.nil? || bucket.empty?
         Moonshot::Plugins::Backup.new do |b|
           b.bucket = bucket
-          b.files = [
-            'cloud_formation/%{app_name}.json',
-            'cloud_formation/parameters/%{stack_name}.yml'
-          ]
+          b.backup_parameters = true
+          b.backup_template = true
           b.hooks = [:post_create, :post_update]
         end
       end
@@ -44,10 +43,11 @@ module Moonshot
       def backup(resources)
         raise ArgumentError if resources.nil?
 
-        @app_name = resources.stack.app_name
+        @app_name = resources.controller.config.app_name
         @stack_name = resources.stack.name
         @target_name = render(@target_name)
         @target_bucket = define_bucket
+        @parameters = resources.stack.parameters
 
         return if @target_bucket.nil?
 
@@ -58,7 +58,7 @@ module Moonshot
             upload(zip_out)
 
             s.success("#{log_message} succeeded.")
-          rescue StandardError => e
+          rescue => e
             s.failure("#{log_message} failed: #{e}")
           ensure
             tar_out.close unless tar_out.nil?
@@ -90,18 +90,59 @@ module Moonshot
       def tar(target_files)
         tar_stream = StringIO.new
         Gem::Package::TarWriter.new(tar_stream) do |writer|
-          target_files.each do |file|
-            file = render(file)
-
-            writer.add_file(File.basename(file), 0644) do |io|
-              File.open(file, 'r') { |f| io.write(f.read) }
+          # adding user files
+          unless target_files.nil? || target_files.empty?
+            target_files.each do |file|
+              file = render(file)
+              add_file_to_tar(writer, file)
             end
           end
+
+          # adding parameters
+          if @backup_parameters
+            add_str_to_tar(
+              writer,
+              render('%{stack_name}-parameters.yml'),
+              @parameters
+            )
+          end
+
+          # adding template file
+          if @backup_template
+            template_file_path = render('cloud_formation/%{app_name}.json')
+            add_file_to_tar(writer, template_file_path)
+          end
         end
         tar_stream.seek(0)
         tar_stream
       end
 
+      # Helper method to add a file to an inmemory tar archive.
+      #
+      # @param writer [TarWriter]
+      # @param file_name [String]
+      def add_file_to_tar(writer, file_name)
+        writer.add_file(File.basename(file_name), 0644) do |io|
+          begin
+            File.open(file_name, 'r') { |f| io.write(f.read) }
+          rescue Errno::ENOENT
+            warn "'#{file_name}' was not found."
+          end
+        end
+      end
+
+      # Helper method to add a file based on an input String as content
+      # to an inmemory tar archive.
+      #
+      # @param writer [TarWriter]
+      # @param target_filename [String]
+      # @param content [String]
+      def add_str_to_tar(writer, target_filename, content)
+        writer.add_file(File.basename(target_filename), 0644) do |io|
+          io.write(content.to_yaml)
+        end
+      end
+
       # Create a zip archive in memory, returning the IO object pointing at the
       # beginning of the zipfile.
       #
@@ -168,6 +209,38 @@ module Moonshot
       def bucket_by_account(account)
         @buckets[account]
       end
+
+      def validate_configuration
+        validate_buckets
+        validate_redundant_configuration
+        validate_targets
+        validate_hooks
+      end
+
+      def validate_buckets
+        raise ArgumentError, 'You must specify a target bucket.' \
+          if (@bucket.nil? || @bucket.empty?) \
+          && (@buckets.nil? || @buckets.empty?)
+      end
+
+      def validate_redundant_configuration
+        raise ArgumentError, 'You can not specify both `bucket` and `buckets`.' \
+          if @bucket && @buckets
+      end
+
+      def validate_targets
+        raise ArgumentError, 'You must specify files to back up.' \
+          if (@files.nil? || @files.empty?) \
+          && (!@backup_parameters && !@backup_template)
+      end
+
+      def validate_hooks
+        raise ArgumentError, 'You must specify a hook / hooks to run the backup on.' \
+          if hooks.nil? || hooks.empty?
+
+        raise ArgumentError, '`pre_create` and `post_delete` hooks are not supported.' \
+          if hooks.include?(:pre_create) || hooks.include?(:post_delete)
+      end
     end
   end
 end

data/lib/plugins/encrypted_parameters.rb

@@ -20,92 +20,98 @@
 #   c.parameter_sources['KMSKey1'] = Moonshot::AlwaysUseDefaultSource.new
 # end
 module Moonshot
-  class EncryptedParameters
-    # @param [String] kms_key_parameter_name
-    #   The parameter name to store the KMS Key ARN as.
-    # @param [Array<String>] parameters
-    #   Names of parameters to encrypt, if they are not already set.
-    def initialize(kms_key_parameter_name, parameters)
-      @kms_key_parameter_name = kms_key_parameter_name
-      @parameters = parameters
-      @delete_key = true
-    end
+  module Plugins
+    class EncryptedParameters
+      # @param [String] kms_key_parameter_name
+      #   The parameter name to store the KMS Key ARN as.
+      # @param [Array<String>] parameters
+      #   Names of parameters to encrypt, if they are not already set.
+      def initialize(kms_key_parameter_name, parameters)
+        @kms_key_parameter_name = kms_key_parameter_name
+        @parameters = parameters
+        @delete_key = true
+      end
 
-    def pre_create(res)
-      @ilog = res.ilog
+      def pre_create(res)
+        @ilog = res.ilog
 
-      key_arn = find_or_create_kms_key
-      pe = ParameterEncrypter.new(key_arn)
+        key_arn = find_or_create_kms_key
+        pe = ParameterEncrypter.new(key_arn)
 
-      @parameters.each do |parameter_name|
-        sp = Moonshot.config.parameters[parameter_name]
-        raise "No such parameter #{parameter_name}" unless sp
+        @parameters.each do |parameter_name|
+          sp = Moonshot.config.parameters[parameter_name]
+          raise "No such parameter #{parameter_name}" unless sp
 
-        @ilog.start_threaded "Handling encrypted parameter #{parameter_name.blue}..." do |s|
-          if sp.use_previous?
-            # TODO: Remove this and the one below when the upstream race is fixed.
-            #       See https://github.com/askreet/interactive-logger/issues/7
-            sleep 0.05
-            s.success "Using previous encrypted value for #{parameter_name.blue}."
-          elsif !sp.set? && !sp.default?
-            # If the parameter isn't set, we can't encrypt it. Doing
-            # nothing means we will give the user a friendly error message
-            # about unset parameters when the controller resumes.
-            sleep 0.05
-            s.failure "No value to encrypt for #{parameter_name.blue}!"
-          else
-            s.continue "Encrypting new value for parameter #{parameter_name.blue}..."
-            Moonshot.config.parameters[sp.name].set(pe.encrypt(sp.value))
-            s.success "Encrypted new value for parameter #{parameter_name.blue}!"
+          @ilog.start_threaded "Handling encrypted parameter #{parameter_name.blue}..." do |s|
+            if sp.use_previous?
+              # TODO: Remove this and the one below when the upstream race is fixed.
+              #       See https://github.com/askreet/interactive-logger/issues/7
+              sleep 0.05
+              s.success "Using previous encrypted value for #{parameter_name.blue}."
+            elsif !sp.set? && !sp.default?
+              # If the parameter isn't set, we can't encrypt it. Doing
+              # nothing means we will give the user a friendly error message
+              # about unset parameters when the controller resumes.
+              sleep 0.05
+              s.failure "No value to encrypt for #{parameter_name.blue}!"
+            else
+              s.continue "Encrypting new value for parameter #{parameter_name.blue}..."
+              Moonshot.config.parameters[sp.name].set(pe.encrypt(sp.value))
+              s.success "Encrypted new value for parameter #{parameter_name.blue}!"
+            end
           end
         end
       end
-    end
-    alias pre_update pre_create
+      alias pre_update pre_create
 
-    def post_delete(res)
-      key_arn = Moonshot.config.parameters[@kms_key_parameter_name].value
+      def post_delete(res)
+        key_arn = Moonshot.config.parameters[@kms_key_parameter_name].value
 
-      res.ilog.start_threaded "Cleaning up KMS Key #{@kms_key_parameter_name.blue}..." do |s|
-        if @delete_key
-          KmsKey.new(key_arn).delete
-          s.success "Deleted KMS Key #{@kms_key_parameter_name.blue}!"
-        else
-          # TODO: See above.
-          sleep 0.05
-          s.success "Retained KMS Key #{@kms_key_parameter_name.blue}."
+        res.ilog.start_threaded "Cleaning up KMS Key #{@kms_key_parameter_name.blue}..." do |s|
+          if @delete_key
+            KmsKey.new(key_arn).delete
+            s.success "Deleted KMS Key #{@kms_key_parameter_name.blue}!"
+          else
+            # TODO: See above.
+            sleep 0.05
+            s.success "Retained KMS Key #{@kms_key_parameter_name.blue}."
+          end
         end
       end
-    end
 
-    def delete_cli_hook(parser)
-      parser.on('--retain-kms-key', TrueClass, 'Do not delete the KMS Key for this environment.') do
-        @delete_key = false
+      def delete_cli_hook(parser)
+        parser.on(
+          '--retain-kms-key',
+          TrueClass,
+          'Do not delete the KMS Key for this environment.'
+        ) do
+          @delete_key = false
+        end
       end
-    end
 
-    private
+      private
 
-    def find_or_create_kms_key
-      key_arn = nil
+      def find_or_create_kms_key
+        key_arn = nil
 
-      @ilog.start_threaded "Checking for KMS Key #{@kms_key_parameter_name}" do |s|
-        if Moonshot.config.parameters.key?(@kms_key_parameter_name)
-          if 'Auto' == Moonshot.config.parameters[@kms_key_parameter_name].value
-            s.continue "Auto-generating KMS Key for #{@kms_key_parameter_name.blue}... "
-            key_arn = KmsKey.create.arn
-            Moonshot.config.parameters[@kms_key_parameter_name].set(key_arn)
-            s.success "Created a new KMS Key for #{@kms_key_parameter_name.blue}!"
-          else
-            key_arn = KmsKey.new(Moonshot.config.parameters[@kms_key_parameter_name].value).arn
-            s.success "Using existing KMS Key for #{@kms_key_parameter_name.blue}!"
+        @ilog.start_threaded "Checking for KMS Key #{@kms_key_parameter_name}" do |s|
+          if Moonshot.config.parameters.key?(@kms_key_parameter_name)
+            if 'Auto' == Moonshot.config.parameters[@kms_key_parameter_name].value
+              s.continue "Auto-generating KMS Key for #{@kms_key_parameter_name.blue}... "
+              key_arn = KmsKey.create.arn
+              Moonshot.config.parameters[@kms_key_parameter_name].set(key_arn)
+              s.success "Created a new KMS Key for #{@kms_key_parameter_name.blue}!"
+            else
+              key_arn = KmsKey.new(Moonshot.config.parameters[@kms_key_parameter_name].value).arn
+              s.success "Using existing KMS Key for #{@kms_key_parameter_name.blue}!"
+            end
           end
         end
-      end
 
-      raise "No such Stack Parameter #{@kms_key_parameter_name}!" unless key_arn
+        raise "No such Stack Parameter #{@kms_key_parameter_name}!" unless key_arn
 
-      key_arn
+        key_arn
+      end
     end
   end
 end

data/lib/plugins/encrypted_parameters/kms_key.rb

@@ -1,23 +1,25 @@
 module Moonshot
-  class EncryptedParameters
-    # Class that manages KMS keys in AWS.
-    class KmsKey
-      attr_reader :arn
+  module Plugins
+    class EncryptedParameters
+      # Class that manages KMS keys in AWS.
+      class KmsKey
+        attr_reader :arn
 
-      def initialize(arn)
-        @arn = arn
-        @kms_client = Aws::KMS::Client.new
-      end
+        def initialize(arn)
+          @arn = arn
+          @kms_client = Aws::KMS::Client.new
+        end
 
-      def self.create
-        resp = Aws::KMS::Client.new.create_key
-        arn = resp.key_metadata.arn
+        def self.create
+          resp = Aws::KMS::Client.new.create_key
+          arn = resp.key_metadata.arn
 
-        new(arn)
-      end
+          new(arn)
+        end
 
-      def delete
-        @kms_client.schedule_key_deletion(key_id: @arn, pending_window_in_days: 7)
+        def delete
+          @kms_client.schedule_key_deletion(key_id: @arn, pending_window_in_days: 7)
+        end
       end
     end
   end

data/lib/plugins/encrypted_parameters/parameter_encrypter.rb

@@ -1,23 +1,25 @@
 require 'base64'
 module Moonshot
-  class EncryptedParameters
-    # Class that can encrypt and decrypt parameters using KMS.
-    class ParameterEncrypter
-      # @param [String] key_arn The ARN for the KMS key.
-      def initialize(key_arn)
-        @kms_client = Aws::KMS::Client.new
-        @key_arn = key_arn
-      end
+  module Plugins
+    class EncryptedParameters
+      # Class that can encrypt and decrypt parameters using KMS.
+      class ParameterEncrypter
+        # @param [String] key_arn The ARN for the KMS key.
+        def initialize(key_arn)
+          @kms_client = Aws::KMS::Client.new
+          @key_arn = key_arn
+        end
 
-      # Encrypt and base64 encode the parameter value.
-      #
-      # @param [String] param_value The parameter to encrypt.
-      # @return [String] base64 encoded encrypted ciphertext.
-      def encrypt(param_value)
-        resp = @kms_client.encrypt(key_id: @key_arn, plaintext: param_value)
+        # Encrypt and base64 encode the parameter value.
+        #
+        # @param [String] param_value The parameter to encrypt.
+        # @return [String] base64 encoded encrypted ciphertext.
+        def encrypt(param_value)
+          resp = @kms_client.encrypt(key_id: @key_arn, plaintext: param_value)
 
-        # Use strict here to avoid newlines which cause issues with parameters.
-        Base64.strict_encode64(resp.ciphertext_blob)
+          # Use strict here to avoid newlines which cause issues with parameters.
+          Base64.strict_encode64(resp.ciphertext_blob)
+        end
       end
     end
   end

metadata

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