terraform-wrapper 1.2.3 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f79a8c4cca3d760d2dac3766055a31b94ce3d24785d946c37cf63c8976ef8000
-  data.tar.gz: ff9a1986b4473b7697439d3729f79dfffa18f22301436171f736ff238ee16394
+  metadata.gz: 6f5d1501a011dbf4424f148da0809664d95f3fe8c6bb6ab021b5c3b1c57d71d0
+  data.tar.gz: 8d102af24e50ea63d057805f099e037c9b3821cb209dfdbcbc52f74506af3614
 SHA512:
-  metadata.gz: 8e7271146e058d3166c7414710a85345fb3d5d26b5a5beaecdc36b416c6b65bf4197a0a6325cdeec04996e554f06c345fcee5878d23f0efd02b431261b047491
-  data.tar.gz: a097d6d1baf0373e7ed4ba14ef34d36ecf907b022c87da6ea747d2398d46dea65c3acf52a4d6dcc435b050debbf30e8d2ba288902d55219a44b18fabd459d667
+  metadata.gz: c1106d34527d215ad01722686b3516c57d68dbe4a4195cc1f89ccefc7f55f3ed587796eec6123356ec4315a0877fe27e328bab1e8e19bf659d43d7f14ddc7f95
+  data.tar.gz: eb97a8a2a50ee21994344dadf3c2ec388779d25faa4eff8d2e1f40bf6bd592ab2e21e3e2b2cd290feae5669e5e3c87ee66eca09e40ed3d499e84d8c58e8f4d19

data/lib/terraform-wrapper/shared/auths/azure.rb

@@ -71,7 +71,7 @@ module TerraformWrapper
 ###############################################################################
 
         def cli()
-          output  = logger.colour ? "jsonc" : "json"
+          output  = logger.colour ? "yamlc" : "yaml"
           cmdline = "\"#{@@az}\" version --output \"#{output}\""
           return(system(cmdline) || false)
         end

data/lib/terraform-wrapper/shared/runner.rb

@@ -84,6 +84,11 @@ module TerraformWrapper
 
         parameters = Array.new
         parameters.append("lock")
+
+        @binary.provider.platforms.each do |platform|
+          parameters.append("-platform=\"#{platform}\"")
+        end
+
         logger.fatal("Failed to upgrade Terraform providers!") unless run(action: "providers", parameters: parameters)
       end
 
@@ -93,15 +98,14 @@ module TerraformWrapper
         logger.fatal("Cannot Terraform apply before initialising backend!") unless initialised
 
         parameters = Array.new
-        parameters.concat(variable_files)
-        parameters.concat(variable_strings)
         parameters.append("-auto-approve")
 
-        if not file.nil? and file.kind_of?(String) and not file.strip.empty? then
+        if (not file.nil?) and file.kind_of?(String) and (not file.strip.empty?) then
           logger.fatal("Plan file: #{file} does not exist!") unless File.file?(file)
           parameters.append("\"#{file}\"")
         else
           parameters.concat(variable_files)
+          parameters.concat(variable_strings)
         end
 
         logger.fatal("Terraform apply failed!") unless run(action: "apply", parameters: parameters)
@@ -144,7 +148,6 @@ module TerraformWrapper
       def import(address: nil, id: nil)
         logger.fatal("Cannot Terraform import before initialising backend!") unless initialised
 
-        logger.fatal("Terraform state address for import must be a string!") unless address.kind_of?(String)
         logger.fatal("Terraform state address for import must be a string!") unless address.kind_of?(String)
         logger.fatal("Terraform state address for import must not be blank!") if address.strip.empty?
 
@@ -161,6 +164,20 @@ module TerraformWrapper
         logger.fatal("Terraform import failed!") unless run(action: "import", parameters: parameters)
       end
 
+###############################################################################
+
+      def taint(address: nil)
+        logger.fatal("Cannot Terraform taint before initialising backend!") unless initialised
+
+        logger.fatal("Terraform state address for taint must be a string!") unless address.kind_of?(String)
+        logger.fatal("Terraform state address for taint must not be blank!") if address.strip.empty?
+
+        parameters = Array.new
+        parameters.append("'#{address}'")
+
+        logger.fatal("Terraform taint failed!") unless run(action: "taint", parameters: parameters)
+      end
+
 ###############################################################################
 
       def validate

data/lib/terraform-wrapper/tasks/taint.rb

@@ -0,0 +1,66 @@
+###############################################################################
+
+module TerraformWrapper
+
+###############################################################################
+
+  module Tasks
+
+###############################################################################
+
+    class Taint < ::Rake::TaskLib
+
+###############################################################################
+
+      include TerraformWrapper::Shared::Logging
+
+###############################################################################
+
+      @binary
+      @code
+      @options
+
+###############################################################################
+
+      def initialize(binary:, code:, options:)
+        @binary  = binary
+        @code    = code
+        @options = options
+
+        yield self if block_given?
+
+        taint_task
+      end
+
+###############################################################################
+
+      def taint_task
+        desc "Taint a piece of existing infrastructure so that Terraform recreates it at next apply."
+        task :taint, [:config, :address] => :binary do |t, args|
+          options = @options.merge({"name" => args[:config]})
+
+          logger.info("Processing configuration for Terraform taint...")
+
+          config = TerraformWrapper::Shared::Config.new(code: @code, options: options)
+          runner = TerraformWrapper::Shared::Runner.new(binary: @binary, code: @code)
+
+          logger.info("Running Terraform taint for service: #{config.service}, component: #{@code.name}...")
+
+          runner.init(config: config)
+          runner.taint(address: args[:address])
+        end
+      end
+
+###############################################################################
+
+    end
+
+###############################################################################
+
+  end
+
+###############################################################################
+
+end
+
+###############################################################################

data/lib/terraform-wrapper/tasks.rb

@@ -12,6 +12,7 @@ require_relative 'tasks/import'
 require_relative 'tasks/init'
 require_relative 'tasks/plan'
 require_relative 'tasks/plandestroy'
+require_relative 'tasks/taint'
 require_relative 'tasks/upgrade'
 require_relative 'tasks/validate'
 

data/lib/terraform-wrapper/version.rb

@@ -4,7 +4,7 @@ module TerraformWrapper
 
 ###############################################################################
 
-  VERSION = "1.2.3"
+  VERSION = "1.2.7"
 
 ###############################################################################
 

data/lib/terraform-wrapper.rb

@@ -59,6 +59,7 @@ module TerraformWrapper
     tasks << TerraformWrapper::Tasks::Init.new(binary: binary, code: code, options: config_options)
     tasks << TerraformWrapper::Tasks::Plan.new(binary: binary, code: code, options: config_options)
     tasks << TerraformWrapper::Tasks::PlanDestroy.new(binary: binary, code: code, options: config_options)
+    tasks << TerraformWrapper::Tasks::Taint.new(binary: binary, code: code, options: config_options)
     tasks << TerraformWrapper::Tasks::Upgrade.new(binary: binary, code: code)
     tasks << TerraformWrapper::Tasks::Validate.new(binary: binary, code: code)
     return tasks

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraform-wrapper
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.7
 platform: ruby
 authors:
 - Richard Lees
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-09 00:00:00.000000000 Z
+date: 2021-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -83,6 +83,7 @@ files:
 - lib/terraform-wrapper/tasks/init.rb
 - lib/terraform-wrapper/tasks/plan.rb
 - lib/terraform-wrapper/tasks/plandestroy.rb
+- lib/terraform-wrapper/tasks/taint.rb
 - lib/terraform-wrapper/tasks/upgrade.rb
 - lib/terraform-wrapper/tasks/validate.rb
 - lib/terraform-wrapper/version.rb
@@ -108,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: A ruby wrapper for managing Terraform binaries and remote state.