Skip to content

Commit db08a53

Browse files
authored
Merge pull request #20 from terraform-google-modules/aaron-lane-0.12
Add support for Terraform 0.12
2 parents 1e5c4b2 + 82ebb84 commit db08a53

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+1278
-555
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ project adheres to [Semantic Versioning](http://semver.org/).
77

88
## [Unreleased]
99

10+
### Changed
11+
12+
- Supported version of Terraform is 0.12. [#16]
13+
1014
## [0.2.0] - 2019-05-30
1115

1216
### Added
@@ -23,3 +27,4 @@ project adheres to [Semantic Versioning](http://semver.org/).
2327
[0.2.0]: https://github.com/terraform-google-modules/terraform-google-vm/compare/v0.1.0...v0.2.0
2428
[0.1.0]: https://github.com/terraform-google-modules/terraform-google-vm/releases/tag/v0.1.0
2529
[#10]: https://github.com/terraform-google-modules/terraform-google-vm/pull/10
30+
[#16]: https://github.com/terraform-google-modules/terraform-google-vm/pull/16

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
# limitations under the License.
1414

1515
source 'https://rubygems.org/' do
16-
gem 'kitchen-terraform', '~> 4.1'
16+
gem 'kitchen-terraform', '~> 4.9'
1717
end

Gemfile.lock

Lines changed: 85 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -3,69 +3,72 @@ GEM
33
specs:
44
addressable (2.6.0)
55
public_suffix (>= 2.0.2, < 4.0)
6-
aws-sdk (2.11.210)
7-
aws-sdk-resources (= 2.11.210)
8-
aws-sdk-core (2.11.210)
6+
aws-eventstream (1.0.3)
7+
aws-sdk (2.11.316)
8+
aws-sdk-resources (= 2.11.316)
9+
aws-sdk-core (2.11.316)
910
aws-sigv4 (~> 1.0)
1011
jmespath (~> 1.0)
11-
aws-sdk-resources (2.11.210)
12-
aws-sdk-core (= 2.11.210)
13-
aws-sigv4 (1.0.3)
14-
azure_graph_rbac (0.17.0)
12+
aws-sdk-resources (2.11.316)
13+
aws-sdk-core (= 2.11.316)
14+
aws-sigv4 (1.1.0)
15+
aws-eventstream (~> 1.0, >= 1.0.2)
16+
azure_graph_rbac (0.17.1)
1517
ms_rest_azure (~> 0.11.0)
16-
azure_mgmt_key_vault (0.17.2)
17-
ms_rest_azure (~> 0.11.0)
18-
azure_mgmt_resources (0.17.2)
18+
azure_mgmt_key_vault (0.17.4)
1919
ms_rest_azure (~> 0.11.0)
20+
azure_mgmt_resources (0.17.6)
21+
ms_rest_azure (~> 0.11.1)
2022
builder (3.2.3)
2123
coderay (1.1.2)
22-
concurrent-ruby (1.1.4)
24+
concurrent-ruby (1.1.5)
2325
declarative (0.0.10)
2426
declarative-option (0.1.0)
2527
diff-lcs (1.3)
2628
docker-api (1.34.2)
2729
excon (>= 0.47.0)
2830
multi_json
29-
domain_name (0.5.20180417)
31+
domain_name (0.5.20190701)
3032
unf (>= 0.0.5, < 1.0.0)
31-
dry-configurable (0.7.0)
33+
dry-configurable (0.8.3)
3234
concurrent-ruby (~> 1.0)
33-
dry-container (0.6.0)
35+
dry-core (~> 0.4, >= 0.4.7)
36+
dry-container (0.7.2)
3437
concurrent-ruby (~> 1.0)
3538
dry-configurable (~> 0.1, >= 0.1.3)
36-
dry-core (0.4.7)
39+
dry-core (0.4.8)
3740
concurrent-ruby (~> 1.0)
38-
dry-equalizer (0.2.1)
41+
dry-equalizer (0.2.2)
3942
dry-inflector (0.1.2)
40-
dry-logic (0.4.2)
41-
dry-container (~> 0.2, >= 0.2.6)
43+
dry-logic (0.6.1)
44+
concurrent-ruby (~> 1.0)
4245
dry-core (~> 0.2)
4346
dry-equalizer (~> 0.2)
44-
dry-types (0.13.4)
47+
dry-types (0.14.1)
4548
concurrent-ruby (~> 1.0)
4649
dry-container (~> 0.3)
4750
dry-core (~> 0.4, >= 0.4.4)
4851
dry-equalizer (~> 0.2)
4952
dry-inflector (~> 0.1, >= 0.1.2)
50-
dry-logic (~> 0.4, >= 0.4.2)
51-
dry-validation (0.12.2)
53+
dry-logic (~> 0.5, >= 0.5)
54+
dry-validation (0.13.0)
5255
concurrent-ruby (~> 1.0)
5356
dry-configurable (~> 0.1, >= 0.1.3)
5457
dry-core (~> 0.2, >= 0.2.1)
5558
dry-equalizer (~> 0.2)
56-
dry-logic (~> 0.4, >= 0.4.0)
57-
dry-types (~> 0.13.1)
59+
dry-logic (~> 0.5, >= 0.5.0)
60+
dry-types (~> 0.14, >= 0.14)
5861
equatable (0.5.0)
5962
erubis (2.7.0)
60-
excon (0.62.0)
63+
excon (0.64.0)
6164
faraday (0.15.4)
6265
multipart-post (>= 1.2, < 3)
6366
faraday-cookie_jar (0.0.6)
6467
faraday (>= 0.7.4)
6568
http-cookie (~> 1.0.0)
6669
faraday_middleware (0.12.2)
6770
faraday (>= 0.7.4, < 1.0)
68-
ffi (1.10.0)
71+
ffi (1.11.1)
6972
google-api-client (0.23.9)
7073
addressable (~> 2.5, >= 2.5.1)
7174
googleauth (>= 0.5, < 0.7.0)
@@ -81,7 +84,7 @@ GEM
8184
multi_json (~> 1.11)
8285
os (>= 0.9, < 2.0)
8386
signet (~> 0.7)
84-
gssapi (1.2.0)
87+
gssapi (1.3.0)
8588
ffi (>= 1.0.1)
8689
gyoku (1.3.1)
8790
builder (>= 2.1.2)
@@ -91,7 +94,7 @@ GEM
9194
domain_name (~> 0.5)
9295
httpclient (2.8.3)
9396
inifile (3.0.0)
94-
inspec (3.2.6)
97+
inspec (3.9.3)
9598
addressable (~> 2.4)
9699
faraday (>= 0.9.0)
97100
faraday_middleware (~> 0.12.2)
@@ -112,19 +115,26 @@ GEM
112115
term-ansicolor
113116
thor (~> 0.20)
114117
tomlrb (~> 1.2)
115-
train (~> 1.5, >= 1.6.3)
118+
train (~> 1.5, >= 1.7.2)
119+
train-habitat (~> 0.1)
116120
tty-prompt (~> 0.17)
117121
tty-table (~> 0.10)
118122
jmespath (1.4.0)
119123
json (2.1.0)
120-
jwt (2.1.0)
121-
kitchen-terraform (4.3.0)
122-
dry-types (~> 0.9)
123-
dry-validation (~> 0.10)
124+
jwt (2.2.1)
125+
kitchen-terraform (4.9.0)
126+
dry-types (~> 0.14.0)
127+
dry-validation (= 0.13.0)
124128
inspec (~> 3.0)
129+
json (~> 2.1.0)
125130
mixlib-shellout (~> 2.2)
126131
test-kitchen (~> 1.23)
127132
tty-which (~> 0.4.0)
133+
license-acceptance (1.0.13)
134+
pastel (~> 0.7)
135+
tomlrb (~> 1.2)
136+
tty-box (~> 0.3)
137+
tty-prompt (~> 0.18)
128138
little-plugger (1.1.4)
129139
logging (2.2.2)
130140
little-plugger (~> 1.1)
@@ -133,42 +143,43 @@ GEM
133143
method_source (0.9.2)
134144
mime-types (3.2.2)
135145
mime-types-data (~> 3.2015)
136-
mime-types-data (3.2018.0812)
137-
mixlib-install (3.11.5)
146+
mime-types-data (3.2019.0331)
147+
mixlib-install (3.11.18)
138148
mixlib-shellout
139149
mixlib-versioning
140150
thor
141151
mixlib-log (3.0.1)
142152
mixlib-shellout (2.4.4)
143153
mixlib-versioning (1.2.7)
144-
ms_rest (0.7.3)
154+
ms_rest (0.7.4)
145155
concurrent-ruby (~> 1.0)
146156
faraday (~> 0.9)
147-
timeliness (~> 0.3)
148-
ms_rest_azure (0.11.0)
157+
timeliness (~> 0.3.10)
158+
ms_rest_azure (0.11.1)
149159
concurrent-ruby (~> 1.0)
150160
faraday (~> 0.9)
151161
faraday-cookie_jar (~> 0.0.6)
152-
ms_rest (~> 0.7.2)
162+
ms_rest (~> 0.7.4)
163+
unf_ext (= 0.0.7.2)
153164
multi_json (1.13.1)
154-
multipart-post (2.0.0)
165+
multipart-post (2.1.1)
155166
necromancer (0.4.0)
156167
net-scp (1.2.1)
157168
net-ssh (>= 2.6.5)
158169
net-ssh (4.2.0)
159-
net-ssh-gateway (1.3.0)
160-
net-ssh (>= 2.6.5)
170+
net-ssh-gateway (2.0.0)
171+
net-ssh (>= 4.0.0)
161172
nori (2.6.0)
162-
os (1.0.0)
163-
parallel (1.13.0)
173+
os (1.0.1)
174+
parallel (1.17.0)
164175
parslet (1.8.2)
165176
pastel (0.7.2)
166177
equatable (~> 0.5.0)
167178
tty-color (~> 0.4.0)
168179
pry (0.12.2)
169180
coderay (~> 1.1.0)
170181
method_source (~> 0.9.0)
171-
public_suffix (3.0.3)
182+
public_suffix (3.1.1)
172183
representable (3.0.4)
173184
declarative (< 0.1.0)
174185
declarative-option (< 0.2.0)
@@ -178,50 +189,51 @@ GEM
178189
rspec-core (~> 3.8.0)
179190
rspec-expectations (~> 3.8.0)
180191
rspec-mocks (~> 3.8.0)
181-
rspec-core (3.8.0)
192+
rspec-core (3.8.2)
182193
rspec-support (~> 3.8.0)
183-
rspec-expectations (3.8.2)
194+
rspec-expectations (3.8.4)
184195
diff-lcs (>= 1.2.0, < 2.0)
185196
rspec-support (~> 3.8.0)
186-
rspec-its (1.2.0)
197+
rspec-its (1.3.0)
187198
rspec-core (>= 3.0.0)
188199
rspec-expectations (>= 3.0.0)
189-
rspec-mocks (3.8.0)
200+
rspec-mocks (3.8.1)
190201
diff-lcs (>= 1.2.0, < 2.0)
191202
rspec-support (~> 3.8.0)
192-
rspec-support (3.8.0)
203+
rspec-support (3.8.2)
193204
rubyntlm (0.6.2)
194-
rubyzip (1.2.2)
205+
rubyzip (1.2.3)
195206
semverse (3.0.0)
196207
signet (0.11.0)
197208
addressable (~> 2.3)
198209
faraday (~> 0.9)
199210
jwt (>= 1.5, < 3.0)
200211
multi_json (~> 1.10)
201212
sslshake (1.3.0)
202-
strings (0.1.4)
203-
strings-ansi (~> 0.1.0)
204-
unicode-display_width (~> 1.4.0)
205-
unicode_utils (~> 1.4.0)
213+
strings (0.1.5)
214+
strings-ansi (~> 0.1)
215+
unicode-display_width (~> 1.5)
216+
unicode_utils (~> 1.4)
206217
strings-ansi (0.1.0)
207218
term-ansicolor (1.7.1)
208219
tins (~> 1.0)
209-
test-kitchen (1.24.0)
220+
test-kitchen (1.25.0)
221+
license-acceptance (~> 1.0, >= 1.0.11)
210222
mixlib-install (~> 3.6)
211223
mixlib-shellout (>= 1.2, < 3.0)
212-
net-scp (~> 1.1)
224+
net-scp (>= 1.1, < 3.0)
213225
net-ssh (>= 2.9, < 5.0)
214-
net-ssh-gateway (~> 1.2)
226+
net-ssh-gateway (>= 1.2, < 3.0)
215227
thor (~> 0.19)
216228
winrm (~> 2.0)
217229
winrm-elevated (~> 1.0)
218230
winrm-fs (~> 1.1)
219231
thor (0.20.3)
220-
timeliness (0.3.8)
232+
timeliness (0.3.10)
221233
timers (4.3.0)
222-
tins (1.20.2)
234+
tins (1.21.1)
223235
tomlrb (1.2.8)
224-
train (1.6.3)
236+
train (1.7.6)
225237
aws-sdk (~> 2)
226238
azure_graph_rbac (~> 0.16)
227239
azure_mgmt_key_vault (~> 0.17)
@@ -231,13 +243,19 @@ GEM
231243
googleauth (~> 0.6.6)
232244
inifile
233245
json (>= 1.8, < 3.0)
234-
mixlib-shellout (~> 2.0)
246+
mixlib-shellout (>= 2.0)
235247
net-scp (~> 1.2)
236248
net-ssh (>= 2.9, < 6.0)
237249
winrm (~> 2.0)
238250
winrm-fs (~> 1.0)
251+
train-habitat (0.1.1)
252+
train (>= 1.7.5, < 3.0)
253+
tty-box (0.3.0)
254+
pastel (~> 0.7.2)
255+
strings (~> 0.1.4)
256+
tty-cursor (~> 0.6.0)
239257
tty-color (0.4.3)
240-
tty-cursor (0.6.0)
258+
tty-cursor (0.6.1)
241259
tty-prompt (0.18.1)
242260
necromancer (~> 0.4.0)
243261
pastel (~> 0.7.0)
@@ -255,14 +273,14 @@ GEM
255273
pastel (~> 0.7.2)
256274
strings (~> 0.1.0)
257275
tty-screen (~> 0.6.4)
258-
tty-which (0.4.0)
276+
tty-which (0.4.1)
259277
uber (0.1.0)
260278
unf (0.1.4)
261279
unf_ext
262-
unf_ext (0.0.7.5)
263-
unicode-display_width (1.4.1)
280+
unf_ext (0.0.7.2)
281+
unicode-display_width (1.6.0)
264282
unicode_utils (1.4.0)
265-
winrm (2.3.1)
283+
winrm (2.3.2)
266284
builder (>= 2.1.2)
267285
erubis (~> 2.7)
268286
gssapi (~> 1.2)
@@ -285,7 +303,7 @@ PLATFORMS
285303
ruby
286304

287305
DEPENDENCIES
288-
kitchen-terraform (~> 4.1)!
306+
kitchen-terraform (~> 4.9)!
289307

290308
BUNDLED WITH
291309
1.17.3

0 commit comments

Comments
 (0)