terragov 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18df1434ae9c550495cb0bc00a2da7577bf50295
-  data.tar.gz: 4ef166343fae271dec31b8aeaf0585de57750fb2
+  metadata.gz: 81263feff3c924e10abd2ee9970eb7f0b8c38a8b
+  data.tar.gz: caa6a769b206bd259ed0cb6ad9402226ee140f53
 SHA512:
-  metadata.gz: 36c0214bd7731eb39564e024c0ec19fc962a3482a651477caa8079f86a0e16b7852f110fb461b6627054565885b722d1508894dba38af7fe9dead119d96efde7
-  data.tar.gz: 61614afcf67f13d5f7e391e09854079323f1e4b19e636092572a2934e3ad1dbcfddbdceee157883cc654e076e6d9fd165be718ebfa5f0493f309d03e2c44b762
+  metadata.gz: cc20df3bc78578f2f72661ee803affded61c966394262753c7d2026c78cc0e9119287b6fb66f7d26de1f80b6a10c5ace7081fba0c8e3a082e8c7121313362367
+  data.tar.gz: 7d4cbadd5f067d840dc14de3a92305735346fefb13aad4ae7980cc3549ed613be0f85298097c12b6b5ef81149070bbd260cdaaed503914c0451eb4bd169c937f

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.3 (2018-01-30)
+
+ - Allow full hierachy use of data across all environments
+
 ## 0.3.2 (2017-12-29)
 
  - Allow force when applying on Terraform versions >=0.11

data/lib/terragov/buildpaths.rb

@@ -11,17 +11,21 @@ module Terragov
       extra   = options['extra']
 
       # Construct variables
-      terraform_dir              = File.join(repo_dir, 'terraform')
-      project_dir                = File.join(terraform_dir, "projects/#{project}")
-      backend_file               = File.join(project_dir, "#{environment}.#{stack}.backend")
-      common_data_dir            = File.join(data_dir, "common/#{environment}")
-      common_data                = File.join(common_data_dir, 'common.tfvars')
-      stack_common_data          = File.join(common_data_dir, "#{stack}.tfvars")
-      project_data_dir           = File.join(data_dir, "#{project}/#{environment}")
-      common_project_data        = File.join(project_data_dir, 'common.tfvars')
-      secret_common_project_data = File.join(project_data_dir, 'common.secret.tfvars')
-      stack_project_data         = File.join(project_data_dir, "#{stack}.tfvars")
-      secret_project_data        = File.join(project_data_dir, "#{stack}.secret.tfvars")
+      terraform_dir               = File.join(repo_dir, 'terraform')
+      project_dir                 = File.join(terraform_dir, "projects/#{project}")
+      backend_file                = File.join(project_dir, "#{environment}.#{stack}.backend")
+      common_data_dir             = File.join(data_dir, "common/#{environment}")
+      all_env_common_data         = File.join(data_dir, 'common', 'common.tfvars')
+      all_env_stack_common_data   = File.join(data_dir, 'common', "#{stack}.tfvars")
+      common_data                 = File.join(common_data_dir, 'common.tfvars')
+      stack_common_data           = File.join(common_data_dir, "#{stack}.tfvars")
+      project_data_dir            = File.join(data_dir, "#{project}/#{environment}")
+      all_env_common_project_data = File.join(data_dir, project, 'common.tfvars')
+      all_env_stack_project_data  = File.join(data_dir, project, "#{stack}.tfvars")
+      common_project_data         = File.join(project_data_dir, 'common.tfvars')
+      secret_common_project_data  = File.join(project_data_dir, 'common.secret.tfvars')
+      stack_project_data          = File.join(project_data_dir, "#{stack}.tfvars")
+      secret_project_data         = File.join(project_data_dir, "#{stack}.secret.tfvars")
 
       # Return hash to enable testing
       data_paths = {
@@ -29,9 +33,13 @@ module Terragov
         project_dir: project_dir,
         backend_file: backend_file,
         common_data_dir: common_data_dir,
+        all_env_common_data: all_env_common_data,
+        all_env_stack_common_data: all_env_stack_common_data,
         common_data: common_data,
         stack_common_data: stack_common_data,
         project_data_dir: project_data_dir,
+        all_env_common_project_data: all_env_common_project_data,
+        all_env_stack_project_data: all_env_stack_project_data,
         common_project_data: common_project_data,
         secret_common_project_data: secret_common_project_data,
         stack_project_data: stack_project_data,
@@ -52,8 +60,12 @@ module Terragov
       # order to Terraform as that creates the hierarchy for overrides
       base = self.base(options)
       paths = [
+        base[:all_env_common_data],
+        base[:all_env_stack_common_data],
         base[:common_data],
         base[:stack_common_data],
+        base[:all_env_common_project_data],
+        base[:all_env_stack_project_data],
         base[:common_project_data],
         base[:secret_common_project_data],
         base[:stack_project_data],

data/lib/terragov/version.rb

@@ -1,3 +1,3 @@
 module Terragov
-  VERSION = '0.3.2'.freeze
+  VERSION = '0.3.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terragov
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Laura Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-29 00:00:00.000000000 Z
+date: 2018-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander