terraform-wrapper 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d30c2203437eadddce4f57b8f845b991a2460b7c20d3fc6e223386a26707c78
-  data.tar.gz: 1b1c50e4a9beffa0b51b847505b06522bcf4849016db8ee2fc0e2c2d811266bc
+  metadata.gz: f5f6f6de51796b0d23045b3733faa6becaad7ad36abf07a653aa2bfc750623f6
+  data.tar.gz: 83250f035ea1f126fb74f51bd171dd72b359e58df9cc39f707c38b928612f25e
 SHA512:
-  metadata.gz: c333afef9d9a4cf2fa35c0ad0d02a37a7945fe5c2d5261f3de0228a6f1d2f41a844f674faa63eb7c803db81b647e6df3e36e17f709a11ff4f1ea648c84d25cba
-  data.tar.gz: 2d4264529b09c33a18c4ea15438e43a5fad87ffe10a30ccca51abbbd011984e5b509341e17c070c88cf74e76f329ac9fa035d150149ef4d518cbcf4bb7bc1d87
+  metadata.gz: dd8fda5cc8485316ccd447b2ab4d713d8b78e7cee01d01f29336c15b11684ee44d0a19009b3c5dfda1e2b21d863f01f9ead3551199089870593a2fd8dd0f7f82
+  data.tar.gz: 04bc0285f62cf3a6c8ff9e80cf38aea09a5d3e17ce78d3fe8464c16fc36eeebea5e11bd5e295629a5117a18a147f2cb0d3f6fa6596955072f969e333fd56ef2c

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

@@ -4,7 +4,7 @@ module TerraformWrapper
 
 ###############################################################################
 
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 
 ###############################################################################
 

metadata

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