terraform-wrapper 0.1.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42a8d62aa53845eaf88d6eab555ccd6f5185197691f91695ad582c2eb6deffe5
-  data.tar.gz: bf3c949c33705cbab386b9c1cdc1cd5e408a082bcb5f3a636e2897679011310b
+  metadata.gz: cec70134c0df1674effb0b5e07ffaa3ff7d1a2ca034dd6452563f616e67e09c1
+  data.tar.gz: b4c6416feea1f68b3db4f593f7e2692a7553869977dad45aa0da045477841add
 SHA512:
-  metadata.gz: 32d29ab063a2a9a211de73e9ad416c1bbca85d62f68fbae07a324806260b674187968aba8a68ecd4740879e0d05373f7eeb48c4538185dc1e2e2aca82983f896
-  data.tar.gz: 34025e0835bb7e806d659679226f32ed850dfa6fe3b35181e83fca9901037cde9831a31be47172c5c8af10c5aa14aa5f49725458da3c63cfd6867342fb3610ed
+  metadata.gz: 0cb74ef36d96167259fec72539932d7614a25ad2f442fd75940bdaff3fe63b17aa7a793f17f90368c930112d7ab433950bf0c900ed46694d4dfd8e1cba3d311b
+  data.tar.gz: '090b646a9d688e4e12149752cffa4f71414a47c70b4ec619a7a142e342e9ece421e929baf42045b767c896666406317f0aff602b12d35d123b767bf87793b303'

data/.gitlab-ci.yml

@@ -32,6 +32,6 @@ deploy:
     - echo "-- Publishing Gem --"
     - rake release
     - echo "-- Listing Sums --"
-    - sha256sum *.gem
+    - sha256sum "pkg"/*.gem
 
 ###############################################################################

data/Gemfile

@@ -11,7 +11,3 @@ source "https://rubygems.org"
 gemspec
 
 ###############################################################################
-
-gem "rake", "~> 13.0"
-
-###############################################################################

data/lib/terraform-wrapper/common.rb

@@ -4,7 +4,7 @@ module TerraformWrapper
 
 ###############################################################################
 
-  def self.create_directory(directory:, purpose: nil, exists: true)
+  def self.create_directory(directory:, exists: true, purpose: nil)
     return exists if File.directory?(directory)
 
     result = false
@@ -20,6 +20,17 @@ module TerraformWrapper
     result = File.directory?(directory)
   end
 
+###############################################################################
+
+  def self.find(base:, name:, exts:, description: "File")
+    exts.each do |ext|
+      path = File.join(base, name + ext)
+      return path if File.file?(path)
+    end
+
+    logger.fatal("#{description} name: #{name} not found in location: #{base}!")
+  end
+
 ###############################################################################
 
 end

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

@@ -35,8 +35,8 @@ module TerraformWrapper
 
 ###############################################################################
 
-        def initialize(code:, config:, options:, service:, variables:)
-          construct(code: code, config: config, options: options, service: service, variables: variables)
+        def initialize(options:, variables:)
+          construct(options: options, variables: variables)
         end
 
 ###############################################################################
@@ -78,7 +78,7 @@ module TerraformWrapper
           stdout  = `#{cmdline}`
           code    = $?.exitstatus
 
-          logger.fatal("Failed to get secret: #{name} from key vault: #{vault}!") if (code != 0 and stdout.strip.empty?)
+          logger.fatal("Failed to get secret: #{name} from key vault: #{vault}!") if (code != 0 or stdout.strip.empty?)
 
           return(stdout.strip)
         end
@@ -97,11 +97,11 @@ module TerraformWrapper
           details = YAML.load(stdout.strip)
 
           logger.fatal("Returned details did not include the subscription ID!") unless details.key?("id")
-          logger.fatal("Returned subscription ID is not a String!") unless details["id"].kind_of?(String)
+          logger.fatal("Returned subscription ID is not a string!") unless details["id"].kind_of?(String)
           logger.fatal("Returned subscription ID is empty!") if details["id"].strip.empty?
 
           logger.fatal("Returned details did not include the tenant ID!") unless details.key?("tenant")
-          logger.fatal("Returned tenant ID is not a String!") unless details["tenant"].kind_of?(String)
+          logger.fatal("Returned tenant ID is not a string!") unless details["tenant"].kind_of?(String)
           logger.fatal("Returned tenant ID is empty!") if details["tenant"].strip.empty?
 
           details.transform_values! { |value| value.strip }
@@ -120,36 +120,43 @@ module TerraformWrapper
           logger.fatal("Azure CLI must be installed and accessible to use the Azure authenticator.") unless cli
 
           logger.fatal("Azure authenticator mandatory option 'subscription' has not been set!") unless @options.key?("subscription")
+          logger.fatal("Azure authenticator subscription must be a string!") unless @options["subscription"].kind_of?(String)
+          logger.fatal("Azure authenticator subscription must not be blank!") if @options["subscription"].strip.empty?
 
           subscription = @options["subscription"]
 
-          logger.fatal("Azure authenticator subscription must be a String!") unless subscription.kind_of?(String)
-          logger.fatal("Azure authenticator subscription must not be blank!") if subscription.strip.empty?
-
           if @options.key?("keyvault") then
-            keyvault = @options["keyvault"]
+            logger.fatal("Azure authenticator keyvault name must be a string if specified!") unless @options["keyvault"].kind_of?(String)
+            logger.fatal("Azure authenticator keyvault name must not be blank if specified!") if @options["keyvault"].strip.empty?
 
-            logger.fatal("Azure authenticator keyvault name must be a String if specified!") unless keyvault.kind_of?(String)
-            logger.fatal("Azure authenticator keyvault name must not be blank if specified!") if keyvault.strip.empty?
+            keyvault = @options["keyvault"]
 
-            username = @options.key?("username-secret") ? @options["username-secret"] : "terraform-username"
+            if @options.key?("username-secret") then
+              logger.fatal("Azure authenticator keyvault secret for username must be a string if keyvault name is specified!") unless @options["username-secret"].kind_of?(String)
+              logger.fatal("Azure authenticator keyvault secret for username must not be blank if keyvault name is specified!") if @options["username-secret"].strip.empty?
 
-            logger.fatal("Azure authenticator keyvault secret for username must be a String if keyvault name is specified!") unless username.kind_of?(String)
-            logger.fatal("Azure authenticator keyvault secret for username must not be blank if keyvault name is specified!") if username.strip.empty?
+              username = @options["username-secret"]
+            else
+              username = "terraform-username"
+            end
 
-            password = @options.key?("username-password") ? @options["username-password"] : "terraform-password"
+            if @options.key?("password-secret") then
+              logger.fatal("Azure authenticator keyvault secret for password must be a string if keyvault name is specified!") unless @options["password-secret"].kind_of?(String)
+              logger.fatal("Azure authenticator keyvault secret for password must not be blank if keyvault name is specified!") if @options["password-secret"].strip.empty?
 
-            logger.fatal("Azure authenticator keyvault secret for password must be a String if keyvault name is specified!") unless password.kind_of?(String)
-            logger.fatal("Azure authenticator keyvault secret for password must not be blank if keyvault name is specified!") if password.strip.empty?
+              password = @options["password-secret"]
+            else
+              password = "terraform-password"
+            end
           end
 
           begin
-            subscription = subscription % @variables
-            keyvault     = keyvault     % @variables unless keyvault.nil?
-            username     = username     % @variables unless keyvault.nil?
-            password     = password     % @variables unless keyvault.nil?
+            subscription = subscription % @variables.identifiers
+            keyvault     = keyvault     % @variables.identifiers unless keyvault.nil?
+            username     = username     % @variables.identifiers unless keyvault.nil?
+            password     = password     % @variables.identifiers unless keyvault.nil?
           rescue
-            logger.fatal("Azure authenticator options contain variables that are not included in the configuration file!")
+            logger.fatal("Azure authenticator options contain identifiers that are not included in the configuration file!")
           end
 
           details = subscription_details(subscription: subscription)

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

@@ -29,7 +29,7 @@ module TerraformWrapper
 
 ###############################################################################
 
-        def initialize(code:, config:, options:, service:, variables:)
+        def initialize(options:, variables:)
           logger.fatal("This class should not be used directly! Please create an authenticator-specific class instead!")
         end
 
@@ -59,13 +59,9 @@ module TerraformWrapper
 
 ###############################################################################
 
-        def construct(code:, config:, options:, service:, variables:)
+        def construct(options:, variables:)
           @options   = options
-          @variables = variables.values.merge({
-            component: code.name,
-            config: config,
-            service: service
-            })
+          @variables = variables
 
           specific
         end

data/lib/terraform-wrapper/shared/backends/aws.rb

@@ -35,8 +35,8 @@ module TerraformWrapper
 
 ###############################################################################
 
-        def initialize(code:, config:, options:, service:, variables:)
-          construct(code: code, config: config, options: options, service: service, variables: variables)
+        def initialize(options:, variables:)
+          construct(options: options, variables: variables)
         end
 
 ###############################################################################
@@ -70,17 +70,17 @@ module TerraformWrapper
 
           bucket = @options["bucket"]
 
-          logger.fatal("AWS backend S3 bucket name must be a String!") unless bucket.kind_of?(String)
+          logger.fatal("AWS backend S3 bucket name must be a string!") unless bucket.kind_of?(String)
           logger.fatal("AWS backend S3 bucket name must not be blank!") if bucket.strip.empty?
 
           region = @options["region"]
 
-          logger.fatal("AWS backend S3 bucket region must be a String!") unless region.kind_of?(String)
+          logger.fatal("AWS backend S3 bucket region must be a string!") unless region.kind_of?(String)
           logger.fatal("AWS backend S3 bucket region must not be blank!") if region.strip.empty?
 
           key = @options.key?("key") ? @options["key"] : File.join("%{service}", "%{config}", "%{component}" + @@ext)
 
-          logger.fatal("AWS backend S3 bucket key must be a String!") unless key.kind_of?(String)
+          logger.fatal("AWS backend S3 bucket key must be a string!") unless key.kind_of?(String)
           logger.fatal("AWS backend S3 bucket key must not be blank!") if key.strip.empty?
 
           encrypt = @options.key?("encrypt") ? @options["encrypt"] : true
@@ -90,29 +90,29 @@ module TerraformWrapper
           if @options.key?("kms") then
             kms = @options["kms"]
 
-            logger.fatal("AWS backend S3 bucket encryption KMS key ARN must be a String if specified!") unless kms.kind_of?(String)
+            logger.fatal("AWS backend S3 bucket encryption KMS key ARN must be a string if specified!") unless kms.kind_of?(String)
             logger.fatal("AWS backend S3 bucket encryption KMS key ARN must not be blank if specified!") if kms.strip.empty?
           end
 
           if @options.key?("role") then
             role = @options["role"]
 
-            logger.fatal("AWS backend role to assume ARN must be a String if specified!") unless role.kind_of?(String)
+            logger.fatal("AWS backend role to assume ARN must be a string if specified!") unless role.kind_of?(String)
             logger.fatal("AWS backend role to assume ARN must not be blank if specified!") if role.strip.empty?
           end
 
-          logger.fatal("AWS backend S3 bucket name or key must include %{service}.") unless (bucket.include?("%{service}") or key.include?("%{service}"))
-          logger.fatal("AWS backend S3 bucket name or key must include %{config}.") unless (bucket.include?("%{config}") or key.include?("%{config}"))
-          logger.fatal("AWS backend S3 bucket name or key must include %{component}.") unless  (bucket.include?("%{component}") or key.include?("%{component}"))
+          @variables.core.keys.map{ |sym| sym.to_s }.each do |core|
+            logger.fatal("AWS backend S3 bucket name or key must include %{#{core}}.") unless (bucket.include?("%{#{core}}") or key.include?("%{#{core}}"))
+          end
 
           begin
-            bucket = bucket % @variables
-            region = region % @variables
-            key    = key    % @variables
-            kms    = kms    % @variables unless kms.nil?
-            role   = role   % @variables unless role.nil?
+            bucket = bucket % @variables.identifiers
+            region = region % @variables.identifiers
+            key    = key    % @variables.identifiers
+            kms    = kms    % @variables.identifiers unless kms.nil?
+            role   = role   % @variables.identifiers unless role.nil?
           rescue
-            logger.fatal("AWS backend options contain variables that are not included in the configuration file!")
+            logger.fatal("AWS backend options contain identifiers that are not included in the configuration file!")
           end
 
           logger.fatal("Key: #{key} is too long for backend of type: #{@@type}") if key.length > 1024

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

@@ -31,8 +31,8 @@ module TerraformWrapper
 
 ###############################################################################
 
-        def initialize(code:, config:, options:, service:, variables:)
-          construct(code: code, config: config, options: options, service: service, variables: variables)
+        def initialize(options:, variables:)
+          construct(options: options, variables: variables)
         end
 
 ###############################################################################
@@ -57,35 +57,35 @@ module TerraformWrapper
 
           group = @options["group"]
 
-          logger.fatal("Azure backend group must be a String!") unless group.kind_of?(String)
+          logger.fatal("Azure backend group must be a string!") unless group.kind_of?(String)
           logger.fatal("Azure backend group must not be blank!") if group.strip.empty?
 
           account = @options.key?("account") ? @options["account"] : group + "tf"
 
-          logger.fatal("Azure backend storage account must be a String!") unless account.kind_of?(String)
+          logger.fatal("Azure backend storage account must be a string!") unless account.kind_of?(String)
           logger.fatal("Azure backend storage account must not be blank!") if account.strip.empty?
 
           container = @options.key?("container") ? @options["container"] : "default"
 
-          logger.fatal("Azure backend storage account container must be a String!") unless container.kind_of?(String)
+          logger.fatal("Azure backend storage account container must be a string!") unless container.kind_of?(String)
           logger.fatal("Azure backend storage account container must not be blank!") if container.strip.empty?
 
           key = @options.key?("key") ? @options["key"] : File.join("%{service}", "%{config}", "%{component}" + @@ext)
 
-          logger.fatal("Azure backend storage account key must be a String!") unless key.kind_of?(String)
+          logger.fatal("Azure backend storage account key must be a string!") unless key.kind_of?(String)
           logger.fatal("Azure backend storage account key must not be blank!") if key.strip.empty?
 
-          logger.fatal("Azure backend container or key must include %{service}.") unless (container.include?("%{service}") or key.include?("%{service}"))
-          logger.fatal("Azure backend container or key must include %{config}.") unless (container.include?("%{config}") or key.include?("%{config}"))
-          logger.fatal("Azure backend container or key must include %{component}.") unless  (container.include?("%{component}") or key.include?("%{component}"))
+          @variables.core.keys.map{ |sym| sym.to_s }.each do |core|
+            logger.fatal("Azure backend container or key must include %{#{core}}.") unless (container.include?("%{#{core}}") or key.include?("%{#{core}}"))
+          end
 
           begin
-            group     = group     % @variables
-            account   = account   % @variables
-            container = container % @variables
-            key       = key       % @variables
+            group     = group     % @variables.identifiers
+            account   = account   % @variables.identifiers
+            container = container % @variables.identifiers
+            key       = key       % @variables.identifiers
           rescue
-            logger.fatal("Azure backend options contain variables that are not included in the configuration file!")
+            logger.fatal("Azure backend options contain identifiers that are not included in the configuration file!")
           end
 
           if key.length > 1024 then

data/lib/terraform-wrapper/shared/backends/common.rb

@@ -30,7 +30,7 @@ module TerraformWrapper
 
 ###############################################################################
 
-        def initialize(code:, config:, options:, service:, variables:)
+        def initialize(options:, variables:)
           logger.fatal("This class should not be used directly! Please create a backend-specific class instead!")
         end
 
@@ -54,13 +54,9 @@ module TerraformWrapper
 
 ###############################################################################
 
-        def construct(code:, config:, options:, service:, variables:)
+        def construct(options:, variables:)
           @options   = options
-          @variables = variables.values.merge({
-            component: code.name,
-            config: config,
-            service: service
-            })
+          @variables = variables
 
           specific
         end

data/lib/terraform-wrapper/shared/backends/local.rb

@@ -28,8 +28,8 @@ module TerraformWrapper
 
 ###############################################################################
 
-        def initialize(code:, config:, options:, service:, variables:)
-          construct(code: code, config: config, options: options, service: service, variables: variables)
+        def initialize(options:, variables:)
+          construct(options: options, variables: variables)
         end
 
 ###############################################################################
@@ -49,17 +49,18 @@ module TerraformWrapper
         def specific()
           path = @options.key?("path") ? @options["path"] : File.join(Dir.pwd, "state", "terraform", "%{config}", "%{component}" + @@ext)
 
-          logger.fatal("Local backend path must be a String!") unless path.kind_of?(String)
+          logger.fatal("Local backend path must be a string!") unless path.kind_of?(String)
           logger.fatal("Local backend path must not be blank!") if path.strip.empty?
 
-          logger.fatal("Local backend path must include %{service} or the path to this repository.") unless (path.include?("%{service}") or path.include?(Dir.pwd))
-          logger.fatal("Local backend path must include %{config}") unless path.include?("%{config}")
-          logger.fatal("Local backend path must include %{component}") unless path.include?("%{component}")
+          @variables.core.keys.map{ |sym| sym.to_s }.each do |core|
+            next if (core == "service") and (path.include?(Dir.pwd))
+            logger.fatal("Local backend path must include %{#{core}}.") unless path.include?("%{#{core}}")
+          end
 
           begin
-            path = path % @variables
+            path = path % @variables.identifiers
           rescue
-            logger.fatal("Local backend options contain variables that are not included in the configuration file!")
+            logger.fatal("Local backend options contain identifiers that are not included in the configuration file!")
           end
 
           directory = File.dirname(path)

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

@@ -28,12 +28,12 @@ module TerraformWrapper
 ###############################################################################
 
       def initialize(options:)
-        logger.fatal("Binary base path must be a String!") unless options["base"].kind_of?(String)
+        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?
 
         @base = options["base"]
 
-        logger.fatal("Binary version must be a String!") unless options["version"].kind_of?(String)
+        logger.fatal("Binary version must be a string!") unless options["version"].kind_of?(String)
         logger.fatal("Binary version must not be blank!") if options["version"].strip.empty?
 
         @version = options["version"]

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

@@ -23,12 +23,12 @@ module TerraformWrapper
 ###############################################################################
 
       def initialize(options:)
-        logger.fatal("Code base path must be a String!") unless options["base"].kind_of?(String)
+        logger.fatal("Code base path must be a string!") unless options["base"].kind_of?(String)
         logger.fatal("Code base path must not be blank!") if options["base"].strip.empty?
 
         @base = options["base"]
 
-        logger.fatal("Code component name must be a String!") unless options["name"].kind_of?(String)
+        logger.fatal("Code component name must be a string!") unless options["name"].kind_of?(String)
         logger.fatal("Code component name must not be blank!") if options["name"].strip.empty?
 
         @name = options["name"]

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

@@ -22,11 +22,6 @@ module TerraformWrapper
 
       @@config_exts = [ "", ".yaml", ".yml" ]
 
-###############################################################################
-
-      @@variable_files_name = "tfvars"
-      @@variable_files_ext  = ".tfvars"
-
 ###############################################################################
 
       attr_reader :auths
@@ -36,23 +31,22 @@ module TerraformWrapper
       attr_reader :name
       attr_reader :path
       attr_reader :service
-      attr_reader :variable_files
       attr_reader :variables
 
 ###############################################################################
 
       def initialize(code:, options:)
-        logger.fatal("Configuration base path must be a String!") unless options["base"].kind_of?(String)
+        logger.fatal("Configuration base path must be a string!") unless options["base"].kind_of?(String)
         logger.fatal("Configuration base path must not be blank!") if options["base"].strip.empty?
 
         @base = options["base"]
 
-        logger.fatal("Configuration service name must be a String!") unless options["service"].kind_of?(String)
+        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 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"]
@@ -65,7 +59,7 @@ module TerraformWrapper
 
         auth_azure_options = options["auth-azure-options"]
 
-        logger.fatal("Configuration backend name must be a String!") unless options["backend"].kind_of?(String)
+        logger.fatal("Configuration backend name must be a string!") unless options["backend"].kind_of?(String)
         logger.fatal("Configuration backend name must not be blank!") if options["backend"].strip.empty?
 
         backend = options["backend"]
@@ -75,71 +69,37 @@ module TerraformWrapper
         backend_options = options["backend-options"]
 
         @code = code
-        @path = find
+        @path = ::TerraformWrapper.find(base: @base, name: @name, exts: @@config_exts, description: "Configuration")
 
         yaml = YAML.load(File.read(@path))
-
         logger.fatal("Invalid YAML in configuration file: #{@path}") unless yaml.kind_of?(Hash)
 
-        if yaml.key?("variables") then
-          logger.fatal("Key 'variables' is not a hash in configuration file: #{@path}") unless yaml["variables"].kind_of?(Hash)
-          @variables = TerraformWrapper::Shared::Variables.new(values: yaml["variables"])
-        else
-          @variables = TerraformWrapper::Shared::Variables.new()
-        end
+        identifiers = yaml.key?("identifiers") ? yaml["identifiers"] : Hash.new
+        @variables = TerraformWrapper::Shared::Variables.new(config: @name, component: @code.name, service: @service, identifiers: identifiers)
+        @variables.add_variables(variables: yaml["globals"]) if yaml.key?("globals")
 
-        @variable_files = yaml.key?("terraform") ? validate(variable_files: yaml["terraform"]) : Array.new
+        if yaml.key?("terraform") then
+          logger.fatal("Key 'terraform' is not a hash in configuration file: #{@path}") unless yaml["terraform"].kind_of?(Hash)
+          terraform = yaml["terraform"]
+
+          @variables.add_variables(variables: terraform["variables"]) if terraform.key?("variables")
+          @variables.add_files(base: @base, files: terraform["files"]) if terraform.key?("files")
+        end
 
         @auths = Array.new
-        @auths.append(TerraformWrapper::Shared::Auths::Azure.new(code: @code, config: @name, options: auth_azure_options, service: @service, variables: @variables)) if auth_azure
+        @auths.append(TerraformWrapper::Shared::Auths::Azure.new(options: auth_azure_options, variables: @variables)) if auth_azure
 
         if backend == "local" then
-          @backend = TerraformWrapper::Shared::Backends::Local.new(code: @code, config: @name, options: backend_options, service: @service, variables: @variables)
+          @backend = TerraformWrapper::Shared::Backends::Local.new(options: backend_options, variables: @variables)
         elsif backend == "aws" then
-          @backend = TerraformWrapper::Shared::Backends::AWS.new(code: @code, config: @name, options: backend_options, service: @service, variables: @variables)
+          @backend = TerraformWrapper::Shared::Backends::AWS.new(options: backend_options, variables: @variables)
         elsif backend == "azure" then
-          @backend = TerraformWrapper::Shared::Backends::Azure.new(code: @code, config: @name, options: backend_options, service: @service, variables: @variables)
+          @backend = TerraformWrapper::Shared::Backends::Azure.new(options: backend_options, variables: @variables)
         else
           logger.fatal("Backend: #{backend} is not valid!")
         end
       end
 
-###############################################################################
-
-      private
-
-###############################################################################
-
-      def find
-        @@config_exts.each do |config_ext|
-          path = File.join(@base, @name + config_ext)
-          return path if File.file?(path)
-        end
-
-        logger.fatal("Terraform configuration name: #{@name} not found in location: #{@base}!")
-      end
-
-###############################################################################
-
-      def validate(variable_files:)
-        logger.fatal("Optional key 'variable_files' must be a list of strings!") unless variable_files.kind_of?(Array)
-
-        result = Array.new
-
-        variable_files.each do |variable_file|
-          logger.fatal("All elements of 'variable_files' must be strings!") unless variable_file.kind_of?(String)
-          logger.fatal("All elements of 'variable_files' must not be blank!") if variable_file.strip.empty?
-          path = File.join(@base, @@variable_files_name, variable_file.strip + @@variable_files_ext)
-          if File.file?(path) then
-            result.append(path)
-          else
-            logger.fatal("Terraform variables file: #{variable_file}, path: #{path} does not exist!")
-          end
-        end
-
-        return result
-      end
-
 ###############################################################################
 
     end

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

@@ -29,7 +29,6 @@ module TerraformWrapper
         @code   = code
 
         @initialised = false
-        @ready       = false
       end
 
 ###############################################################################
@@ -48,11 +47,11 @@ 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 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 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
@@ -152,8 +151,8 @@ module TerraformWrapper
 
         result = Array.new
 
-        @config.variable_files.each do |variable_file|
-          result.append("-var-file=\"#{variable_file}\"")
+        @config.variables.files.each do |file|
+          result.append("-var-file=\"#{file}\"")
         end
 
         return result
@@ -166,10 +165,6 @@ module TerraformWrapper
 
         result = Array.new
 
-        result.append("-var=\"component=#{@code.name}\"")
-        result.append("-var=\"config=#{@config.name}\"")
-        result.append("-var=\"service=#{@config.service}\"")
-
         @config.variables.values.each do |key, value|
           result.append("-var=\"#{key.to_s}=#{value}\"")
         end

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

@@ -16,17 +16,80 @@ module TerraformWrapper
 
 ###############################################################################
 
-      @@reserved = [ "component", "config", "service" ]
+      @@variable_files_name =   "tfvars"
+      @@variable_files_exts = [ ".tfvars" ]
 
 ###############################################################################
 
+      attr_reader :core
+      attr_reader :files
+      attr_reader :identifiers
       attr_reader :values
 
 ###############################################################################
 
-      def initialize(values: Hash.new, sort: true)
-        cleansed = cleanse(values: values)
-        @values = sort ? cleansed.sort.to_h : cleansed
+      def initialize(component:, config:, service:, identifiers: Hash.new, sort: false)
+        logger.fatal("Identifiers provided must be a hash!") unless identifiers.kind_of?(Hash)
+
+        @core             = Hash.new()
+        @core[:component] = component
+        @core[:config]    = config
+        @core[:service]   = service
+
+        user   = cleanse(variables: identifiers, reserved: @core.keys)
+        merged = @core.merge(user)
+
+        @identifiers = sort ? merged.sort.to_h : merged
+        @values      = @identifiers
+        @files       = Array.new
+      end
+
+###############################################################################
+
+      def add_files(base:, files:)
+        logger.fatal("Variable files provided must be an array!") unless files.kind_of?(Array)
+
+        files.each do |file|
+          logger.fatal("All provided variable file names must be strings!") unless file.kind_of?(String)
+          logger.fatal("All provided variable file names must not be blank!") if file.strip.empty?
+
+          path = ::TerraformWrapper.find(base: File.join(base, @@variable_files_name), name: file.strip, exts: @@variable_files_exts, description: "Terraform values file")
+
+          if @files.include?(path) then
+            logger.warn("Terraform variables file is included more than once: #{file.strip}")
+          else
+            @files.append(path)
+          end
+        end
+      end
+
+###############################################################################
+
+      def add_variables(variables:, sort: false)
+        logger.fatal("Variables provided must be a hash!") unless variables.kind_of?(Hash)
+
+        cleansed = cleanse(variables: variables, reserved: @values.keys)
+
+        begin
+          cleansed = cleansed.map{ |key, value| [ key, value % @identifiers ] }.to_h
+        rescue
+          logger.fatal("Variables contain identifiers that are not included in the configuration file!")
+        end
+
+        merged  = @values.merge(cleansed)
+        @values = sort ? merged.sort.to_h : merged
+      end
+
+###############################################################################
+
+      def clear_files()
+        @files = Array.new
+      end
+
+###############################################################################
+
+      def clear_variables()
+        @values = @identifers
       end
 
 ###############################################################################
@@ -35,17 +98,17 @@ module TerraformWrapper
 
 ###############################################################################
 
-      def cleanse(values:)
+      def cleanse(variables:, reserved:)
         result = Hash.new
 
-        values.keys.each do |key|
+        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 and cannot be used!") if @@reserved.include?(key.downcase)
+          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 values[key].kind_of?(String)
-          logger.fatal("Could not clean variables hash, value for: #{key.downcase} is empty!") if values[key].strip.empty?
+          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] = values[key].strip
+          result[key.downcase.to_sym] = variables[key].strip
         end
 
         return result

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

@@ -133,7 +133,7 @@ module TerraformWrapper
       def extract(archive:, binary:, destination:)
         logger.info("Extracting: #{archive}")
 
-        Zip::ZipFile.open(archive) do |zip|
+        Zip::File.open(archive) do |zip|
           zip.each do |file|
             zip.extract(file, destination) if file.name == binary
           end

data/lib/terraform-wrapper/version.rb

@@ -4,7 +4,7 @@ module TerraformWrapper
 
 ###############################################################################
 
-  VERSION = "0.1.2"
+  VERSION = "1.0.0"
 
 ###############################################################################
 

data/terraform-wrapper.gemspec

@@ -31,6 +31,9 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+
+  spec.add_dependency 'rake', '~> 13.0'
+  spec.add_dependency 'rubyzip', '~> 2.3'
 end
 
 ###############################################################################

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: terraform-wrapper
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Richard Lees
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-18 00:00:00.000000000 Z
-dependencies: []
+date: 2021-03-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 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.