moonshot 2.0.0.beta7 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bacc77a06be77c55f7f4e73d73d9e62cdccf5b9fbb8187026f0e0ae1cc3c4732
-  data.tar.gz: 27d5031220c00c7a1abc4653c2280223d1f74a4d38c285cd77da8cb743cb2257
+  metadata.gz: d87f616758ca8f4b32b4af436e73c565665b8753d38b3fd14d478f6a6d347ce4
+  data.tar.gz: 616b51d3d59341f58beb48efea6af2dba7a3821ef0dace26f4dd1eae395a34bf
 SHA512:
-  metadata.gz: b734d33a71f63b80962adb425438c0ece07baba1a0cb66c8a6b8b1be337991438bf427ce1d80582502d3b4ff6ab6e12bfe45df927731a17ddd3ff4961c9178d8
-  data.tar.gz: de00cd0374f40133d472808c67dc32049c276ea79e4200ea6a471a67b2d831747596b2659f8669009532211ac0851cde1bc36cd91510d41917e8db4446308994
+  metadata.gz: 8532967756fa789d68ce86fbdffc25bb053f5c483d784285b43ed1c934c40d72c03dc3ec73674bb6d06eb58bf2ec3b6f3641156ea6f7797e387e3d16ecf3ecc8
+  data.tar.gz: a4bcf9e2b1d6367670aa7cba505d4d561231d114dce658c2a92b10786f8eae24c25ba7052057966e5d6c8a5569633f4676eedda7d198483f7ef0c9446bd132da

data/lib/moonshot/change_set.rb

@@ -77,9 +77,17 @@ module Moonshot
     end
 
     def wait_for_change_set
-      @cf_client.wait_until(:change_set_create_complete,
-                            stack_name: @stack_name,
-                            change_set_name: @name)
+      begin
+        @cf_client.wait_until(:change_set_create_complete,
+                              stack_name: @stack_name,
+                              change_set_name: @name)
+      rescue Aws::Waiters::Errors::FailureStateError => e
+        if e.message != 'stopped waiting, encountered a failure state'
+          throw e
+        else
+          puts "The change set didn't contain any new changes."
+        end
+      end
 
       @change_set = @cf_client.describe_change_set(stack_name: @stack_name,
                                                    change_set_name: @name)

data/lib/moonshot/commands/create.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'parameter_arguments'
+require_relative 'tag_arguments'
 require_relative 'show_all_events_option'
 require_relative 'parent_stack_option'
 
@@ -8,6 +9,7 @@ module Moonshot
   module Commands
     class Create < Moonshot::Command
       include ParameterArguments
+      include TagArguments
       include ShowAllEventsOption
       include ParentStackOption
 

data/lib/moonshot/commands/tag_arguments.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Moonshot
+  module Commands
+    module TagArguments
+      def parser
+        parser = super
+
+        parser.on('--tag KEY=VALUE', '-TKEY=VALUE', 'Specify Stack Tag on the command line') do |v|
+          data = v.split('=', 2)
+          unless data.size == 2
+            raise "Invalid tag format '#{v}', expected KEY=VALUE (e.g. MyStackTag=12)"
+          end
+
+          Moonshot.config.extra_tags << { key: data[0], value: data[1] }
+        end
+      end
+    end
+  end
+end

data/lib/moonshot/commands/update.rb

@@ -4,6 +4,7 @@ module Moonshot
   module Commands
     class Update < Moonshot::Command
       include ParameterArguments
+      include TagArguments
       include ShowAllEventsOption
       include ParentStackOption
 

data/lib/moonshot/controller_config.rb

@@ -10,7 +10,7 @@ module Moonshot
                   :interactive, :interactive_logger, :parameter_overrides, :parameters, :parent_stacks,
                   :default_parameter_source, :parameter_sources, :plugins, :project_root,
                   :show_all_stack_events, :ssh_auto_scaling_group_name, :ssh_command, :ssh_config,
-                  :ssh_instance, :template_file, :template_s3_bucket
+                  :ssh_instance, :template_file, :template_s3_bucket, :extra_tags
 
     def initialize
       @default_parameter_source = AskUserSource.new
@@ -26,6 +26,7 @@ module Moonshot
       @project_root             = Dir.pwd
       @show_all_stack_events    = false
       @ssh_config               = SSHConfig.new
+      @extra_tags               = []
 
       @dev_build_name_proc = lambda do |c|
         ['dev', c.app_name, c.environment_name, Time.now.to_i].join('/')

data/lib/moonshot/stack.rb

@@ -13,10 +13,30 @@ module Moonshot
 
     attr_reader :app_name, :name
 
+    class << self
+      def generate_name(config)
+        [config.app_name, config.environment_name].join('-')
+      end
+
+      def make_tags(config)
+        default_tags = [
+          { key: 'moonshot_application', value: config.app_name },
+          { key: 'moonshot_environment', value: config.environment_name }
+        ]
+        name = generate_name(config)
+
+        if config.additional_tag
+          default_tags << { key: config.additional_tag, value: name }
+        end
+
+        default_tags + config.extra_tags
+      end
+    end
+
     def initialize(config)
       @config = config
       @ilog = config.interactive_logger
-      @name = [@config.app_name, @config.environment_name].join('-')
+      @name = self.class.generate_name(@config)
 
       yield @config if block_given?
     end
@@ -233,8 +253,9 @@ module Moonshot
         change_set_name:,
         description: "Moonshot update command for application '#{Moonshot.config.app_name}'",
         stack_name: @name,
-        capabilities: %w[CAPABILITY_IAM CAPABILITY_NAMED_IAM],
-        parameters: @config.parameters.values.map(&:to_cf)
+        capabilities:  %w(CAPABILITY_IAM CAPABILITY_NAMED_IAM), # rubocop:disable Layout/HashAlignment,Style/PercentLiteralDelimiters
+        parameters: @config.parameters.values.map(&:to_cf),
+        tags: make_tags
       }
       if @config.template_s3_bucket
         parameters[:template_url] = upload_template_to_s3
@@ -288,14 +309,7 @@ module Moonshot
     end
 
     def make_tags
-      default_tags = [
-        { key: 'moonshot_application', value: @config.app_name },
-        { key: 'moonshot_environment', value: @config.environment_name }
-      ]
-
-      default_tags << { key: @config.additional_tag, value: @name } if @config.additional_tag
-
-      default_tags
+      self.class.make_tags(@config)
     end
 
     def format_event(event)

data/lib/moonshot/tools/asg_rollout/asg.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'aws-sdk-elasticloadbalancing'
+require 'aws-sdk-autoscaling'
+
 module Moonshot
   module Tools
     class ASGRollout

data/lib/moonshot/unicode_table.rb

@@ -37,12 +37,14 @@ module Moonshot
     end
 
     def draw(depth = 1, first = true)
+      space = ' '
+      pipe = '|'
       print first ? '┌' : '├'
       print '─' * depth
-      puts ' ' << @name.light_black
+      puts "#{space}" << @name.light_black # rubocop:disable Style/RedundantInterpolation
       @lines = [''] + @lines + ['']
       @lines.each do |line|
-        puts '│' << (' ' * depth) << line
+        puts "#{pipe}" << (' ' * depth) << line # rubocop:disable Style/RedundantInterpolation
       end
       @children.each do |child|
         child.draw(depth + 1, false)

data/lib/plugins/backup.rb

@@ -200,7 +200,7 @@ module Moonshot
         # single bucket for all accounts
         return @bucket if @bucket
         # calculating bucket based on account name
-        return bucket_by_account(iam_account) if @buckets
+        return bucket_by_account(iam_account) if @buckets # rubocop:disable Style/RedundantReturn
       end
 
       def bucket_by_account(account)

data/lib/plugins/encrypted_parameters/kms_key.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative '../../moonshot/stack'
+
 module Moonshot
   module Plugins
     class EncryptedParameters
@@ -7,16 +9,33 @@ module Moonshot
       class KmsKey
         attr_reader :arn
 
+        class << self
+          def create
+            standard_tags = stack_tags
+            resp = Aws::KMS::Client.new.create_key({
+                                                     tags: standard_tags # An array of tags.
+                                                   })
+            arn = resp.key_metadata.arn
+            new(arn)
+          end
+
+          def stack_tags
+            tags = Moonshot::Stack.make_tags(Moonshot.config)
+            tags.map { |tag| { tag_key: tag[:key], tag_value: tag[:value] } }
+          end
+        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
-
-          new(arn)
+        def update
+          standard_tags = self.class.stack_tags
+          @kms_client.tag_resource({
+                                     key_id: @arn, # arn of the CMK being tagged
+                                     tags: standard_tags # An array of tags.
+                                   })
         end
 
         def delete

data/lib/plugins/encrypted_parameters.rb

@@ -104,7 +104,9 @@ module Moonshot
               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
+              kms=KmsKey.new(Moonshot.config.parameters[@kms_key_parameter_name].value) # rubocop:disable Style/SpaceAroundOperators
+              key_arn = kms.arn
+              kms.update
               s.success "Using existing KMS Key for #{@kms_key_parameter_name.blue}!"
             end
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moonshot
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta7
+  version: 3.0.4
 platform: ruby
 authors:
 - Cloud Engineering <engineering@acquia.com>
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-23 00:00:00.000000000 Z
+date: 2024-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-autoscaling
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.34'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-elasticloadbalancing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-iam
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: faraday-rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: faraday-retry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +248,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rotp
   requirement: !ruby/object:Gem::Requirement
@@ -252,16 +322,16 @@ dependencies:
   name: travis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.11.1
 - !ruby/object:Gem::Dependency
   name: vandamme
   requirement: !ruby/object:Gem::Requirement
@@ -360,6 +430,7 @@ files:
 - lib/moonshot/commands/show_all_events_option.rb
 - lib/moonshot/commands/ssh.rb
 - lib/moonshot/commands/status.rb
+- lib/moonshot/commands/tag_arguments.rb
 - lib/moonshot/commands/update.rb
 - lib/moonshot/commands/version.rb
 - lib/moonshot/config.rb
@@ -418,12 +489,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.3
+      version: 3.3.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
 signing_key: