chef-dk 4.1.7 → 4.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +4 -2
- data/Gemfile.lock +113 -17
- data/lib/chef-dk/builtin_commands.rb +3 -0
- data/lib/chef-dk/cli.rb +3 -1
- data/lib/chef-dk/command/clean_policy_cookbooks.rb +1 -0
- data/lib/chef-dk/command/clean_policy_revisions.rb +1 -0
- data/lib/chef-dk/command/delete_policy.rb +1 -0
- data/lib/chef-dk/command/delete_policy_group.rb +1 -0
- data/lib/chef-dk/command/describe_cookbook.rb +1 -0
- data/lib/chef-dk/command/diff.rb +5 -3
- data/lib/chef-dk/command/env.rb +6 -6
- data/lib/chef-dk/command/export.rb +1 -0
- data/lib/chef-dk/command/generate.rb +1 -0
- data/lib/chef-dk/command/generator_commands/chef_exts/quieter_doc_formatter.rb +2 -4
- data/lib/chef-dk/command/generator_commands/generator_generator.rb +1 -0
- data/lib/chef-dk/command/install.rb +1 -0
- data/lib/chef-dk/command/push.rb +1 -0
- data/lib/chef-dk/command/push_archive.rb +1 -1
- data/lib/chef-dk/command/shell_init.rb +3 -2
- data/lib/chef-dk/command/show_policy.rb +1 -0
- data/lib/chef-dk/command/undelete.rb +1 -0
- data/lib/chef-dk/command/update.rb +1 -0
- data/lib/chef-dk/command/verify.rb +1 -1
- data/lib/chef-dk/component_test.rb +2 -1
- data/lib/chef-dk/configurable.rb +3 -2
- data/lib/chef-dk/cookbook_profiler/null_scm.rb +1 -2
- data/lib/chef-dk/generator.rb +1 -1
- data/lib/chef-dk/helpers.rb +2 -1
- data/lib/chef-dk/policyfile/artifactory_cookbook_source.rb +1 -1
- data/lib/chef-dk/policyfile/attribute_merge_checker.rb +1 -1
- data/lib/chef-dk/policyfile/chef_repo_cookbook_source.rb +1 -1
- data/lib/chef-dk/policyfile/chef_server_cookbook_source.rb +3 -3
- data/lib/chef-dk/policyfile/chef_server_lock_fetcher.rb +5 -5
- data/lib/chef-dk/policyfile/community_cookbook_source.rb +1 -1
- data/lib/chef-dk/policyfile/comparison_base.rb +1 -0
- data/lib/chef-dk/policyfile/cookbook_location_specification.rb +4 -4
- data/lib/chef-dk/policyfile/cookbook_locks.rb +8 -5
- data/lib/chef-dk/policyfile/delivery_supermarket_source.rb +1 -1
- data/lib/chef-dk/policyfile/differ.rb +6 -2
- data/lib/chef-dk/policyfile/dsl.rb +4 -2
- data/lib/chef-dk/policyfile/git_lock_fetcher.rb +2 -2
- data/lib/chef-dk/policyfile/included_policies_cookbook_source.rb +1 -1
- data/lib/chef-dk/policyfile/lister.rb +2 -2
- data/lib/chef-dk/policyfile/local_lock_fetcher.rb +7 -5
- data/lib/chef-dk/policyfile/lock_applier.rb +1 -1
- data/lib/chef-dk/policyfile/null_cookbook_source.rb +1 -2
- data/lib/chef-dk/policyfile/policyfile_location_specification.rb +3 -3
- data/lib/chef-dk/policyfile/remote_lock_fetcher.rb +1 -1
- data/lib/chef-dk/policyfile/solution_dependencies.rb +13 -11
- data/lib/chef-dk/policyfile/storage_config.rb +1 -0
- data/lib/chef-dk/policyfile/undo_record.rb +10 -8
- data/lib/chef-dk/policyfile/uploader.rb +3 -1
- data/lib/chef-dk/policyfile_compiler.rb +17 -13
- data/lib/chef-dk/policyfile_lock.rb +17 -15
- data/lib/chef-dk/policyfile_services/clean_policies.rb +3 -3
- data/lib/chef-dk/policyfile_services/clean_policy_cookbooks.rb +2 -2
- data/lib/chef-dk/policyfile_services/export_repo.rb +4 -2
- data/lib/chef-dk/policyfile_services/install.rb +3 -1
- data/lib/chef-dk/policyfile_services/push.rb +6 -5
- data/lib/chef-dk/policyfile_services/push_archive.rb +6 -5
- data/lib/chef-dk/policyfile_services/rm_policy.rb +6 -2
- data/lib/chef-dk/policyfile_services/rm_policy_group.rb +2 -2
- data/lib/chef-dk/policyfile_services/show_policy.rb +2 -2
- data/lib/chef-dk/policyfile_services/undelete.rb +2 -2
- data/lib/chef-dk/version.rb +1 -1
- data/lib/kitchen/provisioner/policyfile_zero.rb +3 -6
- data/spec/unit/cli_spec.rb +6 -6
- data/spec/unit/command/base_spec.rb +1 -1
- data/spec/unit/command/env_spec.rb +1 -1
- data/spec/unit/command/exec_spec.rb +1 -1
- data/spec/unit/command/export_spec.rb +1 -1
- data/spec/unit/command/generator_commands/recipe_spec.rb +2 -1
- data/spec/unit/command/generator_commands/repo_spec.rb +6 -6
- data/spec/unit/command/verify_spec.rb +1 -1
- data/spec/unit/policyfile/attribute_merge_checker_spec.rb +10 -8
- data/spec/unit/policyfile/chef_server_lock_fetcher_spec.rb +4 -2
- data/spec/unit/policyfile/cookbook_locks_spec.rb +9 -9
- data/spec/unit/policyfile/git_lock_fetcher_spec.rb +5 -5
- data/spec/unit/policyfile/included_policies_cookbook_source_spec.rb +5 -3
- data/spec/unit/policyfile/lister_spec.rb +5 -5
- data/spec/unit/policyfile/local_lock_fetcher_spec.rb +1 -1
- data/spec/unit/policyfile/lock_applier_spec.rb +2 -2
- data/spec/unit/policyfile/reports/install_spec.rb +14 -14
- data/spec/unit/policyfile/reports/upload_spec.rb +3 -3
- data/spec/unit/policyfile/uploader_spec.rb +13 -12
- data/spec/unit/policyfile_demands_spec.rb +4 -4
- data/spec/unit/policyfile_includes_spec.rb +14 -7
- data/spec/unit/policyfile_install_with_includes_spec.rb +8 -7
- data/spec/unit/policyfile_lock_build_spec.rb +17 -18
- data/spec/unit/policyfile_services/clean_policy_cookbooks_spec.rb +5 -5
- data/spec/unit/policyfile_services/push_archive_spec.rb +6 -6
- data/spec/unit/policyfile_services/push_spec.rb +8 -8
- data/spec/unit/policyfile_services/rm_policy_group_spec.rb +5 -5
- data/spec/unit/policyfile_services/rm_policy_spec.rb +5 -5
- data/spec/unit/policyfile_services/update_attributes_spec.rb +2 -1
- data/spec/unit/service_exception_inspectors/http_spec.rb +7 -7
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: '08de12151cfd931cff00fff4f22981d9da812c80ce8e4ba15b1fc84fc52d4903'
|
|
4
|
+
data.tar.gz: 2caa7f8577d4a035d3b0fd0b56d5105171e89f111925bc35120bb7c1845e124a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 80935b4a3b1581d6aea7711ad03e05f701612ad94969c90e4189f846a0d4115baaba63f159f6708333277eb5e6fb4794fb29e97e98ba46145d344384964c38e2
|
|
7
|
+
data.tar.gz: 3b7d0e0e511514e3be6b251041cf6a1429a88894303ac4ce45073ee3dffd7c28cee69bc30f5e455ee7248d51c426a28931fc37dffe161723551c8bc569aa00b6
|
data/Gemfile
CHANGED
|
@@ -57,7 +57,7 @@ group(:omnibus_package) do
|
|
|
57
57
|
gem "chef", "= 15.1.36"
|
|
58
58
|
gem "chef-bin", "= 15.1.36"
|
|
59
59
|
gem "cheffish", ">= 14.0.1"
|
|
60
|
-
gem "chefspec", ">= 7.3.0"
|
|
60
|
+
gem "chefspec", ">= 7.3.0", "< 8"
|
|
61
61
|
gem "fauxhai", "~> 7.0"
|
|
62
62
|
gem "inspec-bin", "~> 4.3" # the actual inspec CLI binary
|
|
63
63
|
gem "inspec", "~> 4.3"
|
|
@@ -96,7 +96,9 @@ group(:omnibus_package) do
|
|
|
96
96
|
# Right now we must import chef-apply as a gem into the ChefDK because this is where all the gem
|
|
97
97
|
# dependency resolution occurs. Putting it elsewhere endangers older ChefDK issues of gem version
|
|
98
98
|
# conflicts post-build.
|
|
99
|
-
|
|
99
|
+
# Version 3.3 switches to ChefCLI instead of ChefDK - we want to lock to
|
|
100
|
+
# the latest version before that so that we don't pull in ChefCLI.
|
|
101
|
+
gem "chef-apply", "= 0.3.0"
|
|
100
102
|
|
|
101
103
|
# For Delivery build node
|
|
102
104
|
gem "chef-sugar"
|
data/Gemfile.lock
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
PATH
|
|
2
2
|
remote: .
|
|
3
3
|
specs:
|
|
4
|
-
chef-dk (4.
|
|
4
|
+
chef-dk (4.2.0)
|
|
5
5
|
addressable (>= 2.3.5, < 2.6)
|
|
6
6
|
chef (~> 15.0)
|
|
7
7
|
cookbook-omnifetch (~> 0.5)
|
|
@@ -31,23 +31,50 @@ GEM
|
|
|
31
31
|
artifactory (3.0.0)
|
|
32
32
|
ast (2.4.0)
|
|
33
33
|
aws-eventstream (1.0.3)
|
|
34
|
-
aws-partitions (1.
|
|
34
|
+
aws-partitions (1.188.0)
|
|
35
|
+
aws-sdk-apigateway (1.33.0)
|
|
36
|
+
aws-sdk-core (~> 3, >= 3.58.0)
|
|
37
|
+
aws-sigv4 (~> 1.1)
|
|
38
|
+
aws-sdk-apigatewayv2 (1.11.0)
|
|
39
|
+
aws-sdk-core (~> 3, >= 3.58.0)
|
|
40
|
+
aws-sigv4 (~> 1.1)
|
|
41
|
+
aws-sdk-athena (1.17.0)
|
|
42
|
+
aws-sdk-core (~> 3, >= 3.58.0)
|
|
43
|
+
aws-sigv4 (~> 1.1)
|
|
35
44
|
aws-sdk-autoscaling (1.22.0)
|
|
36
45
|
aws-sdk-core (~> 3, >= 3.52.1)
|
|
37
46
|
aws-sigv4 (~> 1.1)
|
|
47
|
+
aws-sdk-budgets (1.24.0)
|
|
48
|
+
aws-sdk-core (~> 3, >= 3.58.0)
|
|
49
|
+
aws-sigv4 (~> 1.1)
|
|
38
50
|
aws-sdk-cloudformation (1.24.0)
|
|
39
51
|
aws-sdk-core (~> 3, >= 3.58.0)
|
|
40
52
|
aws-sigv4 (~> 1.1)
|
|
53
|
+
aws-sdk-cloudhsm (1.17.0)
|
|
54
|
+
aws-sdk-core (~> 3, >= 3.58.0)
|
|
55
|
+
aws-sigv4 (~> 1.1)
|
|
56
|
+
aws-sdk-cloudhsmv2 (1.17.0)
|
|
57
|
+
aws-sdk-core (~> 3, >= 3.58.0)
|
|
58
|
+
aws-sigv4 (~> 1.1)
|
|
41
59
|
aws-sdk-cloudtrail (1.16.0)
|
|
42
60
|
aws-sdk-core (~> 3, >= 3.58.0)
|
|
43
61
|
aws-sigv4 (~> 1.1)
|
|
44
|
-
aws-sdk-cloudwatch (1.
|
|
62
|
+
aws-sdk-cloudwatch (1.26.0)
|
|
45
63
|
aws-sdk-core (~> 3, >= 3.58.0)
|
|
46
64
|
aws-sigv4 (~> 1.1)
|
|
47
65
|
aws-sdk-cloudwatchlogs (1.23.0)
|
|
48
66
|
aws-sdk-core (~> 3, >= 3.58.0)
|
|
49
67
|
aws-sigv4 (~> 1.1)
|
|
50
|
-
aws-sdk-
|
|
68
|
+
aws-sdk-codecommit (1.25.0)
|
|
69
|
+
aws-sdk-core (~> 3, >= 3.58.0)
|
|
70
|
+
aws-sigv4 (~> 1.1)
|
|
71
|
+
aws-sdk-codedeploy (1.24.0)
|
|
72
|
+
aws-sdk-core (~> 3, >= 3.58.0)
|
|
73
|
+
aws-sigv4 (~> 1.1)
|
|
74
|
+
aws-sdk-codepipeline (1.22.0)
|
|
75
|
+
aws-sdk-core (~> 3, >= 3.58.0)
|
|
76
|
+
aws-sigv4 (~> 1.1)
|
|
77
|
+
aws-sdk-configservice (1.33.0)
|
|
51
78
|
aws-sdk-core (~> 3, >= 3.58.0)
|
|
52
79
|
aws-sigv4 (~> 1.1)
|
|
53
80
|
aws-sdk-core (3.59.0)
|
|
@@ -73,34 +100,79 @@ GEM
|
|
|
73
100
|
aws-sdk-eks (1.23.0)
|
|
74
101
|
aws-sdk-core (~> 3, >= 3.58.0)
|
|
75
102
|
aws-sigv4 (~> 1.1)
|
|
103
|
+
aws-sdk-elasticache (1.21.0)
|
|
104
|
+
aws-sdk-core (~> 3, >= 3.58.0)
|
|
105
|
+
aws-sigv4 (~> 1.1)
|
|
106
|
+
aws-sdk-elasticbeanstalk (1.24.0)
|
|
107
|
+
aws-sdk-core (~> 3, >= 3.58.0)
|
|
108
|
+
aws-sigv4 (~> 1.1)
|
|
76
109
|
aws-sdk-elasticloadbalancing (1.17.0)
|
|
77
110
|
aws-sdk-core (~> 3, >= 3.58.0)
|
|
78
111
|
aws-sigv4 (~> 1.1)
|
|
79
112
|
aws-sdk-elasticloadbalancingv2 (1.32.0)
|
|
80
113
|
aws-sdk-core (~> 3, >= 3.58.0)
|
|
81
114
|
aws-sigv4 (~> 1.1)
|
|
115
|
+
aws-sdk-elasticsearchservice (1.24.0)
|
|
116
|
+
aws-sdk-core (~> 3, >= 3.58.0)
|
|
117
|
+
aws-sigv4 (~> 1.1)
|
|
118
|
+
aws-sdk-firehose (1.19.0)
|
|
119
|
+
aws-sdk-core (~> 3, >= 3.58.0)
|
|
120
|
+
aws-sigv4 (~> 1.1)
|
|
82
121
|
aws-sdk-iam (1.27.0)
|
|
83
122
|
aws-sdk-core (~> 3, >= 3.58.0)
|
|
84
123
|
aws-sigv4 (~> 1.1)
|
|
124
|
+
aws-sdk-kafka (1.11.0)
|
|
125
|
+
aws-sdk-core (~> 3, >= 3.58.0)
|
|
126
|
+
aws-sigv4 (~> 1.1)
|
|
127
|
+
aws-sdk-kinesis (1.18.0)
|
|
128
|
+
aws-sdk-core (~> 3, >= 3.58.0)
|
|
129
|
+
aws-sigv4 (~> 1.1)
|
|
85
130
|
aws-sdk-kms (1.23.0)
|
|
86
131
|
aws-sdk-core (~> 3, >= 3.58.0)
|
|
87
132
|
aws-sigv4 (~> 1.1)
|
|
133
|
+
aws-sdk-lambda (1.28.0)
|
|
134
|
+
aws-sdk-core (~> 3, >= 3.58.0)
|
|
135
|
+
aws-sigv4 (~> 1.1)
|
|
88
136
|
aws-sdk-organizations (1.17.0)
|
|
89
137
|
aws-sdk-core (~> 3, >= 3.39.0)
|
|
90
138
|
aws-sigv4 (~> 1.0)
|
|
91
139
|
aws-sdk-rds (1.62.0)
|
|
92
140
|
aws-sdk-core (~> 3, >= 3.58.0)
|
|
93
141
|
aws-sigv4 (~> 1.1)
|
|
142
|
+
aws-sdk-redshift (1.29.0)
|
|
143
|
+
aws-sdk-core (~> 3, >= 3.58.0)
|
|
144
|
+
aws-sigv4 (~> 1.1)
|
|
145
|
+
aws-sdk-route53 (1.27.0)
|
|
146
|
+
aws-sdk-core (~> 3, >= 3.58.0)
|
|
147
|
+
aws-sigv4 (~> 1.1)
|
|
148
|
+
aws-sdk-route53domains (1.16.0)
|
|
149
|
+
aws-sdk-core (~> 3, >= 3.58.0)
|
|
150
|
+
aws-sigv4 (~> 1.1)
|
|
151
|
+
aws-sdk-route53resolver (1.9.0)
|
|
152
|
+
aws-sdk-core (~> 3, >= 3.58.0)
|
|
153
|
+
aws-sigv4 (~> 1.1)
|
|
94
154
|
aws-sdk-s3 (1.45.0)
|
|
95
155
|
aws-sdk-core (~> 3, >= 3.58.0)
|
|
96
156
|
aws-sdk-kms (~> 1)
|
|
97
157
|
aws-sigv4 (~> 1.1)
|
|
158
|
+
aws-sdk-securityhub (1.11.0)
|
|
159
|
+
aws-sdk-core (~> 3, >= 3.58.0)
|
|
160
|
+
aws-sigv4 (~> 1.1)
|
|
161
|
+
aws-sdk-ses (1.24.0)
|
|
162
|
+
aws-sdk-core (~> 3, >= 3.58.0)
|
|
163
|
+
aws-sigv4 (~> 1.1)
|
|
164
|
+
aws-sdk-sms (1.15.0)
|
|
165
|
+
aws-sdk-core (~> 3, >= 3.58.0)
|
|
166
|
+
aws-sigv4 (~> 1.1)
|
|
98
167
|
aws-sdk-sns (1.18.0)
|
|
99
168
|
aws-sdk-core (~> 3, >= 3.58.0)
|
|
100
169
|
aws-sigv4 (~> 1.1)
|
|
101
170
|
aws-sdk-sqs (1.18.0)
|
|
102
171
|
aws-sdk-core (~> 3, >= 3.58.0)
|
|
103
172
|
aws-sigv4 (~> 1.1)
|
|
173
|
+
aws-sdk-ssm (1.52.0)
|
|
174
|
+
aws-sdk-core (~> 3, >= 3.58.0)
|
|
175
|
+
aws-sigv4 (~> 1.1)
|
|
104
176
|
aws-sigv4 (1.1.0)
|
|
105
177
|
aws-eventstream (~> 1.0, >= 1.0.2)
|
|
106
178
|
axiom-types (0.1.1)
|
|
@@ -111,9 +183,9 @@ GEM
|
|
|
111
183
|
ms_rest_azure (~> 0.11.0)
|
|
112
184
|
azure_mgmt_key_vault (0.17.4)
|
|
113
185
|
ms_rest_azure (~> 0.11.0)
|
|
114
|
-
azure_mgmt_network (0.18.
|
|
186
|
+
azure_mgmt_network (0.18.9)
|
|
115
187
|
ms_rest_azure (~> 0.11.1)
|
|
116
|
-
azure_mgmt_resources (0.17.
|
|
188
|
+
azure_mgmt_resources (0.17.6)
|
|
117
189
|
ms_rest_azure (~> 0.11.1)
|
|
118
190
|
backports (3.15.0)
|
|
119
191
|
bcrypt_pbkdf (1.0.1)
|
|
@@ -253,7 +325,7 @@ GEM
|
|
|
253
325
|
chef (>= 13)
|
|
254
326
|
fauxhai (>= 6.11)
|
|
255
327
|
rspec (~> 3.0)
|
|
256
|
-
chefstyle (0.13.
|
|
328
|
+
chefstyle (0.13.2)
|
|
257
329
|
rubocop (= 0.72.0)
|
|
258
330
|
citrus (3.0.2)
|
|
259
331
|
cleanroom (1.0.0)
|
|
@@ -261,7 +333,7 @@ GEM
|
|
|
261
333
|
coercible (1.0.0)
|
|
262
334
|
descendants_tracker (~> 0.0.1)
|
|
263
335
|
concurrent-ruby (1.1.5)
|
|
264
|
-
cookbook-omnifetch (0.
|
|
336
|
+
cookbook-omnifetch (0.9.0)
|
|
265
337
|
mixlib-archive (>= 0.4, < 2.0)
|
|
266
338
|
cookstyle (5.0.0)
|
|
267
339
|
rubocop (= 0.72.0)
|
|
@@ -318,7 +390,7 @@ GEM
|
|
|
318
390
|
http-cookie (~> 1.0.0)
|
|
319
391
|
faraday_middleware (0.12.2)
|
|
320
392
|
faraday (>= 0.7.4, < 1.0)
|
|
321
|
-
fauxhai (7.
|
|
393
|
+
fauxhai (7.4.0)
|
|
322
394
|
net-ssh
|
|
323
395
|
ffi (1.11.1)
|
|
324
396
|
ffi (1.11.1-x64-mingw32)
|
|
@@ -394,7 +466,7 @@ GEM
|
|
|
394
466
|
ice_nine (0.11.2)
|
|
395
467
|
inifile (3.0.0)
|
|
396
468
|
iniparse (1.4.4)
|
|
397
|
-
inspec (4.
|
|
469
|
+
inspec (4.7.3)
|
|
398
470
|
addressable (~> 2.4)
|
|
399
471
|
faraday (>= 0.9.0)
|
|
400
472
|
faraday_middleware (~> 0.12.2)
|
|
@@ -421,8 +493,8 @@ GEM
|
|
|
421
493
|
train-habitat (~> 0.1)
|
|
422
494
|
tty-prompt (~> 0.17)
|
|
423
495
|
tty-table (~> 0.10)
|
|
424
|
-
inspec-bin (4.
|
|
425
|
-
inspec (= 4.
|
|
496
|
+
inspec-bin (4.7.3)
|
|
497
|
+
inspec (= 4.7.3)
|
|
426
498
|
ipaddress (0.8.3)
|
|
427
499
|
iso8601 (0.12.1)
|
|
428
500
|
jaro_winkler (1.5.3)
|
|
@@ -467,7 +539,7 @@ GEM
|
|
|
467
539
|
excon (>= 0.50)
|
|
468
540
|
knife-windows (>= 1.0)
|
|
469
541
|
mixlib-shellout
|
|
470
|
-
knife-ec2 (1.0.
|
|
542
|
+
knife-ec2 (1.0.8)
|
|
471
543
|
aws-sdk-ec2 (~> 1.95)
|
|
472
544
|
aws-sdk-s3 (~> 1.43)
|
|
473
545
|
chef (>= 15.1)
|
|
@@ -484,7 +556,7 @@ GEM
|
|
|
484
556
|
diffy (>= 3.0.1)
|
|
485
557
|
git (>= 1.2.5)
|
|
486
558
|
knife-tidy (2.0.1)
|
|
487
|
-
knife-vsphere (3.0.
|
|
559
|
+
knife-vsphere (3.0.1)
|
|
488
560
|
chef-vault (>= 2.6.0)
|
|
489
561
|
filesize (~> 0.1.1)
|
|
490
562
|
knife-windows (< 4)
|
|
@@ -738,12 +810,21 @@ GEM
|
|
|
738
810
|
net-ssh (>= 2.9, < 6.0)
|
|
739
811
|
winrm (~> 2.0)
|
|
740
812
|
winrm-fs (~> 1.0)
|
|
741
|
-
train-aws (0.1.
|
|
813
|
+
train-aws (0.1.7)
|
|
814
|
+
aws-sdk-apigateway (~> 1)
|
|
815
|
+
aws-sdk-apigatewayv2 (~> 1)
|
|
816
|
+
aws-sdk-athena (~> 1)
|
|
742
817
|
aws-sdk-autoscaling (~> 1.22.0)
|
|
818
|
+
aws-sdk-budgets (~> 1)
|
|
743
819
|
aws-sdk-cloudformation (~> 1)
|
|
820
|
+
aws-sdk-cloudhsm (~> 1)
|
|
821
|
+
aws-sdk-cloudhsmv2 (~> 1)
|
|
744
822
|
aws-sdk-cloudtrail (~> 1.8)
|
|
745
823
|
aws-sdk-cloudwatch (~> 1.13)
|
|
746
824
|
aws-sdk-cloudwatchlogs (~> 1.13)
|
|
825
|
+
aws-sdk-codecommit (~> 1)
|
|
826
|
+
aws-sdk-codedeploy (~> 1)
|
|
827
|
+
aws-sdk-codepipeline (~> 1)
|
|
747
828
|
aws-sdk-configservice (~> 1.21)
|
|
748
829
|
aws-sdk-core (~> 3.0)
|
|
749
830
|
aws-sdk-costandusagereportservice (~> 1.6)
|
|
@@ -752,15 +833,30 @@ GEM
|
|
|
752
833
|
aws-sdk-ecr (~> 1.18)
|
|
753
834
|
aws-sdk-ecs (~> 1.30)
|
|
754
835
|
aws-sdk-eks (~> 1.9)
|
|
836
|
+
aws-sdk-elasticache (~> 1)
|
|
837
|
+
aws-sdk-elasticbeanstalk (~> 1)
|
|
755
838
|
aws-sdk-elasticloadbalancing (~> 1.8)
|
|
756
839
|
aws-sdk-elasticloadbalancingv2 (~> 1)
|
|
840
|
+
aws-sdk-elasticsearchservice (~> 1)
|
|
841
|
+
aws-sdk-firehose (~> 1)
|
|
757
842
|
aws-sdk-iam (~> 1.13)
|
|
843
|
+
aws-sdk-kafka (~> 1)
|
|
844
|
+
aws-sdk-kinesis (~> 1)
|
|
758
845
|
aws-sdk-kms (~> 1.13)
|
|
846
|
+
aws-sdk-lambda (~> 1)
|
|
759
847
|
aws-sdk-organizations (~> 1.17.0)
|
|
760
848
|
aws-sdk-rds (~> 1.43)
|
|
849
|
+
aws-sdk-redshift (~> 1)
|
|
850
|
+
aws-sdk-route53 (~> 1)
|
|
851
|
+
aws-sdk-route53domains (~> 1)
|
|
852
|
+
aws-sdk-route53resolver (~> 1)
|
|
761
853
|
aws-sdk-s3 (~> 1.30)
|
|
854
|
+
aws-sdk-securityhub (~> 1)
|
|
855
|
+
aws-sdk-ses (~> 1)
|
|
856
|
+
aws-sdk-sms (~> 1)
|
|
762
857
|
aws-sdk-sns (~> 1.9)
|
|
763
858
|
aws-sdk-sqs (~> 1.10)
|
|
859
|
+
aws-sdk-ssm (~> 1)
|
|
764
860
|
train (~> 2.0)
|
|
765
861
|
train-core (2.1.13)
|
|
766
862
|
json (>= 1.8, < 3.0)
|
|
@@ -877,13 +973,13 @@ DEPENDENCIES
|
|
|
877
973
|
berkshelf (>= 7.0.5)
|
|
878
974
|
bundler
|
|
879
975
|
chef (= 15.1.36)
|
|
880
|
-
chef-apply
|
|
976
|
+
chef-apply (= 0.3.0)
|
|
881
977
|
chef-bin (= 15.1.36)
|
|
882
978
|
chef-dk!
|
|
883
979
|
chef-sugar
|
|
884
980
|
chef-vault (>= 3.4.1)
|
|
885
981
|
cheffish (>= 14.0.1)
|
|
886
|
-
chefspec (>= 7.3.0)
|
|
982
|
+
chefspec (>= 7.3.0, < 8)
|
|
887
983
|
chefstyle
|
|
888
984
|
cookstyle (~> 5.0)
|
|
889
985
|
cucumber
|
|
@@ -59,4 +59,7 @@ ChefDK.commands do |c|
|
|
|
59
59
|
desc: "Prints cookbook checksum information used for cookbook identifier"
|
|
60
60
|
|
|
61
61
|
c.builtin "verify", :Verify, desc: "Test the embedded #{ChefDK::Dist::PRODUCT} applications", hidden: true
|
|
62
|
+
|
|
63
|
+
# deprecated command that throws a failure warning if used. This was removed 4.2019
|
|
64
|
+
c.builtin "provision", :Provision, desc: "Provision VMs and clusters via cookbook", hidden: true
|
|
62
65
|
end
|
data/lib/chef-dk/cli.rb
CHANGED
|
@@ -120,6 +120,7 @@ module ChefDK
|
|
|
120
120
|
justify_length = subcommands.map(&:length).max + 2
|
|
121
121
|
subcommand_specs.each do |name, spec|
|
|
122
122
|
next if spec.hidden
|
|
123
|
+
|
|
123
124
|
msg(" #{"#{name}".ljust(justify_length)}#{spec.description}")
|
|
124
125
|
end
|
|
125
126
|
end
|
|
@@ -155,7 +156,7 @@ module ChefDK
|
|
|
155
156
|
private
|
|
156
157
|
|
|
157
158
|
def normalized_exit_code(maybe_integer)
|
|
158
|
-
if maybe_integer.
|
|
159
|
+
if maybe_integer.is_a?(Integer) && (0..255).cover?(maybe_integer)
|
|
159
160
|
maybe_integer
|
|
160
161
|
else
|
|
161
162
|
0
|
|
@@ -186,6 +187,7 @@ module ChefDK
|
|
|
186
187
|
def sanity_check!
|
|
187
188
|
# When installed outside of omnibus, trust the user to configure their PATH
|
|
188
189
|
return true unless omnibus_install?
|
|
190
|
+
|
|
189
191
|
paths = env[path_key].split(File::PATH_SEPARATOR)
|
|
190
192
|
paths.map! { |p| drive_upcase(Chef::Util::PathHelper.cleanpath(p)) }
|
|
191
193
|
embed_index = paths.index(drive_upcase(Chef::Util::PathHelper.cleanpath(omnibus_embedded_bin_dir)))
|
data/lib/chef-dk/command/diff.rb
CHANGED
|
@@ -125,6 +125,7 @@ module ChefDK
|
|
|
125
125
|
|
|
126
126
|
def run(params = [])
|
|
127
127
|
return 1 unless apply_params!(params)
|
|
128
|
+
|
|
128
129
|
print_diff
|
|
129
130
|
0
|
|
130
131
|
rescue PolicyfileServiceError => e
|
|
@@ -153,7 +154,7 @@ module ChefDK
|
|
|
153
154
|
end
|
|
154
155
|
end
|
|
155
156
|
|
|
156
|
-
def differ(ui = self.ui
|
|
157
|
+
def differ(ui = self.ui)
|
|
157
158
|
Policyfile::Differ.new(old_name: old_base.name,
|
|
158
159
|
old_lock: old_lock,
|
|
159
160
|
new_name: new_base.name,
|
|
@@ -163,8 +164,8 @@ module ChefDK
|
|
|
163
164
|
|
|
164
165
|
def http_client
|
|
165
166
|
@http_client ||= Chef::ServerAPI.new(chef_config.chef_server_url,
|
|
166
|
-
|
|
167
|
-
|
|
167
|
+
signing_key_filename: chef_config.client_key,
|
|
168
|
+
client_name: chef_config.node_name)
|
|
168
169
|
end
|
|
169
170
|
|
|
170
171
|
def old_lock
|
|
@@ -290,6 +291,7 @@ module ChefDK
|
|
|
290
291
|
def policy_group_comparison?(args)
|
|
291
292
|
return false if args.empty?
|
|
292
293
|
return true if args.size > 1
|
|
294
|
+
|
|
293
295
|
!(args.first =~ /\.rb\Z/)
|
|
294
296
|
end
|
|
295
297
|
|
data/lib/chef-dk/command/env.rb
CHANGED
|
@@ -37,7 +37,7 @@ module ChefDK
|
|
|
37
37
|
|
|
38
38
|
def run(params)
|
|
39
39
|
info = {}
|
|
40
|
-
info["#{ChefDK::Dist::PRODUCT}"] =
|
|
40
|
+
info["#{ChefDK::Dist::PRODUCT}"] = {}.tap do |chefdk_env|
|
|
41
41
|
chefdk_env["ChefDK"] = chefdk_info
|
|
42
42
|
chefdk_env["Ruby"] = ruby_info
|
|
43
43
|
chefdk_env["Path"] = paths
|
|
@@ -46,7 +46,7 @@ module ChefDK
|
|
|
46
46
|
end
|
|
47
47
|
|
|
48
48
|
def chefdk_info
|
|
49
|
-
|
|
49
|
+
{}.tap do |chefdk|
|
|
50
50
|
chefdk["ChefDK Version"] = ChefDK::VERSION
|
|
51
51
|
chefdk["ChefDK Home"] = chefdk_home
|
|
52
52
|
chefdk["ChefDK Install Directory"] = omnibus_root
|
|
@@ -55,10 +55,10 @@ module ChefDK
|
|
|
55
55
|
end
|
|
56
56
|
|
|
57
57
|
def ruby_info
|
|
58
|
-
|
|
58
|
+
{}.tap do |ruby|
|
|
59
59
|
ruby["Ruby Executable"] = Gem.ruby
|
|
60
60
|
ruby["Ruby Version"] = RUBY_VERSION
|
|
61
|
-
ruby["RubyGems"] =
|
|
61
|
+
ruby["RubyGems"] = {}.tap do |rubygems|
|
|
62
62
|
rubygems["RubyGems Version"] = Gem::VERSION
|
|
63
63
|
rubygems["RubyGems Platforms"] = Gem.platforms.map(&:to_s)
|
|
64
64
|
rubygems["Gem Environment"] = gem_environment
|
|
@@ -67,7 +67,7 @@ module ChefDK
|
|
|
67
67
|
end
|
|
68
68
|
|
|
69
69
|
def gem_environment
|
|
70
|
-
|
|
70
|
+
{}.tap do |h|
|
|
71
71
|
h["GEM ROOT"] = omnibus_env["GEM_ROOT"]
|
|
72
72
|
h["GEM HOME"] = omnibus_env["GEM_HOME"]
|
|
73
73
|
h["GEM PATHS"] = omnibus_env["GEM_PATH"].split(File::PATH_SEPARATOR)
|
|
@@ -79,7 +79,7 @@ module ChefDK
|
|
|
79
79
|
end
|
|
80
80
|
|
|
81
81
|
def policyfile_config
|
|
82
|
-
|
|
82
|
+
{}.tap do |h|
|
|
83
83
|
h["Cache Path"] = CookbookOmnifetch.cache_path
|
|
84
84
|
h["Storage Path"] = CookbookOmnifetch.storage_path.to_s
|
|
85
85
|
end
|