terragov 0.3.2 → 0.3.3

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 18df1434ae9c550495cb0bc00a2da7577bf50295
4
- data.tar.gz: 4ef166343fae271dec31b8aeaf0585de57750fb2
3
+ metadata.gz: 81263feff3c924e10abd2ee9970eb7f0b8c38a8b
4
+ data.tar.gz: caa6a769b206bd259ed0cb6ad9402226ee140f53
5
5
  SHA512:
6
- metadata.gz: 36c0214bd7731eb39564e024c0ec19fc962a3482a651477caa8079f86a0e16b7852f110fb461b6627054565885b722d1508894dba38af7fe9dead119d96efde7
7
- data.tar.gz: 61614afcf67f13d5f7e391e09854079323f1e4b19e636092572a2934e3ad1dbcfddbdceee157883cc654e076e6d9fd165be718ebfa5f0493f309d03e2c44b762
6
+ metadata.gz: cc20df3bc78578f2f72661ee803affded61c966394262753c7d2026c78cc0e9119287b6fb66f7d26de1f80b6a10c5ace7081fba0c8e3a082e8c7121313362367
7
+ data.tar.gz: 7d4cbadd5f067d840dc14de3a92305735346fefb13aad4ae7980cc3549ed613be0f85298097c12b6b5ef81149070bbd260cdaaed503914c0451eb4bd169c937f
@@ -1,3 +1,7 @@
1
+ ## 0.3.3 (2018-01-30)
2
+
3
+ - Allow full hierachy use of data across all environments
4
+
1
5
  ## 0.3.2 (2017-12-29)
2
6
 
3
7
  - Allow force when applying on Terraform versions >=0.11
@@ -11,17 +11,21 @@ module Terragov
11
11
  extra = options['extra']
12
12
 
13
13
  # Construct variables
14
- terraform_dir = File.join(repo_dir, 'terraform')
15
- project_dir = File.join(terraform_dir, "projects/#{project}")
16
- backend_file = File.join(project_dir, "#{environment}.#{stack}.backend")
17
- common_data_dir = File.join(data_dir, "common/#{environment}")
18
- common_data = File.join(common_data_dir, 'common.tfvars')
19
- stack_common_data = File.join(common_data_dir, "#{stack}.tfvars")
20
- project_data_dir = File.join(data_dir, "#{project}/#{environment}")
21
- common_project_data = File.join(project_data_dir, 'common.tfvars')
22
- secret_common_project_data = File.join(project_data_dir, 'common.secret.tfvars')
23
- stack_project_data = File.join(project_data_dir, "#{stack}.tfvars")
24
- secret_project_data = File.join(project_data_dir, "#{stack}.secret.tfvars")
14
+ terraform_dir = File.join(repo_dir, 'terraform')
15
+ project_dir = File.join(terraform_dir, "projects/#{project}")
16
+ backend_file = File.join(project_dir, "#{environment}.#{stack}.backend")
17
+ common_data_dir = File.join(data_dir, "common/#{environment}")
18
+ all_env_common_data = File.join(data_dir, 'common', 'common.tfvars')
19
+ all_env_stack_common_data = File.join(data_dir, 'common', "#{stack}.tfvars")
20
+ common_data = File.join(common_data_dir, 'common.tfvars')
21
+ stack_common_data = File.join(common_data_dir, "#{stack}.tfvars")
22
+ project_data_dir = File.join(data_dir, "#{project}/#{environment}")
23
+ all_env_common_project_data = File.join(data_dir, project, 'common.tfvars')
24
+ all_env_stack_project_data = File.join(data_dir, project, "#{stack}.tfvars")
25
+ common_project_data = File.join(project_data_dir, 'common.tfvars')
26
+ secret_common_project_data = File.join(project_data_dir, 'common.secret.tfvars')
27
+ stack_project_data = File.join(project_data_dir, "#{stack}.tfvars")
28
+ secret_project_data = File.join(project_data_dir, "#{stack}.secret.tfvars")
25
29
 
26
30
  # Return hash to enable testing
27
31
  data_paths = {
@@ -29,9 +33,13 @@ module Terragov
29
33
  project_dir: project_dir,
30
34
  backend_file: backend_file,
31
35
  common_data_dir: common_data_dir,
36
+ all_env_common_data: all_env_common_data,
37
+ all_env_stack_common_data: all_env_stack_common_data,
32
38
  common_data: common_data,
33
39
  stack_common_data: stack_common_data,
34
40
  project_data_dir: project_data_dir,
41
+ all_env_common_project_data: all_env_common_project_data,
42
+ all_env_stack_project_data: all_env_stack_project_data,
35
43
  common_project_data: common_project_data,
36
44
  secret_common_project_data: secret_common_project_data,
37
45
  stack_project_data: stack_project_data,
@@ -52,8 +60,12 @@ module Terragov
52
60
  # order to Terraform as that creates the hierarchy for overrides
53
61
  base = self.base(options)
54
62
  paths = [
63
+ base[:all_env_common_data],
64
+ base[:all_env_stack_common_data],
55
65
  base[:common_data],
56
66
  base[:stack_common_data],
67
+ base[:all_env_common_project_data],
68
+ base[:all_env_stack_project_data],
57
69
  base[:common_project_data],
58
70
  base[:secret_common_project_data],
59
71
  base[:stack_project_data],
@@ -1,3 +1,3 @@
1
1
  module Terragov
2
- VERSION = '0.3.2'.freeze
2
+ VERSION = '0.3.3'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: terragov
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.2
4
+ version: 0.3.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Laura Martin
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-12-29 00:00:00.000000000 Z
11
+ date: 2018-01-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: commander