dh-proteus 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd6b4515245645e26975a7d59b4628133a50629ff77df6dea73a0ff2d4782928
-  data.tar.gz: 2a2091bbd1f869b5ecf5c64d072abe114f2a26c48bf81083153665a166140199
+  metadata.gz: b9166f710a73dd5e425c1c57678b074953e822f18373115dab83c2bb69c1a4e1
+  data.tar.gz: 536e2c89ea79aeb66cd751d280905bdad818d0f3dde221d8b6a8ed3714a1f16d
 SHA512:
-  metadata.gz: e7f4328e37bf2cd6549cd714117d447f4b44fbcb6f146125d58b3a4443c2223f085c9c2f687205a2f3cb7c81cbd2d3dd593ef70577014d9e7f4f3949cc50815b
-  data.tar.gz: 74c85cc9a5b765c4904acbcab92fd67ebf8575a9957e3d55f12f4e1efb337ccc6afebb4c9ada0e313dd9466aef7f42488fdb2fec787a3df5f055f884e8fd1f00
+  metadata.gz: addf02fb05acde3f7fbe087fb969725ea07ff5aa191ddb3a3025dbaf8b8abb6ead4b9a0639151698ae74f758ec05da7777f9d838c4361be933ff18e0fb2a2288
+  data.tar.gz: 0fc89209ad85a76df1010b7842b9a6ff427b9171b3e888ad5ff5cb2a4533d755f4d2070a7f6599af991ac20c5dfb9b056d8f1f135818dbfa0a4e655aa0c686ad

data/dh-proteus.gemspec

@@ -43,7 +43,4 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activesupport', '~> 5.1.1'
   spec.add_runtime_dependency 'thor', '~> 0.20.0'
   spec.add_runtime_dependency 'erubis', '~> 2.7.0'
-  spec.add_runtime_dependency 'aws-sdk-rds', '~> 1.11.0'
-  spec.add_runtime_dependency 'aws-sdk-route53', '~> 1.7.0'
-  spec.add_runtime_dependency 'aws-sdk-elasticsearchservice', '~> 1.4.0'
 end

data/lib/proteus/app.rb

@@ -7,6 +7,10 @@ require 'proteus/context_management/context'
 require 'proteus/context_management/helpers'
 require 'proteus/templates/template_binding'
 require 'proteus/templates/partial'
+require 'proteus/commands/state/list'
+require 'proteus/commands/state/move'
+require 'proteus/commands/state/remove'
+require 'proteus/commands/state/show'
 
 module Proteus
 
@@ -56,6 +60,33 @@ module Proteus
           def self.environment
             @environment
           end
+
+          state_class = Class.new(Proteus::Common)
+          state_class_name = "#{class_name}State"
+          mod_name.const_set(state_class_name, state_class)
+
+          state_class.class_eval do
+            include Config
+            include Helpers
+            include Proteus::Helpers::PathHelpers
+            include Proteus::Commands::StateCommands::List
+            include Proteus::Commands::StateCommands::Move
+            include Proteus::Commands::StateCommands::Remove
+            include Proteus::Commands::StateCommands::Show
+
+            private
+
+            define_method :context do
+              context.name
+            end
+
+            define_method :environment do
+              environment
+            end
+          end
+
+          desc 'state', 'This command has subcommands for advanced state management.'
+          subcommand('state', state_class)
         end
 
         if context.name == 'default'

data/lib/proteus/commands/state/list.rb

@@ -0,0 +1,25 @@
+module Proteus
+  module Commands
+    module StateCommands
+      module List
+        def self.included(thor_class)
+          thor_class.class_eval do
+
+            desc "list", "List resources in the state"
+            def list
+              list_cmd = <<~LIST_CMD
+                cd #{context_path(context)} && \
+                terraform state list
+              LIST_CMD
+
+              init(verbose: parent_options[:verbose])
+
+              syscall list_cmd.squeeze(' ')
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/proteus/commands/state/move.rb

@@ -0,0 +1,28 @@
+module Proteus
+  module Commands
+    module StateCommands
+      module Move
+        def self.included(thor_class)
+          thor_class.class_eval do
+
+            desc "move FROM TO", "Moves an existing resource within the Terraform state"
+            def move(from, to)
+              init(verbose: parent_options[:verbose])
+              confirm question: "Do you really want to move #{from} to #{to} in context '(#{context}, #{environment})'?", color: :on_red, exit_code: 0 do
+
+                state_move_command = <<~STATE_MOVE_COMMAND
+                  cd #{context_path(context)} && \
+                  terraform state mv \
+                  #{from} \
+                  #{to}
+                STATE_MOVE_COMMAND
+                syscall state_move_command.squeeze(' '), dryrun:  dryrun
+              end
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/proteus/commands/state/remove.rb

@@ -0,0 +1,71 @@
+module Proteus
+  module Commands
+    module StateCommands
+      module Remove
+        def self.included(thor_class)
+          thor_class.class_eval do
+
+            desc "remove", "Remove a resource from the terraform state"
+            long_desc <<-LONGDESC
+              Remove a resource from the terraform state
+              --bulk Enables bulk import mode
+
+              --resource_address Terraform address of resource to remove from the terraform state
+
+              --resources_file File containing resource addresses and identifiers
+            LONGDESC
+            option :bulk, type: :boolean, aliases: "-b", required: false, default: false
+            option :resource_address, type: :string, aliases: "-a", required: false, default: nil
+            option :resources_file, type: :string, aliases: "-f", required: false, default: nil
+            def remove
+              if options[:bulk]
+                if !options[:resources_file]
+                  say "Supply a file containing resource identifiers and Terraform addresses for bulk operations", :red
+                  exit 1
+                end
+              else
+                if !options[:resource_address]
+                  say "You need to supply a resource address.", :red
+                  exit 1
+                end
+              end
+
+              init(verbose: parent_options[:verbose])
+
+              confirm question: "Do you really want to run 'terraform state rm' in context '(#{context}, #{environment})'?", color: :on_red, exit_code: 0 do
+                state_remove_command = <<~STATE_REMOVE_COMMAND
+                  cd #{context_path(context)} && \
+                  terraform state rm \
+                  %{resource_addresses}
+                STATE_REMOVE_COMMAND
+
+                if options[:bulk]
+                  if File.file?(options[:resources_file])
+                    File.open(options[:resources_file], "r") do |file|
+                      resource_addresses = []
+                      file.each_line do |line|
+                        resource = line.chomp.split(" = ")
+                        resource_addresses << resource[0]
+                      end
+
+                      resource_addresses.each_slice(500) do |slice|
+                        syscall (state_remove_command % { resource_addresses: slice.join(' ') }).squeeze(' ')
+                      end
+
+                    end
+                  else
+                    say "File #{options[:resources_file]} does not exist.", :red
+                    exit 1
+                  end
+                else
+                  syscall (state_remove_command % { resource_addresses: options[:resource_address] })
+                end
+              end
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/proteus/commands/state/show.rb

@@ -0,0 +1,25 @@
+module Proteus
+  module Commands
+    module StateCommands
+      module Show
+        def self.included(thor_class)
+          thor_class.class_eval do
+
+            desc "show", "Show a resource in the state"
+            def show(resource)
+              list_cmd = <<~LIST_CMD
+                cd #{context_path(context)} && \
+                terraform state show #{resource}
+              LIST_CMD
+
+              init(verbose: parent_options[:verbose])
+
+              syscall list_cmd.squeeze(' ')
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/proteus/commands/taint.rb

@@ -11,7 +11,6 @@ module Proteus
             --resource The resource to taint
           LONGDESC
           option :resource, type: :string, aliases: "-r", required: true
-          option :module, type: :string, aliases: "-m", required: false, default: nil
           def taint
             init(verbose: parent_options[:verbose])
             confirm question: "Do you really want to run 'terraform taint' on environment '#{environment}' in context '#{context}'?", color: :on_red, exit_code: 0 do
@@ -19,7 +18,6 @@ module Proteus
               taint_command = <<~TAINT_COMMAND
                 cd #{context_path(context)} && \
                 terraform taint \
-                #{options[:module] ? "-module=#{options[:module]}" : ""} \
                 #{options[:resource]}
               TAINT_COMMAND
               syscall taint_command.squeeze(' ')

data/lib/proteus/common.rb

@@ -3,10 +3,8 @@ require 'proteus/commands/clean'
 require 'proteus/commands/destroy'
 require 'proteus/commands/graph'
 require 'proteus/commands/import'
-require 'proteus/commands/move'
 require 'proteus/commands/output'
 require 'proteus/commands/plan'
-require 'proteus/commands/remove'
 require 'proteus/commands/render'
 require 'proteus/commands/taint'
 
@@ -16,7 +14,9 @@ module Proteus
     include Proteus::Helpers::PathHelpers
 
     Proteus::Commands.constants.each do |command|
-      include const_get("Proteus::Commands::#{command}")
+      unless command == :State
+        include const_get("Proteus::Commands::#{command}")
+      end
     end
 
     private
@@ -56,10 +56,13 @@ module Proteus
     end
 
     def aws_profile
-      config[:providers].select {|p| p[:name] == 'aws' }.first[:environments].each do |provider|
-        return "-var 'aws_profile=#{provider[:profile]}'" if environment =~ (/#{provider[:match]}/)
+      config[:providers].select {|p| p[:name] == 'aws' }.first[:environments].each do |env|
+        env[:match].each do |m|
+          return "-var 'aws_profile=#{env[:profile]}'" if environment == m
+        end
       end
-      return ""
+
+      raise "No AWS profile found in config."
     end
 
     def dryrun

data/lib/proteus/config/config.rb

@@ -20,8 +20,14 @@ module Proteus
           ensure_data_type Array
 
           each do
+            ensure_keys :name
+
             within :environments do
               ensure_uniqueness_across :match
+
+              each do
+                ensure_keys :profile
+              end
             end
           end
         end

data/lib/proteus/version.rb

@@ -1,5 +1,5 @@
 module Proteus
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end
 
 if $0 == __FILE__

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dh-proteus
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Simon Albrecht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2020-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,48 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.0
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-rds
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.11.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.11.0
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-route53
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-elasticsearchservice
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.0
 description: 
 email:
 - simon.albrecht@deliveryhero.com
@@ -179,11 +137,13 @@ files:
 - lib/proteus/commands/destroy.rb
 - lib/proteus/commands/graph.rb
 - lib/proteus/commands/import.rb
-- lib/proteus/commands/move.rb
 - lib/proteus/commands/output.rb
 - lib/proteus/commands/plan.rb
-- lib/proteus/commands/remove.rb
 - lib/proteus/commands/render.rb
+- lib/proteus/commands/state/list.rb
+- lib/proteus/commands/state/move.rb
+- lib/proteus/commands/state/remove.rb
+- lib/proteus/commands/state/show.rb
 - lib/proteus/commands/taint.rb
 - lib/proteus/common.rb
 - lib/proteus/config/config.rb

data/lib/proteus/commands/move.rb

@@ -1,28 +0,0 @@
-module Proteus
-  module Commands
-    module Move
-      def self.included(thor_class)
-        thor_class.class_eval do
-
-          desc "move FROM TO", "Moves an existing resource within the Terraform state"
-          def move(from, to)
-            init(verbose: parent_options[:verbose])
-            confirm question: "Do you really want to move #{from} to #{to} in context '(#{context}, #{environment})'?", color: :on_red, exit_code: 0 do
-
-              state_move_command = <<~STATE_MOVE_COMMAND
-                cd #{context_path(context)} && \
-                terraform state mv \
-                -var-file=#{var_file(context, environment)} \
-                #{aws_profile} \
-                #{from} \
-                #{to}
-              STATE_MOVE_COMMAND
-              syscall state_move_command.squeeze(' '), dryrun:  dryrun
-            end
-          end
-
-        end
-      end
-    end
-  end
-end

data/lib/proteus/commands/remove.rb

@@ -1,69 +0,0 @@
-module Proteus
-  module Commands
-    module Remove
-      def self.included(thor_class)
-        thor_class.class_eval do
-
-          desc "remove", "Remove a resource from the terraform state"
-          long_desc <<-LONGDESC
-            Remove a resource from the terraform state
-            --bulk Enables bulk import mode
-
-            --resource_address Terraform address of resource to remove from the terraform state
-
-            --resources_file File containing resource addresses and identifiers
-          LONGDESC
-          option :bulk, type: :boolean, aliases: "-b", required: false, default: false
-          option :resource_address, type: :string, aliases: "-a", required: false, default: nil
-          option :resources_file, type: :string, aliases: "-f", required: false, default: nil
-          def remove
-            if options[:bulk]
-              if !options[:resources_file]
-                say "Supply a file containing resource identifiers and Terraform addresses for bulk operations", :red
-                exit 1
-              end
-            else
-              if !options[:resource_address]
-                say "You need to supply a resource address.", :red
-                exit 1
-              end
-            end
-
-            init(verbose: parent_options[:verbose])
-
-            confirm question: "Do you really want to run 'terraform state rm' in context '(#{context}, #{environment})'?", color: :on_red, exit_code: 0 do
-              state_remove_command = <<~STATE_REMOVE_COMMAND
-                cd #{context_path(context)} && \
-                terraform state rm \
-                %{resource_addresses}
-              STATE_REMOVE_COMMAND
-
-              if options[:bulk]
-                if File.file?(options[:resources_file])
-                  File.open(options[:resources_file], "r") do |file|
-                    resource_addresses = []
-                    file.each_line do |line|
-                      resource = line.chomp.split(" = ")
-                      resource_addresses << resource[0]
-                    end
-
-                    resource_addresses.each_slice(500) do |slice|
-                      syscall (state_remove_command % { resource_addresses: slice.join(' ') }).squeeze(' ')
-                    end
-
-                  end
-                else
-                  say "File #{options[:resources_file]} does not exist.", :red
-                  exit 1
-                end
-              else
-                syscall (state_remove_command % { resource_addresses: options[:resource_address] })
-              end
-            end
-          end
-
-        end
-      end
-    end
-  end
-end