Skip to content
This repository was archived by the owner on Oct 16, 2025. It is now read-only.

Commit 83fca85

Browse files
terrywbradyterrywbrady
committed
gem updates, zk encode fix
1 parent 1fd1db8 commit 83fca85

File tree

9 files changed

+97
-80
lines changed

9 files changed

+97
-80
lines changed

‎mysql-ruby-lambda/Gemfile.lock‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,29 @@ GEM
99
remote: https://rubygems.org/
1010
specs:
1111
ast (2.4.2)
12-
json (2.9.1)
13-
language_server-protocol (3.17.0.3)
12+
json (2.10.1)
13+
language_server-protocol (3.17.0.4)
14+
lint_roller (1.1.0)
1415
mysql2 (0.5.6)
1516
parallel (1.26.3)
16-
parser (3.3.7.0)
17+
parser (3.3.7.1)
1718
ast (~> 2.4.1)
1819
racc
1920
racc (1.8.1)
2021
rainbow (3.1.1)
2122
regexp_parser (2.10.0)
22-
rubocop (1.71.0)
23+
rubocop (1.72.2)
2324
json (~> 2.3)
24-
language_server-protocol (>= 3.17.0)
25+
language_server-protocol (~> 3.17.0.2)
26+
lint_roller (~> 1.1.0)
2527
parallel (~> 1.10)
2628
parser (>= 3.3.0.2)
2729
rainbow (>= 2.2.2, < 4.0)
2830
regexp_parser (>= 2.9.3, < 3.0)
29-
rubocop-ast (>= 1.36.2, < 2.0)
31+
rubocop-ast (>= 1.38.0, < 2.0)
3032
ruby-progressbar (~> 1.7)
3133
unicode-display_width (>= 2.4.0, < 4.0)
32-
rubocop-ast (1.37.0)
34+
rubocop-ast (1.38.0)
3335
parser (>= 3.3.1.0)
3436
ruby-progressbar (1.13.0)
3537
unicode-display_width (3.1.4)
@@ -46,4 +48,4 @@ DEPENDENCIES
4648
uc3-ssm!
4749

4850
BUNDLED WITH
49-
2.6.3
51+
2.6.4

‎simulate-lambda-alb/Gemfile.lock‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,18 @@ GEM
44
ast (2.4.2)
55
base64 (0.2.0)
66
httpclient (2.8.3)
7-
json (2.9.1)
8-
language_server-protocol (3.17.0.3)
9-
logger (1.6.5)
7+
json (2.10.1)
8+
language_server-protocol (3.17.0.4)
9+
lint_roller (1.1.0)
10+
logger (1.6.6)
1011
mustermann (3.0.3)
1112
ruby2_keywords (~> 0.0.1)
1213
parallel (1.26.3)
13-
parser (3.3.7.0)
14+
parser (3.3.7.1)
1415
ast (~> 2.4.1)
1516
racc
1617
racc (1.8.1)
17-
rack (3.1.8)
18+
rack (3.1.10)
1819
rack-protection (4.1.1)
1920
base64 (>= 0.1.0)
2021
logger (>= 1.6.0)
@@ -24,17 +25,18 @@ GEM
2425
rack (>= 3.0.0)
2526
rainbow (3.1.1)
2627
regexp_parser (2.10.0)
27-
rubocop (1.71.0)
28+
rubocop (1.72.2)
2829
json (~> 2.3)
29-
language_server-protocol (>= 3.17.0)
30+
language_server-protocol (~> 3.17.0.2)
31+
lint_roller (~> 1.1.0)
3032
parallel (~> 1.10)
3133
parser (>= 3.3.0.2)
3234
rainbow (>= 2.2.2, < 4.0)
3335
regexp_parser (>= 2.9.3, < 3.0)
34-
rubocop-ast (>= 1.36.2, < 2.0)
36+
rubocop-ast (>= 1.38.0, < 2.0)
3537
ruby-progressbar (~> 1.7)
3638
unicode-display_width (>= 2.4.0, < 4.0)
37-
rubocop-ast (1.37.0)
39+
rubocop-ast (1.38.0)
3840
parser (>= 3.3.1.0)
3941
ruby-progressbar (1.13.0)
4042
ruby2_keywords (0.0.5)

‎src-admintool/Gemfile.lock‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,44 +9,48 @@ GEM
99
remote: https://rubygems.org/
1010
specs:
1111
ast (2.4.2)
12-
aws-eventstream (1.3.0)
13-
aws-partitions (1.1042.0)
14-
aws-sdk-core (3.216.1)
12+
aws-eventstream (1.3.1)
13+
aws-partitions (1.1052.0)
14+
aws-sdk-core (3.219.0)
1515
aws-eventstream (~> 1, >= 1.3.0)
1616
aws-partitions (~> 1, >= 1.992.0)
1717
aws-sigv4 (~> 1.9)
18+
base64
1819
jmespath (~> 1, >= 1.6.1)
19-
aws-sdk-kms (1.97.0)
20+
aws-sdk-kms (1.99.0)
2021
aws-sdk-core (~> 3, >= 3.216.0)
2122
aws-sigv4 (~> 1.5)
22-
aws-sdk-s3 (1.178.0)
23+
aws-sdk-s3 (1.182.0)
2324
aws-sdk-core (~> 3, >= 3.216.0)
2425
aws-sdk-kms (~> 1)
2526
aws-sigv4 (~> 1.5)
2627
aws-sigv4 (1.11.0)
2728
aws-eventstream (~> 1, >= 1.0.2)
29+
base64 (0.2.0)
2830
jmespath (1.6.2)
29-
json (2.9.1)
30-
language_server-protocol (3.17.0.3)
31+
json (2.10.1)
32+
language_server-protocol (3.17.0.4)
33+
lint_roller (1.1.0)
3134
mysql2 (0.5.6)
3235
parallel (1.26.3)
33-
parser (3.3.7.0)
36+
parser (3.3.7.1)
3437
ast (~> 2.4.1)
3538
racc
3639
racc (1.8.1)
3740
rainbow (3.1.1)
3841
regexp_parser (2.10.0)
39-
rubocop (1.71.0)
42+
rubocop (1.72.2)
4043
json (~> 2.3)
41-
language_server-protocol (>= 3.17.0)
44+
language_server-protocol (~> 3.17.0.2)
45+
lint_roller (~> 1.1.0)
4246
parallel (~> 1.10)
4347
parser (>= 3.3.0.2)
4448
rainbow (>= 2.2.2, < 4.0)
4549
regexp_parser (>= 2.9.3, < 3.0)
46-
rubocop-ast (>= 1.36.2, < 2.0)
50+
rubocop-ast (>= 1.38.0, < 2.0)
4751
ruby-progressbar (~> 1.7)
4852
unicode-display_width (>= 2.4.0, < 4.0)
49-
rubocop-ast (1.37.0)
53+
rubocop-ast (1.38.0)
5054
parser (>= 3.3.1.0)
5155
ruby-progressbar (1.13.0)
5256
unicode-display_width (3.1.4)
@@ -65,4 +69,4 @@ DEPENDENCIES
6569
uc3-ssm!
6670

6771
BUNDLED WITH
68-
2.6.3
72+
2.6.4

‎src-colladmin/Gemfile.lock‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,54 +18,57 @@ GEM
1818
remote: https://rubygems.org/
1919
specs:
2020
ast (2.4.2)
21-
aws-eventstream (1.3.0)
22-
aws-partitions (1.1042.0)
23-
aws-sdk-core (3.216.1)
21+
aws-eventstream (1.3.1)
22+
aws-partitions (1.1052.0)
23+
aws-sdk-core (3.219.0)
2424
aws-eventstream (~> 1, >= 1.3.0)
2525
aws-partitions (~> 1, >= 1.992.0)
2626
aws-sigv4 (~> 1.9)
27+
base64
2728
jmespath (~> 1, >= 1.6.1)
28-
aws-sdk-ec2 (1.501.0)
29+
aws-sdk-ec2 (1.506.0)
2930
aws-sdk-core (~> 3, >= 3.216.0)
3031
aws-sigv4 (~> 1.5)
31-
aws-sdk-kms (1.97.0)
32+
aws-sdk-kms (1.99.0)
3233
aws-sdk-core (~> 3, >= 3.216.0)
3334
aws-sigv4 (~> 1.5)
34-
aws-sdk-lambda (1.145.0)
35+
aws-sdk-lambda (1.147.0)
3536
aws-sdk-core (~> 3, >= 3.216.0)
3637
aws-sigv4 (~> 1.5)
37-
aws-sdk-s3 (1.178.0)
38+
aws-sdk-s3 (1.182.0)
3839
aws-sdk-core (~> 3, >= 3.216.0)
3940
aws-sdk-kms (~> 1)
4041
aws-sigv4 (~> 1.5)
41-
aws-sdk-ssm (1.187.0)
42+
aws-sdk-ssm (1.190.0)
4243
aws-sdk-core (~> 3, >= 3.216.0)
4344
aws-sigv4 (~> 1.5)
4445
aws-sigv4 (1.11.0)
4546
aws-eventstream (~> 1, >= 1.0.2)
47+
base64 (0.2.0)
4648
csv (3.3.2)
4749
domain_name (0.6.20240107)
4850
http-accept (1.7.0)
4951
http-cookie (1.0.8)
5052
domain_name (~> 0.5)
5153
jmespath (1.6.2)
52-
json (2.9.1)
53-
language_server-protocol (3.17.0.3)
54-
logger (1.6.5)
54+
json (2.10.1)
55+
language_server-protocol (3.17.0.4)
56+
lint_roller (1.1.0)
57+
logger (1.6.6)
5558
mime-types (3.6.0)
5659
logger
5760
mime-types-data (~> 3.2015)
58-
mime-types-data (3.2025.0107)
61+
mime-types-data (3.2025.0204)
5962
mini_portile2 (2.8.8)
6063
mysql2 (0.5.6)
6164
netrc (0.11.0)
62-
nokogiri (1.18.2)
65+
nokogiri (1.18.3)
6366
mini_portile2 (~> 2.8.2)
6467
racc (~> 1.4)
65-
nokogiri (1.18.2-x86_64-linux-gnu)
68+
nokogiri (1.18.3-x86_64-linux-gnu)
6669
racc (~> 1.4)
6770
parallel (1.26.3)
68-
parser (3.3.7.0)
71+
parser (3.3.7.1)
6972
ast (~> 2.4.1)
7073
racc
7174
racc (1.8.1)
@@ -76,17 +79,18 @@ GEM
7679
http-cookie (>= 1.0.2, < 2.0)
7780
mime-types (>= 1.16, < 4.0)
7881
netrc (~> 0.8)
79-
rubocop (1.71.0)
82+
rubocop (1.72.2)
8083
json (~> 2.3)
81-
language_server-protocol (>= 3.17.0)
84+
language_server-protocol (~> 3.17.0.2)
85+
lint_roller (~> 1.1.0)
8286
parallel (~> 1.10)
8387
parser (>= 3.3.0.2)
8488
rainbow (>= 2.2.2, < 4.0)
8589
regexp_parser (>= 2.9.3, < 3.0)
86-
rubocop-ast (>= 1.36.2, < 2.0)
90+
rubocop-ast (>= 1.38.0, < 2.0)
8791
ruby-progressbar (~> 1.7)
8892
unicode-display_width (>= 2.4.0, < 4.0)
89-
rubocop-ast (1.37.0)
93+
rubocop-ast (1.38.0)
9094
parser (>= 3.3.1.0)
9195
ruby-progressbar (1.13.0)
9296
unicode-display_width (3.1.4)
@@ -117,4 +121,4 @@ DEPENDENCIES
117121
zookeeper
118122

119123
BUNDLED WITH
120-
2.6.3
124+
2.6.4

‎src-colladmin/actions/zookeeper_action.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ def system_node(n)
110110

111111
def show_data(n)
112112
d = get_data(n)
113-
df = d.is_a?(Hash) ? "\n#{JSON.pretty_generate(d).encode('UTF-8')}" : " #{d.to_s.encode('UTF-8')}"
113+
df = d.is_a?(Hash) ? "\n#{JSON.pretty_generate(d)}" : " #{d}"
114+
df = df.encode('UTF-8', invalid: :replace, undef: :replace, replace: '?')
114115
@buf << df unless @buf.nil?
115116
rescue StandardError => e
116117
@buf << e
@@ -121,7 +122,7 @@ def get_data(n)
121122
return '' if d.nil?
122123

123124
begin
124-
JSON.parse(d.encode('UTF-8'), symbolize_names: true)
125+
JSON.parse(d.encode('UTF-8', invalid: :replace, undef: :replace, replace: '?'), symbolize_names: true)
125126
rescue JSON::ParserError
126127
d
127128
rescue StandardError => e
@@ -233,7 +234,6 @@ def dump_node(n = '/')
233234
p = "#{n}/#{cp}".gsub(%r{/+}, '/')
234235
dump_node(p)
235236
end
236-
237237
end
238238
end
239239

@@ -254,7 +254,7 @@ def table_types
254254

255255
def table_rows(_body)
256256
dump_node(@zkpath)
257-
@job_states_count.each do |_jid, states|
257+
@job_states_count.each_value do |states|
258258
next unless states.length > 1
259259

260260
@test_results.append([states.to_s, 'Duplicate JID', 'FAIL'])

‎src-colladmin/lambda_function.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ def template_parameters(path, myparams)
265265
map['scan_limit'] = myparams.fetch('limit', '100').to_i
266266
map['scan_limit'] = 1000 if map['scan_limit'] > 1000
267267
map['scan_offset'] = myparams.fetch('offset', '0').to_i
268-
map['scan_offset'] = 0 if (map['scan_offset']).negative?
268+
map['scan_offset'] = 0 if map['scan_offset'].negative?
269269
map['nodenum'] = nodenum
270270
map['scanid'] = scanid
271271
rev = ScanReview.new(@config, maint_status)

‎src-colladmin/lib/storage_nodes.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ def initialize(config, collid, primary_id)
262262
[collid, collid, primary_id, collid, collid]
263263
).each_with_index do |r, i|
264264
percent = 100
265-
percent = ((r[4] * 100.0) / @collnodes[0][:count]).to_i if i.positive? && (@collnodes[0][:count]).positive?
265+
percent = ((r[4] * 100.0) / @collnodes[0][:count]).to_i if i.positive? && @collnodes[0][:count].positive?
266266
@collnodes.push({
267267
role: r[0],
268268
number: r[1],

‎src-common/Gemfile.lock‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,33 @@ GEM
1111
ast (2.4.2)
1212
base64 (0.2.0)
1313
httpclient (2.8.3)
14-
json (2.9.1)
14+
json (2.10.1)
1515
jwt (2.10.1)
1616
base64
17-
language_server-protocol (3.17.0.3)
17+
language_server-protocol (3.17.0.4)
18+
lint_roller (1.1.0)
1819
mustache (1.1.1)
1920
mysql2 (0.5.6)
2021
net-ldap (0.19.0)
2122
parallel (1.26.3)
22-
parser (3.3.7.0)
23+
parser (3.3.7.1)
2324
ast (~> 2.4.1)
2425
racc
2526
racc (1.8.1)
2627
rainbow (3.1.1)
2728
regexp_parser (2.10.0)
28-
rubocop (1.71.0)
29+
rubocop (1.72.2)
2930
json (~> 2.3)
30-
language_server-protocol (>= 3.17.0)
31+
language_server-protocol (~> 3.17.0.2)
32+
lint_roller (~> 1.1.0)
3133
parallel (~> 1.10)
3234
parser (>= 3.3.0.2)
3335
rainbow (>= 2.2.2, < 4.0)
3436
regexp_parser (>= 2.9.3, < 3.0)
35-
rubocop-ast (>= 1.36.2, < 2.0)
37+
rubocop-ast (>= 1.38.0, < 2.0)
3638
ruby-progressbar (~> 1.7)
3739
unicode-display_width (>= 2.4.0, < 4.0)
38-
rubocop-ast (1.37.0)
40+
rubocop-ast (1.38.0)
3941
parser (>= 3.3.1.0)
4042
ruby-progressbar (1.13.0)
4143
rubyzip (2.4.1)
@@ -59,4 +61,4 @@ DEPENDENCIES
5961
uc3-ssm!
6062

6163
BUNDLED WITH
62-
2.6.3
64+
2.6.4

0 commit comments

Comments
 (0)