terraform-wrapper 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cec70134c0df1674effb0b5e07ffaa3ff7d1a2ca034dd6452563f616e67e09c1
-  data.tar.gz: b4c6416feea1f68b3db4f593f7e2692a7553869977dad45aa0da045477841add
+  metadata.gz: bafe8ef5b2dd58357fd8ac1eb741deb4ace78e02d374f1711c727e5835731715
+  data.tar.gz: 9899116a854e2ab82a4cfc6736f94321735593a7f03c6197715324415c8e5f30
 SHA512:
-  metadata.gz: 0cb74ef36d96167259fec72539932d7614a25ad2f442fd75940bdaff3fe63b17aa7a793f17f90368c930112d7ab433950bf0c900ed46694d4dfd8e1cba3d311b
-  data.tar.gz: '090b646a9d688e4e12149752cffa4f71414a47c70b4ec619a7a142e342e9ece421e929baf42045b767c896666406317f0aff602b12d35d123b767bf87793b303'
+  metadata.gz: 48a9f108a1b0dc5d111486d3f093b08c8e0a5d40f9a3d70211f537a1623dcb86019c39144177e774ee22e224fd23030e473bf3a5dd3b501131c3e6691312d83b
+  data.tar.gz: d0dd56c21bd7b6345913b3117aa1921118d9b60fc31cb8bcef72dc6556868e7aeff9497104bda31331ad3b30e7be02cf1c71814a3549b09a9bbdeedbbdfa2a8e

data/lib/terraform-wrapper.rb

@@ -22,7 +22,7 @@ module TerraformWrapper
 
 ###############################################################################
 
-  def self.define_tasks(component:, options: Hash.new, service:)
+  def self.deployment_tasks(component:, options: Hash.new, service:)
     @logger.info("Building tasks for service: #{service}, component: #{component}...")
 
     @logger.fatal("Options must be specified as a hash!") unless options.kind_of?(Hash)

data/lib/terraform-wrapper/common.rb

@@ -28,7 +28,7 @@ module TerraformWrapper
       return path if File.file?(path)
     end
 
-    logger.fatal("#{description} name: #{name} not found in location: #{base}!")
+    @logger.fatal("#{description} name: #{name} not found in location: #{base}!")
   end
 
 ###############################################################################

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

@@ -25,13 +25,13 @@ module TerraformWrapper
 
 ###############################################################################
 
-        @password = nil
+        @keyvault        = nil
+        @secret_username = nil
+        @secret_password = nil
 
 ###############################################################################
 
-        attr_reader :subscription
-        attr_reader :tenant
-        attr_reader :username
+        @subscription
 
 ###############################################################################
 
@@ -42,10 +42,17 @@ module TerraformWrapper
 ###############################################################################
 
         def auth()
-          ENV["ARM_SUBSCRIPTION_ID"] = @subscription
-          ENV["ARM_TENANT_ID"]       = @tenant
-          ENV["ARM_CLIENT_ID"]       = @username unless @username.nil?
-          ENV["ARM_CLIENT_SECRET"]   = @password unless @password.nil?
+          details = subscription_details(subscription: @subscription)
+
+          subscription = details["id"]
+          tenant       = details["tenant"]
+          username     = @keyvault.nil? ? nil : secret(vault: @keyvault, name: @secret_username)
+          password     = @keyvault.nil? ? nil : secret(vault: @keyvault, name: @secret_password)
+
+          ENV["ARM_SUBSCRIPTION_ID"] = subscription
+          ENV["ARM_TENANT_ID"]       = tenant
+          ENV["ARM_CLIENT_ID"]       = username unless username.nil?
+          ENV["ARM_CLIENT_SECRET"]   = password unless password.nil?
           logger.success("Azure authenticator environment variables set!")
         end
 
@@ -151,20 +158,13 @@ module TerraformWrapper
           end
 
           begin
-            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?
+            @subscription    = subscription % @variables.identifiers
+            @keyvault        = keyvault     % @variables.identifiers unless keyvault.nil?
+            @secret_username = username     % @variables.identifiers unless keyvault.nil?
+            @secret_password = password     % @variables.identifiers unless keyvault.nil?
           rescue
             logger.fatal("Azure authenticator options contain identifiers that are not included in the configuration file!")
           end
-
-          details = subscription_details(subscription: subscription)
-
-          @subscription = details["id"]
-          @tenant       = details["tenant"]
-          @username     = keyvault.nil? ? nil : secret(vault: keyvault, name: username)
-          @password     = keyvault.nil? ? nil : secret(vault: keyvault, name: password)
         end
 
 ###############################################################################

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

@@ -34,8 +34,6 @@ module TerraformWrapper
         @name = options["name"]
 
         @path = File.join(@base, @name)
-
-        logger.fatal("Terraform code location: #{@path} does not exist!") unless exists
       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"]
@@ -75,15 +75,28 @@ module TerraformWrapper
         logger.fatal("Invalid YAML in configuration file: #{@path}") unless yaml.kind_of?(Hash)
 
         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")
+        @variables  = TerraformWrapper::Shared::Variables.new(config: @name, component: @code.name, service: @service, identifiers: identifiers)
+
+        if yaml.key?("globals") then
+          logger.fatal("Key 'globals' is not a hash in configuration file: #{@path}") unless yaml["globals"].kind_of?(Hash)
+          globals = yaml["globals"]
+
+          @variables.add_variables(variables: globals["variables"]) if globals.key?("variables")
+        end
 
         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")
+          [ "globals", @code.name ].each do |extra|
+            if terraform.key?(extra) then
+              logger.fatal("Key '#{extra}' under 'terraform' is not a hash in configuration file: #{@path}") unless terraform[extra].kind_of?(Hash)
+              section = terraform[extra]
+
+              @variables.add_variables(variables: section["variables"]) if section.key?("variables")
+              @variables.add_files(base: @base, files: section["files"]) if section.key?("files")
+            end
+          end
         end
 
         @auths = Array.new

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

@@ -25,6 +25,8 @@ module TerraformWrapper
 ###############################################################################
 
       def initialize(binary:, code:)
+        logger.fatal("Terraform code location: #{code.path} does not exist!") unless code.check
+
         @binary = binary
         @code   = code
 

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/tasks/upgrade.rb

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

data/lib/terraform-wrapper/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraform-wrapper
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Richard Lees
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake