terraform-wrapper 1.1.0 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 757e953e25e4899b35a17e556123581ab077a84769a144f51db286a6b56f8608
-  data.tar.gz: 25d70f9f0132157ccc738bf0c459f35d1e777f5760bae6177bc202e92bc1c95c
+  metadata.gz: 61563bbc4ee42f89c431029a6ef933e3327e785fbc3bde3091b804e60d23c95d
+  data.tar.gz: 17b0def9e9c08f8c1d80952297eab0012117181f6f21487128e224ef6938c273
 SHA512:
-  metadata.gz: a0399939f5522c2ffb3fcee4e0dded13c09b7731e0025de5d92bdab8afe63e9b3506eba6bf99d345323ea4f77f7a9096e18203f975127eb29729b60379036144
-  data.tar.gz: 9a8ef1ea51a121cd85a5a4334cda520f8a4246c2125510054c047f7d29e004cae8bf30a4eb200aae71321d0ccf1748b385449735d5e1bc00b65cf67b3f624c15
+  metadata.gz: f28121fc946492d46d11c28e96f5f7b95eb4b55731faa2c9e392af81b5e2ab9ad52c4648e645dac7e78819cedf3516b26cf41d8fd532c68ada8903b321e83a3c
+  data.tar.gz: 47b7f9c44fa88c75276f5497216b9480682c0e3590b31704d46a32d7b0b0e498b2d3aa575c04f07d452e5df5605ca2a53269a8bbefd26a0146bd4279ecddf20b

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

@@ -22,12 +22,13 @@ module TerraformWrapper
 
       attr_reader :base
       attr_reader :directory
+      attr_reader :provider
       attr_reader :platform
       attr_reader :version
 
 ###############################################################################
 
-      def initialize(options:)
+      def initialize(options:, provider:)
         logger.fatal("Binary base path must be a string!") unless options["base"].kind_of?(String)
         logger.fatal("Binary base path must not be blank!") if options["base"].strip.empty?
 
@@ -39,8 +40,8 @@ module TerraformWrapper
         @version = options["version"]
 
         @platform = platform_detect
-
         @directory = File.join(@base, @version, @platform)
+        @provider = provider
         @name = "terraform"
       end
 

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

@@ -41,16 +41,16 @@ module TerraformWrapper
 
         @base = options["base"]
 
-        logger.fatal("Configuration service name must be a string!") unless options["service"].kind_of?(String)
-        logger.fatal("Configuration service name must not be blank!") if options["service"].strip.empty?
-
-        @service = options["service"]
-
         logger.fatal("Configuration name must be a string!") unless options["name"].kind_of?(String)
         logger.fatal("Configuration name must not be blank!") if options["name"].strip.empty?
 
         @name = options["name"]
 
+        logger.fatal("Configuration service name must be a string!") unless options["service"].kind_of?(String)
+        logger.fatal("Configuration service name must not be blank!") if options["service"].strip.empty?
+
+        @service = options["service"]
+
         logger.fatal("Configuration authenticator for Azure enabled must be a Boolean!") unless [ true, false ].include?(options["auth-azure"])
 
         auth_azure = options["auth-azure"]

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

@@ -0,0 +1,41 @@
+###############################################################################
+
+module TerraformWrapper
+
+###############################################################################
+
+  module Shared
+
+###############################################################################
+
+    class Provider
+
+###############################################################################
+
+      include TerraformWrapper::Shared::Logging
+
+###############################################################################
+
+      attr_reader :platforms
+
+###############################################################################
+
+      def initialize(options:)
+        logger.fatal("Provider platforms to prefetch hashs for must be an array!") unless options["platforms"].kind_of?(Array)
+
+        @platforms = options["platforms"]
+      end
+
+###############################################################################
+
+    end
+
+###############################################################################
+
+  end
+
+###############################################################################
+
+end
+
+###############################################################################

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

@@ -14,6 +14,10 @@ module TerraformWrapper
 
       include TerraformWrapper::Shared::Logging
 
+###############################################################################
+
+      @@lockfile_name = ".terraform.lock.hcl"
+
 ###############################################################################
 
       attr_reader :binary
@@ -35,35 +39,13 @@ module TerraformWrapper
 
 ###############################################################################
 
-      def download(upgrade: false)
+      def download
         parameters = Array.new
         parameters.append("-backend=false")
-        parameters.append("-upgrade") if upgrade
-
-        @downloaded = run(action: "init", parameters: parameters)
-        logger.fatal("Failed to download Terraform modules.") unless @downloaded
-      end
-
-###############################################################################
-
-      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?
 
-        logger.fatal("Identification for infrastructure to import must be a string!") unless id.kind_of?(String)
-        logger.fatal("Identification for infrastructure to import must not be blank!") if id.strip.empty?
+        logger.fatal("Failed to download Terraform modules.") unless run(action: "init", parameters: parameters)
 
-        parameters = Array.new
-        parameters.concat(variable_files)
-        parameters.concat(variable_strings)
-
-        parameters.append("'#{address}'")
-        parameters.append("'#{id}'")
-
-        logger.fatal("Terraform import failed!") unless run(action: "import", parameters: parameters)
+        @downloaded = true
       end
 
 ###############################################################################
@@ -78,28 +60,36 @@ module TerraformWrapper
 
         config.auths.map(&:auth)
 
+        logger.fatal("Failed to initialise Terraform with backend.") unless run(action: "init", parameters: parameters)
+
         @config = config
-        @initialised = run(action: "init", parameters: parameters)
-        logger.fatal("Failed to initialise Terraform with backend.") unless @initialised
+        @initialised = true
       end
 
 ###############################################################################
 
-      def plan(destroy: false, file: nil)
-        logger.fatal("Cannot Terraform plan before initialising backend!") unless initialised
+      def upgrade
+        lockfile_path = File.join(@code.path, @@lockfile_name)
+
+        if File.file?(lockfile_path)
+          logger.info("Removing lock file: #{lockfile_path}")
+          File.delete(lockfile_path)
+        end
+
+        logger.fatal("Lock file removal failed!") if File.file?(lockfile_path)
 
         parameters = Array.new
-        parameters.concat(variable_files)
-        parameters.concat(variable_strings)
+        parameters.append("-update")
+        logger.fatal("Failed to upgrade Terraform modules!") unless run(action: "get", parameters: parameters)
 
-        if not file.nil? and file.kind_of?(String) and not file.strip.empty? then
-          logger.fatal("Failed to create plan directory: #{directory}") unless ::TerraformWrapper.create_directory(directory: File.dirname(file), purpose: "plan")
-          parameters.append("-out=\"#{file}\"")
-        end
+        parameters = Array.new
+        parameters.append("lock")
 
-        parameters.append("-destroy") if destroy
+        @binary.provider.platforms.each do |platform|
+          parameters.append("-platform=\"#{platform}\"")
+        end
 
-        logger.fatal("Terraform plan failed!") unless run(action: "plan", parameters: parameters)
+        logger.fatal("Failed to upgrade Terraform providers!") unless run(action: "providers", parameters: parameters)
       end
 
 ###############################################################################
@@ -122,6 +112,25 @@ module TerraformWrapper
         logger.fatal("Terraform apply failed!") unless run(action: "apply", parameters: parameters)
       end
 
+###############################################################################
+
+      def plan(destroy: false, file: nil)
+        logger.fatal("Cannot Terraform plan before initialising backend!") unless initialised
+
+        parameters = Array.new
+        parameters.concat(variable_files)
+        parameters.concat(variable_strings)
+
+        if not file.nil? and file.kind_of?(String) and not file.strip.empty? then
+          logger.fatal("Failed to create plan directory: #{directory}") unless ::TerraformWrapper.create_directory(directory: File.dirname(file), purpose: "plan")
+          parameters.append("-out=\"#{file}\"")
+        end
+
+        parameters.append("-destroy") if destroy
+
+        logger.fatal("Terraform plan failed!") unless run(action: "plan", parameters: parameters)
+      end
+
 ###############################################################################
 
       def destroy
@@ -135,6 +144,28 @@ module TerraformWrapper
         logger.fatal("Terraform destroy failed!") unless run(action: "destroy", parameters: parameters)
       end
 
+###############################################################################
+
+      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?
+
+        logger.fatal("Identification for infrastructure to import must be a string!") unless id.kind_of?(String)
+        logger.fatal("Identification for infrastructure to import must not be blank!") if id.strip.empty?
+
+        parameters = Array.new
+        parameters.concat(variable_files)
+        parameters.concat(variable_strings)
+
+        parameters.append("'#{address}'")
+        parameters.append("'#{id}'")
+
+        logger.fatal("Terraform import failed!") unless run(action: "import", parameters: parameters)
+      end
+
 ###############################################################################
 
       def validate
@@ -146,6 +177,27 @@ module TerraformWrapper
 
     private
 
+###############################################################################
+
+      def run(action:, parameters: Array.new)
+        result = false
+
+        parameters.reject! { |item| not item.kind_of?(String) or item.strip.empty? }
+
+        cmdline = [ "\"#{@binary.path}\"", action ].concat(parameters).join(" ")
+
+        logger.info("Starting Terraform, action: #{action}")
+
+        puts("\n" + ('#' * 80) + "\n\n")
+
+        Dir.chdir(@code.path)
+        result = system(cmdline) || false
+
+        puts("\n" + ('#' * 80) + "\n\n")
+
+        return result
+      end
+
 ###############################################################################
 
       def variable_files
@@ -174,27 +226,6 @@ module TerraformWrapper
         return result
       end
 
-###############################################################################
-
-      def run(action:, parameters: Array.new)
-        result = false
-
-        parameters.reject! { |item| not item.kind_of?(String) or item.strip.empty? }
-
-        cmdline = [ "\"#{@binary.path}\"", action ].concat(parameters).join(" ")
-
-        logger.info("Starting Terraform, action: #{action}")
-
-        puts("\n" + ('#' * 80) + "\n\n")
-
-        Dir.chdir(@code.path)
-        result = system(cmdline) || false
-
-        puts("\n" + ('#' * 80) + "\n\n")
-
-        return result
-      end
-
 ###############################################################################
 
     end

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

@@ -36,11 +36,11 @@ module TerraformWrapper
         @core[:config]    = config
         @core[:service]   = service
 
-        user   = cleanse(variables: identifiers, reserved: @core.keys)
+        user   = cleanse(variables: identifiers, reserved: @core.keys, downcase: true)
         merged = @core.merge(user)
 
         @identifiers = sort ? merged.sort.to_h : merged
-        @values      = @identifiers
+        @values      = Hash.new
         @files       = Array.new
       end
 
@@ -89,7 +89,7 @@ module TerraformWrapper
 ###############################################################################
 
       def clear_variables()
-        @values = @identifers
+        @values = Hash.new
       end
 
 ###############################################################################
@@ -98,17 +98,20 @@ module TerraformWrapper
 
 ###############################################################################
 
-      def cleanse(variables:, reserved:)
+      def cleanse(variables:, reserved:, downcase: false)
         result = Hash.new
 
         variables.keys.each do |key|
           logger.fatal("Could not clean variables hash. All keys MUST be strings!") unless key.kind_of?(String)
-          logger.fatal("Could not clean variables hash, key: #{key.downcase} is reserved or already in use and cannot be used!") if reserved.include?(key.downcase.to_sym)
-          logger.fatal("Could not clean variables hash, duplicate key found: #{key.downcase}!") if result.key?(key.downcase.to_sym)
-          logger.fatal("Could not clean variables hash, value for: #{key.downcase} is not a string!") unless variables[key].kind_of?(String)
-          logger.fatal("Could not clean variables hash, value for: #{key.downcase} is empty!") if variables[key].strip.empty?
 
-          result[key.downcase.to_sym] = variables[key].strip
+          sym = downcase ? key.downcase.to_sym : key.to_sym
+
+          logger.fatal("Could not clean variables hash, key: #{sym.to_s} is reserved or already in use and cannot be used!") if reserved.include?(sym)
+          logger.fatal("Could not clean variables hash, duplicate key found: #{sym.to_s}!") if result.key?(sym)
+          logger.fatal("Could not clean variables hash, value for: #{sym.to_s} is not a string!") unless variables[key].kind_of?(String)
+          logger.fatal("Could not clean variables hash, value for: #{sym.to_s} is empty!") if variables[key].strip.empty?
+
+          result[sym] = variables[key].strip
         end
 
         return result

data/lib/terraform-wrapper/shared.rb

@@ -11,6 +11,7 @@ require_relative 'shared/binary'
 require_relative 'shared/code'
 require_relative 'shared/config'
 require_relative 'shared/latest'
+require_relative 'shared/provider'
 require_relative 'shared/runner'
 require_relative 'shared/variables'
 

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

@@ -34,12 +34,12 @@ module TerraformWrapper
 
       def upgrade_task
         desc "Upgrades the Terraform infrastructure component modules, providers and lock file."
-        task :upgrade => [:binary, :clean] do |t, args|
+        task :upgrade => [:binary] do |t, args|
           runner = TerraformWrapper::Shared::Runner.new(binary: @binary, code: @code)
 
           logger.info("Upgrading Terraform component: #{@code.name}...")
 
-          runner.download(upgrade: true)
+          runner.upgrade
         end
       end
 

data/lib/terraform-wrapper/version.rb

@@ -4,7 +4,7 @@ module TerraformWrapper
 
 ###############################################################################
 
-  VERSION = "1.1.0"
+  VERSION = "1.2.5"
 
 ###############################################################################
 

data/lib/terraform-wrapper.rb

@@ -43,8 +43,12 @@ module TerraformWrapper
     config_options["backend-options"]    = options.key?("config-backend-options")    ? options["config-backend-options"]    : Hash.new
     config_options["service"]            = service
 
-    binary = TerraformWrapper::Shared::Binary.new(options: binary_options)
-    code   = TerraformWrapper::Shared::Code.new(options: code_options)
+    provider_options = Hash.new
+    provider_options["platforms"] = options.key?("provider-platforms") ? options["provider-platforms"] : Array.new
+
+    provider = TerraformWrapper::Shared::Provider.new(options: provider_options)
+    binary   = TerraformWrapper::Shared::Binary.new(options: binary_options, provider: provider)
+    code     = TerraformWrapper::Shared::Code.new(options: code_options)
 
     tasks = Array.new
     tasks << TerraformWrapper::Tasks::Apply.new(binary: binary, code: code, options: config_options)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraform-wrapper
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.5
 platform: ruby
 authors:
 - Richard Lees
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-10 00:00:00.000000000 Z
+date: 2021-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -71,6 +71,7 @@ files:
 - lib/terraform-wrapper/shared/latest.rb
 - lib/terraform-wrapper/shared/logger.rb
 - lib/terraform-wrapper/shared/logging.rb
+- lib/terraform-wrapper/shared/provider.rb
 - lib/terraform-wrapper/shared/runner.rb
 - lib/terraform-wrapper/shared/variables.rb
 - lib/terraform-wrapper/tasks.rb
@@ -107,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: A ruby wrapper for managing Terraform binaries and remote state.