terraform-wrapper 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 303be04cdd5ed0531fef7b3c33a86f41f55c3a496224837bfdbcdaf6d1411ccc
-  data.tar.gz: fe97c2265a13928c9c5893ac980e85d8123e5e55d8c0b80dc6306f3b4eee2d10
+  metadata.gz: 757e953e25e4899b35a17e556123581ab077a84769a144f51db286a6b56f8608
+  data.tar.gz: 25d70f9f0132157ccc738bf0c459f35d1e777f5760bae6177bc202e92bc1c95c
 SHA512:
-  metadata.gz: 1b4d13a4e229ac1148083a4f234591bf253cf50096fc0c99273286b780017903a2660258619c00285e98dbad7bff3e2d83344ae7ace5ff86ebb836d164b3dc91
-  data.tar.gz: d5cc2a92103f05b5ebc567e2dc2f75b35a9f3453277aef9953c90eed0da7643a78199e24357951fa7912f9770f29531a8f5bcb45b64f6a9c058ef27d1090c3c9
+  metadata.gz: a0399939f5522c2ffb3fcee4e0dded13c09b7731e0025de5d92bdab8afe63e9b3506eba6bf99d345323ea4f77f7a9096e18203f975127eb29729b60379036144
+  data.tar.gz: 9a8ef1ea51a121cd85a5a4334cda520f8a4246c2125510054c047f7d29e004cae8bf30a4eb200aae71321d0ccf1748b385449735d5e1bc00b65cf67b3f624c15

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

@@ -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/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.3"
+  VERSION = "1.1.0"
 
 ###############################################################################
 

metadata

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