dh-proteus 0.3.4 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10f66dcab397697c71838f79094e37d2222b1be3c9110bc31f3f6f07183fd5fa
-  data.tar.gz: 462eac3c33ffab2f47a8fa0ed0e3e4669c38a88d2b63f3478cdf63d8a9d8e2db
+  metadata.gz: 525a435f4b60584612eb0cc1a07e2514551c269d7fa88116a86dceba62de1ee7
+  data.tar.gz: 8a374ee6e980024a09344ecf9be84cea570ce2c988b4869906d512ee0f999722
 SHA512:
-  metadata.gz: add7493c81e4472bdadd9ce24aef06dcab1a3d56138ef653ad7eaa0a7fae5634c05fd8a8b551f450e6d22f36772e6bf4dc248b770a5898deccd9decfaeb9c30a
-  data.tar.gz: 9c5d32885ab3977f1d51e2f2288abf0680842b9f9291df614a3cef4bf883008e9607ac446590c0744d41cb6fbd5047ce40bfe81e404e0b8a940e586d144169c4
+  metadata.gz: 46707896e8d6255d9e9ff5092875465ac35e963211fb300fe7aed971fef854043beeac0e7507c4f15dfed459b90c24ba48a341b95b13124e082fce0ae7c4308d
+  data.tar.gz: a76fbe51174cf4b04bdb36de05099336c71983b966f8bb2ecda3fcb7cacf0e5d32cd607e556bde4ed486870cf0c2e6ccf9d03992e8a6a0f4a16633c2bc4fbbfc

data/lib/proteus/app.rb

@@ -23,7 +23,7 @@ module Proteus
     extend Proteus::ContextManagement::Helpers
 
     class_option :dryrun, type: :boolean, default: false, aliases: '-d'
-    class_option :verbose, type: :boolean, default: false, aliases: '-v'
+    class_option :verbose, type: :boolean, default: true, aliases: '-v'
 
     contexts.each do |context|
 

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
@@ -54,8 +55,7 @@ module Proteus
         #{context_path(context)}
       TERRAFORM_COMMAND
 
-      output = syscall terraform_command.squeeze(' '), suppress: true, capture: true
-      say(output, :green) if verbose
+      syscall terraform_command.squeeze(' ')
     end
 
     def aws_profile

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.4"
+  VERSION = "0.3.8"
 end
 
 if $0 == __FILE__

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dh-proteus
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.8
 platform: ruby
 authors:
 - Simon Albrecht
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-08-18 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.