Skip to content

Commit 9d33b3b

Browse files
authored
Updating the knife to 18.8.68 (#4132)
* update knife to 18.8.68 version to fix user-list -a Signed-off-by: talktovikas <vikas.yadav@progress.com> * fixing the -a option in user-list Signed-off-by: talktovikas <vikas.yadav@progress.com> --------- Signed-off-by: talktovikas <vikas.yadav@progress.com>
1 parent b072f05 commit 9d33b3b

3 files changed

Lines changed: 115 additions & 70 deletions

File tree

src/chef-server-ctl/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ gem "rest-client", git: "https://github.com/chef/rest-client", branch: "jfm/ucrt
77
gem "chef", "~> 18.8.46"
88
gem "toml" # for habitat-land
99

10-
gem "knife","~> 18.8.13"
10+
gem "knife","~> 18.8.68"
1111
gem "knife-ec-backup", "~> 3.0.5"

src/chef-server-ctl/Gemfile.lock

Lines changed: 100 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
GIT
22
remote: https://github.com/chef/rest-client
3-
revision: 5b3bb34ea536e5207388b84c5dd6360ea3fc2799
3+
revision: 4725c8b5ae09b3f6b968831beae27503f1261ea9
44
branch: jfm/ucrt_update1
55
specs:
66
rest-client (2.1.0)
77
base64
8-
fiddle
98
http-accept (~> 2.1.0)
109
http-cookie (>= 1.0.2, < 2.0)
1110
mime-types (>= 1.16, < 4.0)
@@ -36,43 +35,52 @@ PATH
3635
GEM
3736
remote: https://rubygems.org/
3837
specs:
39-
activesupport (7.0.8.7)
38+
activesupport (7.1.5.2)
39+
base64
40+
benchmark (>= 0.3)
41+
bigdecimal
4042
concurrent-ruby (~> 1.0, >= 1.0.2)
43+
connection_pool (>= 2.2.5)
44+
drb
4145
i18n (>= 1.6, < 2)
46+
logger (>= 1.4.2)
4247
minitest (>= 5.1)
48+
mutex_m
49+
securerandom (>= 0.3)
4350
tzinfo (~> 2.0)
44-
addressable (2.8.7)
45-
public_suffix (>= 2.0.2, < 7.0)
51+
addressable (2.8.8)
52+
public_suffix (>= 2.0.2, < 8.0)
4653
appbundler (0.13.4)
4754
mixlib-cli (>= 1.4, < 3.0)
4855
mixlib-shellout (>= 2.0, < 4.0)
4956
ast (2.4.3)
5057
aws-eventstream (1.4.0)
51-
aws-partitions (1.1174.0)
52-
aws-sdk-core (3.234.0)
58+
aws-partitions (1.1192.0)
59+
aws-sdk-core (3.239.2)
5360
aws-eventstream (~> 1, >= 1.3.0)
5461
aws-partitions (~> 1, >= 1.992.0)
5562
aws-sigv4 (~> 1.9)
5663
base64
5764
bigdecimal
5865
jmespath (~> 1, >= 1.6.1)
5966
logger
60-
aws-sdk-kms (1.115.0)
61-
aws-sdk-core (~> 3, >= 3.234.0)
67+
aws-sdk-kms (1.118.0)
68+
aws-sdk-core (~> 3, >= 3.239.1)
6269
aws-sigv4 (~> 1.5)
63-
aws-sdk-s3 (1.201.0)
70+
aws-sdk-s3 (1.206.0)
6471
aws-sdk-core (~> 3, >= 3.234.0)
6572
aws-sdk-kms (~> 1)
6673
aws-sigv4 (~> 1.5)
67-
aws-sdk-secretsmanager (1.121.0)
68-
aws-sdk-core (~> 3, >= 3.234.0)
74+
aws-sdk-secretsmanager (1.124.0)
75+
aws-sdk-core (~> 3, >= 3.239.1)
6976
aws-sigv4 (~> 1.5)
7077
aws-sigv4 (1.12.1)
7178
aws-eventstream (~> 1, >= 1.0.2)
7279
base64 (0.3.0)
7380
bcrypt (3.1.20)
74-
bcrypt_pbkdf (1.1.1)
75-
bcrypt_pbkdf (1.1.1-arm64-darwin)
81+
bcrypt_pbkdf (1.1.2)
82+
bcrypt_pbkdf (1.1.2-arm64-darwin)
83+
benchmark (0.5.0)
7684
berkshelf (8.0.22)
7785
chef (>= 18.0.0)
7886
chef-cleanroom (~> 1.0)
@@ -87,15 +95,15 @@ GEM
8795
retryable (>= 2.0, < 4.0)
8896
solve (~> 4.0)
8997
thor (>= 0.20, < 1.3.0)
90-
bigdecimal (3.2.2)
98+
bigdecimal (3.3.1)
9199
builder (3.3.0)
92-
chef (18.8.46)
100+
chef (18.8.54)
93101
activesupport (>= 4.2.7.1, <= 7.1.5.2)
94102
addressable
95103
aws-sdk-s3 (~> 1.91)
96104
aws-sdk-secretsmanager (~> 1.46)
97-
chef-config (= 18.8.46)
98-
chef-utils (= 18.8.46)
105+
chef-config (= 18.8.54)
106+
chef-utils (= 18.8.54)
99107
chef-vault
100108
chef-zero (>= 15.0.21)
101109
corefoundation (~> 0.3.4)
@@ -125,32 +133,36 @@ GEM
125133
uri (~> 1.0.3)
126134
uuidtools (>= 2.1.5, < 3.0)
127135
vault (~> 0.18.2)
128-
chef-bin (18.8.46)
129-
chef (= 18.8.46)
136+
chef-bin (18.8.54)
137+
chef (= 18.8.54)
130138
chef-cleanroom (1.0.5)
131-
chef-config (18.8.46)
139+
chef-config (18.8.54)
132140
addressable
133-
chef-utils (= 18.8.46)
141+
chef-utils (= 18.8.54)
134142
fuzzyurl
135143
mixlib-config (>= 2.2.12, < 4.0)
136144
mixlib-shellout (>= 2.0, < 4.0)
137145
tomlrb (~> 1.2)
138146
chef-gyoku (1.4.5)
139147
builder (>= 2.1.2)
140148
rexml (~> 3.4)
141-
chef-licensing (1.0.4)
142-
activesupport (~> 7.0, < 7.1)
149+
chef-licensing (1.3.0)
143150
chef-config (>= 15)
144-
faraday (>= 1, < 3)
151+
faraday (>= 1, < 2)
145152
faraday-http-cache
153+
faraday_middleware (~> 1.0)
154+
mixlib-log (~> 3.0)
155+
ostruct (~> 0.1.0)
156+
pstore (~> 0.1.1)
146157
tty-prompt (~> 0.23)
147158
tty-spinner (~> 0.9.3)
148159
chef-telemetry (1.1.1)
149160
chef-config
150161
concurrent-ruby (~> 1.0)
151-
chef-utils (18.8.46)
162+
chef-utils (18.8.54)
152163
concurrent-ruby
153-
chef-vault (4.1.23)
164+
chef-vault (4.2.5)
165+
syslog (~> 0.3)
154166
chef-winrm (2.3.12)
155167
builder (>= 2.1.2)
156168
chef-gyoku (~> 1.4.0, <= 1.4.5)
@@ -171,8 +183,7 @@ GEM
171183
erubi (>= 1.7)
172184
logging (>= 1.6.1, < 3.0)
173185
rubyzip (~> 2.0)
174-
chef-zero (15.0.21)
175-
activesupport (>= 7, < 8.1)
186+
chef-zero (15.0.26)
176187
ffi-yajl (>= 2.2, < 4.0)
177188
hashie (>= 2.0, < 6.0)
178189
mixlib-log (>= 2.0, < 4.0)
@@ -198,32 +209,51 @@ GEM
198209
rubocop (= 1.25.1)
199210
coderay (1.1.3)
200211
concurrent-ruby (1.3.5)
201-
connection_pool (2.5.3)
212+
connection_pool (2.5.5)
202213
cookstyle (7.32.8)
203214
rubocop (= 1.25.1)
204215
corefoundation (0.3.13)
205216
ffi (>= 1.15.0)
206-
date (3.4.1)
217+
date (3.5.1)
207218
diff-lcs (1.5.1)
208219
domain_name (0.6.20240107)
220+
drb (2.2.3)
209221
erubi (1.13.1)
210222
erubis (2.7.0)
211-
faraday (2.13.4)
212-
faraday-net_http (>= 2.0, < 3.5)
213-
json
214-
logger
223+
faraday (1.10.4)
224+
faraday-em_http (~> 1.0)
225+
faraday-em_synchrony (~> 1.0)
226+
faraday-excon (~> 1.1)
227+
faraday-httpclient (~> 1.0)
228+
faraday-multipart (~> 1.0)
229+
faraday-net_http (~> 1.0)
230+
faraday-net_http_persistent (~> 1.0)
231+
faraday-patron (~> 1.0)
232+
faraday-rack (~> 1.0)
233+
faraday-retry (~> 1.0)
234+
ruby2_keywords (>= 0.0.4)
235+
faraday-em_http (1.0.0)
236+
faraday-em_synchrony (1.0.1)
237+
faraday-excon (1.1.0)
215238
faraday-follow_redirects (0.4.0)
216239
faraday (>= 1, < 3)
217240
faraday-http-cache (2.5.1)
218241
faraday (>= 0.8)
219-
faraday-net_http (3.4.1)
220-
net-http (>= 0.5.0)
242+
faraday-httpclient (1.0.1)
243+
faraday-multipart (1.1.1)
244+
multipart-post (~> 2.0)
245+
faraday-net_http (1.0.2)
246+
faraday-net_http_persistent (1.2.0)
247+
faraday-patron (1.0.0)
248+
faraday-rack (1.0.0)
249+
faraday-retry (1.0.3)
250+
faraday_middleware (1.2.1)
251+
faraday (~> 1.0)
221252
ffi (1.16.3)
222253
ffi-libarchive (1.1.14)
223254
ffi (~> 1.0)
224255
ffi-yajl (2.6.0)
225256
libyajl2 (>= 1.2)
226-
fiddle (1.1.8)
227257
fuzzyurl (0.9.0)
228258
gssapi (1.3.1)
229259
ffi (>= 1.0.1)
@@ -263,8 +293,8 @@ GEM
263293
tty-table (~> 0.10)
264294
ipaddress (0.8.3)
265295
jmespath (1.6.2)
266-
json (2.13.2)
267-
knife (18.8.13)
296+
json (2.17.1)
297+
knife (18.8.68)
268298
bcrypt_pbkdf (~> 1.1)
269299
chef (~> 18.0)
270300
chef-bin (~> 18.0)
@@ -296,7 +326,8 @@ GEM
296326
pg
297327
sequel (~> 5.9)
298328
veil
299-
knife-tidy (2.3.0)
329+
knife-tidy (2.3.2)
330+
syslog (~> 0.3)
300331
libyajl2 (2.1.0)
301332
license-acceptance (2.1.13)
302333
pastel (~> 0.7)
@@ -313,9 +344,9 @@ GEM
313344
logger
314345
mime-types-data (~> 3.2025, >= 3.2025.0507)
315346
mime-types-data (3.2025.0924)
316-
minitar (1.0.2)
317-
minitest (5.25.5)
318-
mixlib-archive (1.1.7)
347+
minitar (1.1.0)
348+
minitest (5.26.2)
349+
mixlib-archive (1.3.3)
319350
mixlib-log
320351
mixlib-authentication (3.0.10)
321352
mixlib-cli (2.1.8)
@@ -331,14 +362,12 @@ GEM
331362
chef-utils
332363
mixlib-versioning (1.2.12)
333364
molinillo (0.8.0)
334-
multi_json (1.17.0)
365+
multi_json (1.18.0)
335366
multipart-post (2.4.1)
336367
mutex_m (0.3.0)
337-
net-ftp (0.3.8)
368+
net-ftp (0.3.9)
338369
net-protocol
339370
time
340-
net-http (0.6.0)
341-
uri
342371
net-protocol (0.2.2)
343372
timeout
344373
net-scp (4.1.0)
@@ -372,8 +401,9 @@ GEM
372401
wmi-lite (~> 1.0)
373402
omnibus-ctl (0.6.10)
374403
chef-utils (>= 16.5.54)
404+
ostruct (0.1.0)
375405
parallel (1.27.0)
376-
parser (3.3.9.0)
406+
parser (3.3.10.0)
377407
ast (~> 2.4.1)
378408
racc
379409
parslet (2.0.0)
@@ -382,41 +412,42 @@ GEM
382412
pbkdf2 (0.1.0)
383413
pg (1.5.9)
384414
plist (3.7.2)
385-
prism (1.4.0)
415+
prism (1.6.0)
386416
proxifier2 (1.1.0)
387417
pry (0.15.2)
388418
coderay (~> 1.1)
389419
method_source (~> 1.0)
420+
pstore (0.1.4)
390421
public_suffix (6.0.2)
391422
racc (1.8.1)
392423
rack (3.2.4)
393-
rackup (2.2.1)
424+
rackup (2.3.1)
394425
rack (>= 3)
395426
rainbow (3.1.1)
396-
rake (13.3.0)
427+
rake (13.3.1)
397428
redis (5.4.1)
398429
redis-client (>= 0.22.0)
399-
redis-client (0.25.2)
430+
redis-client (0.26.2)
400431
connection_pool
401-
regexp_parser (2.11.2)
432+
regexp_parser (2.11.3)
402433
retryable (3.0.5)
403-
rexml (3.4.2)
404-
rspec (3.13.1)
434+
rexml (3.4.4)
435+
rspec (3.13.2)
405436
rspec-core (~> 3.13.0)
406437
rspec-expectations (~> 3.13.0)
407438
rspec-mocks (~> 3.13.0)
408-
rspec-core (3.13.5)
439+
rspec-core (3.13.6)
409440
rspec-support (~> 3.13.0)
410441
rspec-expectations (3.13.5)
411442
diff-lcs (>= 1.2.0, < 2.0)
412443
rspec-support (~> 3.13.0)
413444
rspec-its (2.0.0)
414445
rspec-core (>= 3.13.0)
415446
rspec-expectations (>= 3.13.0)
416-
rspec-mocks (3.13.5)
447+
rspec-mocks (3.13.7)
417448
diff-lcs (>= 1.2.0, < 2.0)
418449
rspec-support (~> 3.13.0)
419-
rspec-support (3.13.5)
450+
rspec-support (3.13.6)
420451
rubocop (1.25.1)
421452
parallel (~> 1.10)
422453
parser (>= 3.1.0.0)
@@ -426,18 +457,20 @@ GEM
426457
rubocop-ast (>= 1.15.1, < 2.0)
427458
ruby-progressbar (~> 1.7)
428459
unicode-display_width (>= 1.4.0, < 3.0)
429-
rubocop-ast (1.46.0)
460+
rubocop-ast (1.48.0)
430461
parser (>= 3.3.7.2)
431462
prism (~> 1.4)
432463
ruby-progressbar (1.13.0)
464+
ruby2_keywords (0.0.5)
433465
rubyntlm (0.6.5)
434466
base64
435467
rubyzip (2.4.1)
436-
sawyer (0.9.2)
468+
sawyer (0.9.3)
437469
addressable (>= 2.3.5)
438470
faraday (>= 0.17.3, < 3)
471+
securerandom (0.4.1)
439472
semverse (3.0.2)
440-
sequel (5.95.1)
473+
sequel (5.99.0)
441474
bigdecimal
442475
solve (4.0.4)
443476
molinillo (~> 0.6)
@@ -448,11 +481,13 @@ GEM
448481
unicode-display_width (>= 1.5, < 3.0)
449482
unicode_utils (~> 1.4)
450483
strings-ansi (0.2.0)
484+
syslog (0.3.0)
485+
logger
451486
syslog-logger (1.6.8)
452487
thor (1.2.2)
453488
time (0.4.1)
454489
date
455-
timeout (0.4.3)
490+
timeout (0.5.0)
456491
toml (0.3.0)
457492
parslet (>= 1.8.0, < 3.0.0)
458493
tomlrb (1.3.0)
@@ -503,7 +538,7 @@ GEM
503538
veil (0.3.11)
504539
bcrypt (~> 3.1)
505540
pbkdf2
506-
webrick (1.9.1)
541+
webrick (1.9.2)
507542
wisper (2.0.1)
508543
wmi-lite (1.0.7)
509544

@@ -518,7 +553,7 @@ DEPENDENCIES
518553
chef (~> 18.8.46)
519554
chef-server-ctl!
520555
chefstyle
521-
knife (~> 18.8.13)
556+
knife (~> 18.8.68)
522557
knife-ec-backup (~> 3.0.5)
523558
rake
524559
rest-client!

0 commit comments

Comments
 (0)