dh-proteus 0.3.7 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cdd09685fbb59a3fba9da1b7b1e0b1f84bdbaec975dccd6eb3148526ab7ae05
-  data.tar.gz: 631163e0ae642ae6328eff584a7be1eafb1fbf8d1f0de7fab19e52d45832dc15
+  metadata.gz: edc99646e608a421f7b125ee09bd0a4f59466325d93183bfab5064d20794b875
+  data.tar.gz: 9b08c970dc9862454939d8069e9f0af38f0fe7ec75381634d588ee5a089562f1
 SHA512:
-  metadata.gz: c62a0a514498abeef4f19cf913920f98802726ba83694bebc8dd03ece8cbfb4a70a11b2304b44ba4bfae2e95049e58de8c36fb54f37cd0cfe753e2d6681310ff
-  data.tar.gz: f010f09c3129f436ae3bd728020ee395c3fdbd22c42ef7dec4dc8371f7c6f7a7b864bdedb0fe19b2b2e24c797d11cb5ab8667c0ef3634dd14d0a18094ca3c7cc
+  metadata.gz: 5bcdbb93ec216b96491fee20b60999b8a40aa1659939d1dbf2b1c042ae0c048c22d1eb89a8a61bcd9ea2aca700d93e2ddb3aeb24085f22baf17d613aaff4bc9f
+  data.tar.gz: 4b86d53686fa246d7b764e8ef38e2a03accd9a7198e306b94e5cdf0d8caf1199f061f725f9da5e7ef03cf86e6059a3371ab45b741c581b6f6ac0c6b3d763bd86

data/lib/proteus/backend/backend.rb

@@ -79,6 +79,10 @@ module Proteus
               key     = "<%= @config[:backend][@backend_key][:key_prefix] %>#{@context}-#{@environment}.tfstate"
               region  = "<%= @config[:backend][@backend_key][:bucket][:region] %>"
               profile = "<%= @config[:backend][@backend_key][:profile]%>"
+              <%- if (@config[:backend][@backend_key].keys & ["encrypt", "kms_key_id"]).size == 2 -%>
+              encrypt = true
+              kms_key_id = "<%= @config[:backend][@backend_key][:kms_key_id] %>"
+              <%- end -%>
             }
           }
         TEMPLATE

data/lib/proteus/commands/destroy.rb

@@ -20,7 +20,7 @@ module Proteus
               terraform destroy \
               -var-file=#{var_file(context, environment)} \
               #{aws_profile} \
-              ##{limit(options[:limit])}
+              #{limit(options[:limit])}
             DESTROY_COMMAND
 
             plan_destroy_command = <<~PLAN_DESTROY_COMMAND
@@ -30,7 +30,7 @@ module Proteus
               -out=#{plan_file(context, environment)} \
               -var-file=#{var_file(context, environment)} \
               #{aws_profile} \
-              ##{limit(options[:limit])}
+              #{limit(options[:limit])}
             PLAN_DESTROY_COMMAND
 
 

data/lib/proteus/commands/untaint.rb

@@ -0,0 +1,31 @@
+module Proteus
+  module Commands
+    module Untaint
+      def self.included(thor_class)
+        thor_class.class_eval do
+
+          desc "untaint", "Untaints an existing resource"
+          long_desc <<-LONGDESC
+            Untaints an existing resource
+
+            --resource The resource to untaint
+          LONGDESC
+          option :resource, type: :string, aliases: "-r", required: true
+          def untaint
+            init(verbose: parent_options[:verbose])
+            confirm question: "Do you really want to run 'terraform untaint' on environment '#{environment}' in context '#{context}'?", color: :on_red, exit_code: 0 do
+
+              untaint_command = <<~UNTAINT_COMMAND
+                cd #{context_path(context)} && \
+                terraform untaint \
+                #{options[:resource]}
+              UNTAINT_COMMAND
+              syscall untaint_command.squeeze(' ')
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/proteus/common.rb

@@ -7,6 +7,7 @@ require 'proteus/commands/output'
 require 'proteus/commands/plan'
 require 'proteus/commands/render'
 require 'proteus/commands/taint'
+require 'proteus/commands/untaint'
 
 module Proteus
   class Common < Thor
@@ -45,6 +46,7 @@ module Proteus
       `rm -rf #{context_path(context)}/.terraform/*.tf*`
       `rm -rf #{context_path(context)}/.terraform/modules`
       `rm -rf #{context_path(context)}/terraform.tfstate*`
+      `rm -rf #{context_path(context)}/.terraform.lock.hcl`
 
       terraform_command = <<~TERRAFORM_COMMAND
         cd #{context_path(context)} && \

data/lib/proteus/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dh-proteus
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.1
 platform: ruby
 authors:
 - Simon Albrecht
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-21 00:00:00.000000000 Z
+date: 2022-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -160,6 +160,7 @@ files:
 - lib/proteus/commands/state/remove.rb
 - lib/proteus/commands/state/show.rb
 - lib/proteus/commands/taint.rb
+- lib/proteus/commands/untaint.rb
 - lib/proteus/common.rb
 - lib/proteus/config/config.rb
 - lib/proteus/context_management/context.rb