terraform-wrapper 1.0.1 → 1.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/terraform-wrapper.rb +1 -1
  3. data/lib/terraform-wrapper/shared/auths/azure.rb +19 -19
  4. data/lib/terraform-wrapper/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0d30c2203437eadddce4f57b8f845b991a2460b7c20d3fc6e223386a26707c78
4
- data.tar.gz: 1b1c50e4a9beffa0b51b847505b06522bcf4849016db8ee2fc0e2c2d811266bc
3
+ metadata.gz: f5f6f6de51796b0d23045b3733faa6becaad7ad36abf07a653aa2bfc750623f6
4
+ data.tar.gz: 83250f035ea1f126fb74f51bd171dd72b359e58df9cc39f707c38b928612f25e
5
5
  SHA512:
6
- metadata.gz: c333afef9d9a4cf2fa35c0ad0d02a37a7945fe5c2d5261f3de0228a6f1d2f41a844f674faa63eb7c803db81b647e6df3e36e17f709a11ff4f1ea648c84d25cba
7
- data.tar.gz: 2d4264529b09c33a18c4ea15438e43a5fad87ffe10a30ccca51abbbd011984e5b509341e17c070c88cf74e76f329ac9fa035d150149ef4d518cbcf4bb7bc1d87
6
+ metadata.gz: dd8fda5cc8485316ccd447b2ab4d713d8b78e7cee01d01f29336c15b11684ee44d0a19009b3c5dfda1e2b21d863f01f9ead3551199089870593a2fd8dd0f7f82
7
+ data.tar.gz: 04bc0285f62cf3a6c8ff9e80cf38aea09a5d3e17ce78d3fe8464c16fc36eeebea5e11bd5e295629a5117a18a147f2cb0d3f6fa6596955072f969e333fd56ef2c
data/lib/terraform-wrapper.rb CHANGED
@@ -22,7 +22,7 @@ module TerraformWrapper
22
22
 
23
23
  ###############################################################################
24
24
 
25
- def self.define_tasks(component:, options: Hash.new, service:)
25
+ def self.deployment_tasks(component:, options: Hash.new, service:)
26
26
  @logger.info("Building tasks for service: #{service}, component: #{component}...")
27
27
 
28
28
  @logger.fatal("Options must be specified as a hash!") unless options.kind_of?(Hash)
data/lib/terraform-wrapper/shared/auths/azure.rb CHANGED
@@ -25,13 +25,13 @@ module TerraformWrapper
25
25
 
26
26
  ###############################################################################
27
27
 
28
- @password = nil
28
+ @keyvault = nil
29
+ @secret_username = nil
30
+ @secret_password = nil
29
31
 
30
32
  ###############################################################################
31
33
 
32
- attr_reader :subscription
33
- attr_reader :tenant
34
- attr_reader :username
34
+ @subscription
35
35
 
36
36
  ###############################################################################
37
37
 
@@ -42,10 +42,17 @@ module TerraformWrapper
42
42
  ###############################################################################
43
43
 
44
44
  def auth()
45
- ENV["ARM_SUBSCRIPTION_ID"] = @subscription
46
- ENV["ARM_TENANT_ID"] = @tenant
47
- ENV["ARM_CLIENT_ID"] = @username unless @username.nil?
48
- ENV["ARM_CLIENT_SECRET"] = @password unless @password.nil?
45
+ details = subscription_details(subscription: @subscription)
46
+
47
+ subscription = details["id"]
48
+ tenant = details["tenant"]
49
+ username = @keyvault.nil? ? nil : secret(vault: @keyvault, name: @secret_username)
50
+ password = @keyvault.nil? ? nil : secret(vault: @keyvault, name: @secret_password)
51
+
52
+ ENV["ARM_SUBSCRIPTION_ID"] = subscription
53
+ ENV["ARM_TENANT_ID"] = tenant
54
+ ENV["ARM_CLIENT_ID"] = username unless username.nil?
55
+ ENV["ARM_CLIENT_SECRET"] = password unless password.nil?
49
56
  logger.success("Azure authenticator environment variables set!")
50
57
  end
51
58
 
@@ -151,20 +158,13 @@ module TerraformWrapper
151
158
  end
152
159
 
153
160
  begin
154
- subscription = subscription % @variables.identifiers
155
- keyvault = keyvault % @variables.identifiers unless keyvault.nil?
156
- username = username % @variables.identifiers unless keyvault.nil?
157
- password = password % @variables.identifiers unless keyvault.nil?
161
+ @subscription = subscription % @variables.identifiers
162
+ @keyvault = keyvault % @variables.identifiers unless keyvault.nil?
163
+ @secret_username = username % @variables.identifiers unless keyvault.nil?
164
+ @secret_password = password % @variables.identifiers unless keyvault.nil?
158
165
  rescue
159
166
  logger.fatal("Azure authenticator options contain identifiers that are not included in the configuration file!")
160
167
  end
161
-
162
- details = subscription_details(subscription: subscription)
163
-
164
- @subscription = details["id"]
165
- @tenant = details["tenant"]
166
- @username = keyvault.nil? ? nil : secret(vault: keyvault, name: username)
167
- @password = keyvault.nil? ? nil : secret(vault: keyvault, name: password)
168
168
  end
169
169
 
170
170
  ###############################################################################
data/lib/terraform-wrapper/version.rb CHANGED
@@ -4,7 +4,7 @@ module TerraformWrapper
4
4
 
5
5
  ###############################################################################
6
6
 
7
- VERSION = "1.0.1"
7
+ VERSION = "1.0.2"
8
8
 
9
9
  ###############################################################################
10
10
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: terraform-wrapper
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.1
4
+ version: 1.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Richard Lees
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-03-08 00:00:00.000000000 Z
11
+ date: 2021-03-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake