dh-proteus 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee44660b54c99fcc0430739f91d7c983be8ae26dc5f7dd6bd240a8faf1419e94
-  data.tar.gz: 3321c7016cde53892060b64e05cc26a55e14a6cdfd66584bb38297fbc059fe57
+  metadata.gz: 198ea1d92f009a7ed877e1cb46329ba10b5c4855e79c1c856f08dfc9420c2118
+  data.tar.gz: 5c73915240e65f69392002661ced9663dce724dd9822347a50b69107869d2a30
 SHA512:
-  metadata.gz: efe2adfa660b4e6e05760301eefc5fe382906bf76d3f38e6aca879eb9772ccd6a5f1f955904fd936862fe460ae8b77c8f920ed03ffde71806a2e94aa9d98d9bc
-  data.tar.gz: a131676d34b70fbaa94a0e02e317ba26f64f32f9d5a309494f7959ccb753d588463cc5b6a5b57299dafa7360d874ed27fd0210c1ccf4759102f13b29d73e69be
+  metadata.gz: 56a2d03c731dfa1ba3f810c22feba6e243e665c2b9e7faef70f9e129f6c787af34e1d80e1ec77f43b6dc54e94f45710905320dac4d42344d1bbc41069cc6ccc3
+  data.tar.gz: f82e55e042534ea910ea64450b91023f336212e7d2d08966052074bd06c400902dd460ae4ec5bfde63e7ac957f0e752d540d937b408a8c7f93a77851aff4f11c

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/render.rb

@@ -10,6 +10,7 @@ module Proteus
           long_desc <<-LONGDESC
             Renders the module templates without running Terraform
           LONGDESC
+          option :init, type: :boolean, default: false
           def render
             render_backend
             module_manager = Proteus::Modules::Manager.new(context: context, environment: environment)
@@ -26,6 +27,8 @@ module Proteus
               suppress: true
             )
 
+            init(verbose: parent_options[:verbose]) if options[:init]
+
             say "Formatted files:", :green
             say fmt_output, :green
           end

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/modules/manager.rb

@@ -35,7 +35,9 @@ module Proteus
         if tfvars_content.empty?
           terraform_variables = []
         else
-          terraform_variables = JSON.parse(parse_tfvars(tfvars: tfvars_content))
+          terraform_variables = JSON.parse(parse_tfvars(tfvars: tfvars_content)).merge({
+            'proteus_environment' => @environment
+          })
         end
 
         @modules = []

data/lib/proteus/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dh-proteus
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Simon Albrecht
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2021-11-03 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
@@ -214,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Proteus is a Terraform wrapper application.