terraform-wrapper 1.2.5 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61563bbc4ee42f89c431029a6ef933e3327e785fbc3bde3091b804e60d23c95d
-  data.tar.gz: 17b0def9e9c08f8c1d80952297eab0012117181f6f21487128e224ef6938c273
+  metadata.gz: 91c97704433138c53e6e8c487ddc8ac55aaa08eafcd243be20c88009f3bc0ef8
+  data.tar.gz: 4e912bdd6cf103be7f78067a99c24f87fd26f7f213fc18a61e9a636d82679fd1
 SHA512:
-  metadata.gz: f28121fc946492d46d11c28e96f5f7b95eb4b55731faa2c9e392af81b5e2ab9ad52c4648e645dac7e78819cedf3516b26cf41d8fd532c68ada8903b321e83a3c
-  data.tar.gz: 47b7f9c44fa88c75276f5497216b9480682c0e3590b31704d46a32d7b0b0e498b2d3aa575c04f07d452e5df5605ca2a53269a8bbefd26a0146bd4279ecddf20b
+  metadata.gz: 819de26eca1f26340305bff23097d55ca9983aed1f99ab7006fa8b57d770d62628740a43f6af80025e3bf2d3b64c345e14f4bf587a957a2e42b11d1e46007b3e
+  data.tar.gz: 2ce0e456878d5ca3e77d5460d885cf092582b3d1b8405b6f44056c5f6c2e04b67d6ae43190823376dd3b2bd55ff7bc37d38b988f4e94acd4e5ea3a91b41e697e

data/.gitignore

@@ -21,8 +21,3 @@
 /tmp/
 
 ###############################################################################
-
-/archlinux/
-!/archlinux/PKGBUILD
-
-###############################################################################

data/.gitlab-ci.yml

@@ -1,37 +1,8 @@
 ###############################################################################
 
-image: ruby
-
-###############################################################################
-
-stages:
-  - test
-  - publish
-
-###############################################################################
-
-test:
-  stage : test
-  script:
-    - echo "-- Beginning Test --"
-    - echo "-- Tests not implemented yet --"
-
-###############################################################################
-
-deploy:
-  rules:
-    - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+$/'
-  stage: publish
-  script:
-    - echo "-- Beginning Publish --"
-    - test -n "${GEM_HOST_API_KEY}"
-    - echo "RubyGems API key found!"
-    - hash rake
-    - hash ruby
-    - hash gem
-    - echo "-- Publishing Gem --"
-    - rake release
-    - echo "-- Listing Sums --"
-    - sha256sum "pkg"/*.gem
+include:
+  - project: 'bitservices/gitlab/ruby'
+    ref: latest
+    file: '/templates/gems.yml'
 
 ###############################################################################

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/Rakefile

@@ -11,3 +11,11 @@ require "bundler/gem_tasks"
 task default: %i[]
 
 ###############################################################################
+
+begin
+  require "rspec/core/rake_task"
+  RSpec::Core::RakeTask.new(:spec)
+rescue LoadError
+end
+
+###############################################################################

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

@@ -52,7 +52,11 @@ module TerraformWrapper
         logger.fatal("Response body from Hashicorp Checkpoint is not permitted!")                if not response.class.body_permitted?
         logger.fatal("Response body from Hashicorp Checkpoint is empty!")                        if response.body.nil?
 
-        body = JSON.parse(response.body)
+        begin
+          body = JSON.parse(response.body)
+        rescue JSON::ParserError
+          logger.fatal("Response body from Hashicorp Checkpoint is not valid JSON!")
+        end
 
         logger.fatal("Hashicorp Checkpoint JSON response did not include latest available Terraform version!") if not body.key?("current_version")
         logger.fatal("Hashicorp Checkpoint indicated latest available version of Terraform is blank!")         if body["current_version"].empty?

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

@@ -98,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)
@@ -149,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?
 
@@ -166,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.5"
+  VERSION = "1.3.0"
 
 ###############################################################################
 

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

data/terraform-wrapper.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
 
   spec.summary     = "A ruby wrapper for managing Terraform binaries and remote state."
   spec.description = "A ruby wrapper for managing Terraform binaries and remote state. Each Terraform command (plan, apply, etc) is wrapped so that the correct binary is used and remote state referenced."
-  spec.homepage    = "https://gitlab.com/rlees85-ruby/terraform-wrapper/"
+  spec.homepage    = "https://gitlab.com/bitservices/ruby/terraform-wrapper/"
   spec.license     = "MIT"
 
   spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
@@ -34,6 +34,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'rake', '~> 13.0'
   spec.add_dependency 'rubyzip', '~> 2.3'
+
+  spec.add_development_dependency 'rspec', '~> 3.10'
 end
 
 ###############################################################################

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraform-wrapper
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.3.0
 platform: ruby
 authors:
 - Richard Lees
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-24 00:00:00.000000000 Z
+date: 2022-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.10'
 description: A ruby wrapper for managing Terraform binaries and remote state. Each
   Terraform command (plan, apply, etc) is wrapped so that the correct binary is used
   and remote state referenced.
@@ -49,9 +63,12 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".gitlab-ci.yml"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - Rakefile
+- avatar-0.png
+- avatar-1.png
 - bin/console
 - bin/setup
 - lib/terraform-wrapper.rb
@@ -83,16 +100,17 @@ 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
 - terraform-wrapper.gemspec
-homepage: https://gitlab.com/rlees85-ruby/terraform-wrapper/
+homepage: https://gitlab.com/bitservices/ruby/terraform-wrapper/
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://gitlab.com/rlees85-ruby/terraform-wrapper/
-  source_code_uri: https://gitlab.com/rlees85-ruby/terraform-wrapper/
+  homepage_uri: https://gitlab.com/bitservices/ruby/terraform-wrapper/
+  source_code_uri: https://gitlab.com/bitservices/ruby/terraform-wrapper/
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -108,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: A ruby wrapper for managing Terraform binaries and remote state.