Skip to content

Commit f596b69

Browse files
nevanschrisarcand
nevans
authored and
chrisarcand
committed
Replace deprecated JSON.fast_generate
`JSON.fast_generate` is deprecated and will be removed in json 3.0.0, just use `JSON.generate`.
1 parent 3b07590 commit f596b69

20 files changed

Lines changed: 54 additions & 54 deletions

‎lib/vault/api/approle.rb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class AppRole < Request
6161
# @return [true]
6262
def set_role(name, options = {})
6363
headers = extract_headers!(options)
64-
client.post("/v1/auth/approle/role/#{encode_path(name)}", JSON.fast_generate(options), headers)
64+
client.post("/v1/auth/approle/role/#{encode_path(name)}", JSON.generate(options), headers)
6565
return true
6666
end
6767

@@ -118,7 +118,7 @@ def role_id(name)
118118
# @return [true]
119119
def set_role_id(name, role_id)
120120
options = { role_id: role_id }
121-
client.post("/v1/auth/approle/role/#{encode_path(name)}/role-id", JSON.fast_generate(options))
121+
client.post("/v1/auth/approle/role/#{encode_path(name)}/role-id", JSON.generate(options))
122122
return true
123123
end
124124

@@ -163,9 +163,9 @@ def delete_role(name)
163163
def create_secret_id(role_name, options = {})
164164
headers = extract_headers!(options)
165165
if options[:secret_id]
166-
json = client.post("/v1/auth/approle/role/#{encode_path(role_name)}/custom-secret-id", JSON.fast_generate(options), headers)
166+
json = client.post("/v1/auth/approle/role/#{encode_path(role_name)}/custom-secret-id", JSON.generate(options), headers)
167167
else
168-
json = client.post("/v1/auth/approle/role/#{encode_path(role_name)}/secret-id", JSON.fast_generate(options), headers)
168+
json = client.post("/v1/auth/approle/role/#{encode_path(role_name)}/secret-id", JSON.generate(options), headers)
169169
end
170170
return Secret.decode(json)
171171
end
@@ -184,7 +184,7 @@ def create_secret_id(role_name, options = {})
184184
# @return [Secret, nil]
185185
def secret_id(role_name, secret_id)
186186
opts = { secret_id: secret_id }
187-
json = client.post("/v1/auth/approle/role/#{encode_path(role_name)}/secret-id/lookup", JSON.fast_generate(opts), {})
187+
json = client.post("/v1/auth/approle/role/#{encode_path(role_name)}/secret-id/lookup", JSON.generate(opts), {})
188188
return nil unless json
189189
return Secret.decode(json)
190190
rescue HTTPError => e

‎lib/vault/api/auth.rb‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def token(new_token)
7171
# @return [Secret]
7272
def app_id(app_id, user_id, options = {})
7373
payload = { app_id: app_id, user_id: user_id }.merge(options)
74-
json = client.post("/v1/auth/app-id/login", JSON.fast_generate(payload))
74+
json = client.post("/v1/auth/app-id/login", JSON.generate(payload))
7575
secret = Secret.decode(json)
7676
client.token = secret.auth.client_token
7777
return secret
@@ -95,7 +95,7 @@ def app_id(app_id, user_id, options = {})
9595
def approle(role_id, secret_id=nil)
9696
payload = { role_id: role_id }
9797
payload[:secret_id] = secret_id if secret_id
98-
json = client.post("/v1/auth/approle/login", JSON.fast_generate(payload))
98+
json = client.post("/v1/auth/approle/login", JSON.generate(payload))
9999
secret = Secret.decode(json)
100100
client.token = secret.auth.client_token
101101
return secret
@@ -120,7 +120,7 @@ def approle(role_id, secret_id=nil)
120120
# @return [Secret]
121121
def userpass(username, password, options = {})
122122
payload = { password: password }.merge(options)
123-
json = client.post("/v1/auth/userpass/login/#{encode_path(username)}", JSON.fast_generate(payload))
123+
json = client.post("/v1/auth/userpass/login/#{encode_path(username)}", JSON.generate(payload))
124124
secret = Secret.decode(json)
125125
client.token = secret.auth.client_token
126126
return secret
@@ -142,7 +142,7 @@ def userpass(username, password, options = {})
142142
# @return [Secret]
143143
def ldap(username, password, options = {})
144144
payload = { password: password }.merge(options)
145-
json = client.post("/v1/auth/ldap/login/#{encode_path(username)}", JSON.fast_generate(payload))
145+
json = client.post("/v1/auth/ldap/login/#{encode_path(username)}", JSON.generate(payload))
146146
secret = Secret.decode(json)
147147
client.token = secret.auth.client_token
148148
return secret
@@ -160,7 +160,7 @@ def ldap(username, password, options = {})
160160
# @return [Secret]
161161
def github(github_token, path="/v1/auth/github/login")
162162
payload = {token: github_token}
163-
json = client.post(path, JSON.fast_generate(payload))
163+
json = client.post(path, JSON.generate(payload))
164164
secret = Secret.decode(json)
165165
client.token = secret.auth.client_token
166166
return secret
@@ -185,7 +185,7 @@ def aws_ec2(role, pkcs7, nonce = nil, route = nil)
185185
payload = { role: role, pkcs7: pkcs7 }
186186
# Set a custom nonce if client is providing one
187187
payload[:nonce] = nonce if nonce
188-
json = client.post(route, JSON.fast_generate(payload))
188+
json = client.post(route, JSON.generate(payload))
189189
secret = Secret.decode(json)
190190
client.token = secret.auth.client_token
191191
return secret
@@ -242,7 +242,7 @@ def aws_iam(role, credentials_provider, iam_auth_header_value = nil, sts_endpoin
242242
iam_request_body: Base64.strict_encode64(request_body)
243243
}
244244

245-
json = client.post(route, JSON.fast_generate(payload))
245+
json = client.post(route, JSON.generate(payload))
246246
secret = Secret.decode(json)
247247
client.token = secret.auth.client_token
248248
return secret
@@ -264,7 +264,7 @@ def aws_iam(role, credentials_provider, iam_auth_header_value = nil, sts_endpoin
264264
# @return [Secret]
265265
def gcp(role, jwt, path = 'gcp')
266266
payload = { role: role, jwt: jwt }
267-
json = client.post("/v1/auth/#{CGI.escape(path)}/login", JSON.fast_generate(payload))
267+
json = client.post("/v1/auth/#{CGI.escape(path)}/login", JSON.generate(payload))
268268
secret = Secret.decode(json)
269269
client.token = secret.auth.client_token
270270
return secret

‎lib/vault/api/auth_tls.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class AuthTLS < Request
4545
# @return [true]
4646
def set_certificate(name, options = {})
4747
headers = extract_headers!(options)
48-
client.post("/v1/auth/cert/certs/#{encode_path(name)}", JSON.fast_generate(options), headers)
48+
client.post("/v1/auth/cert/certs/#{encode_path(name)}", JSON.generate(options), headers)
4949
return true
5050
end
5151

‎lib/vault/api/auth_token.rb‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def accessors(options = {})
6969
# @return [Secret]
7070
def create(options = {})
7171
headers = extract_headers!(options)
72-
json = client.post("/v1/auth/token/create", JSON.fast_generate(options), headers)
72+
json = client.post("/v1/auth/token/create", JSON.generate(options), headers)
7373
return Secret.decode(json)
7474
end
7575

@@ -84,7 +84,7 @@ def create(options = {})
8484
# @return [Secret]
8585
def create_orphan(options = {})
8686
headers = extract_headers!(options)
87-
json = client.post("/v1/auth/token/create-orphan", JSON.fast_generate(options), headers)
87+
json = client.post("/v1/auth/token/create-orphan", JSON.generate(options), headers)
8888
return Secret.decode(json)
8989
end
9090

@@ -98,7 +98,7 @@ def create_orphan(options = {})
9898
# @return [Secret]
9999
def create_with_role(name, options = {})
100100
headers = extract_headers!(options)
101-
json = client.post("/v1/auth/token/create/#{encode_path(name)}", JSON.fast_generate(options), headers)
101+
json = client.post("/v1/auth/token/create/#{encode_path(name)}", JSON.generate(options), headers)
102102
return Secret.decode(json)
103103
end
104104

@@ -113,7 +113,7 @@ def create_with_role(name, options = {})
113113
# @return [Secret]
114114
def lookup(token, options = {})
115115
headers = extract_headers!(options)
116-
json = client.post("/v1/auth/token/lookup", JSON.fast_generate(
116+
json = client.post("/v1/auth/token/lookup", JSON.generate(
117117
token: token,
118118
), headers)
119119
return Secret.decode(json)
@@ -128,7 +128,7 @@ def lookup(token, options = {})
128128
# @param [Hash] options
129129
def lookup_accessor(accessor, options = {})
130130
headers = extract_headers!(options)
131-
json = client.post("/v1/auth/token/lookup-accessor", JSON.fast_generate(
131+
json = client.post("/v1/auth/token/lookup-accessor", JSON.generate(
132132
accessor: accessor,
133133
), headers)
134134
return Secret.decode(json)
@@ -157,7 +157,7 @@ def lookup_self
157157
# @return [Secret]
158158
def renew(token, increment = 0, options = {})
159159
headers = extract_headers!(options)
160-
json = client.put("/v1/auth/token/renew", JSON.fast_generate(
160+
json = client.put("/v1/auth/token/renew", JSON.generate(
161161
token: token,
162162
increment: increment,
163163
), headers)
@@ -174,7 +174,7 @@ def renew(token, increment = 0, options = {})
174174
# @return [Secret]
175175
def renew_self(increment = 0, options = {})
176176
headers = extract_headers!(options)
177-
json = client.put("/v1/auth/token/renew-self", JSON.fast_generate(
177+
json = client.put("/v1/auth/token/renew-self", JSON.generate(
178178
increment: increment,
179179
), headers)
180180
return Secret.decode(json)
@@ -201,7 +201,7 @@ def revoke_self
201201
# @return [true]
202202
def revoke_orphan(token, options = {})
203203
headers = extract_headers!(options)
204-
client.put("/v1/auth/token/revoke-orphan", JSON.fast_generate(
204+
client.put("/v1/auth/token/revoke-orphan", JSON.generate(
205205
token: token,
206206
), headers)
207207
return true
@@ -218,7 +218,7 @@ def revoke_orphan(token, options = {})
218218
# @return [true]
219219
def revoke_accessor(accessor, options = {})
220220
headers = extract_headers!(options)
221-
client.put("/v1/auth/token/revoke-accessor", JSON.fast_generate(
221+
client.put("/v1/auth/token/revoke-accessor", JSON.generate(
222222
accessor: accessor,
223223
), headers)
224224
return true
@@ -235,7 +235,7 @@ def revoke_accessor(accessor, options = {})
235235
# @return [true]
236236
def revoke(token, options = {})
237237
headers = extract_headers!(options)
238-
client.put("/v1/auth/token/revoke", JSON.fast_generate(
238+
client.put("/v1/auth/token/revoke", JSON.generate(
239239
token: token,
240240
), headers)
241241
return true

‎lib/vault/api/kv.rb‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def read_metadata(path)
9999
# @return [Secret]
100100
def write(path, data = {}, options = {})
101101
headers = extract_headers!(options)
102-
json = client.post("/v1/#{mount}/data/#{encode_path(path)}", JSON.fast_generate(:data => data), headers)
102+
json = client.post("/v1/#{mount}/data/#{encode_path(path)}", JSON.generate(:data => data), headers)
103103
if json.nil?
104104
return true
105105
else
@@ -120,7 +120,7 @@ def write(path, data = {}, options = {})
120120
#
121121
# @return [true]
122122
def write_metadata(path, metadata = {})
123-
client.post("/v1/#{mount}/metadata/#{encode_path(path)}", JSON.fast_generate(metadata))
123+
client.post("/v1/#{mount}/metadata/#{encode_path(path)}", JSON.generate(metadata))
124124

125125
true
126126
end
@@ -140,7 +140,7 @@ def write_metadata(path, metadata = {})
140140
def patch_metadata(path, metadata = {}, options = {})
141141
headers = extract_headers!(options)
142142
headers["Content-Type"] = "application/merge-patch+json"
143-
client.patch("/v1/#{mount}/metadata/#{encode_path(path)}", JSON.fast_generate(metadata), headers)
143+
client.patch("/v1/#{mount}/metadata/#{encode_path(path)}", JSON.generate(metadata), headers)
144144

145145
true
146146
end
@@ -173,7 +173,7 @@ def delete(path)
173173
#
174174
# @return [true]
175175
def delete_versions(path, versions)
176-
client.post("/v1/#{mount}/delete/#{encode_path(path)}", JSON.fast_generate(versions: versions))
176+
client.post("/v1/#{mount}/delete/#{encode_path(path)}", JSON.generate(versions: versions))
177177

178178
true
179179
end
@@ -190,7 +190,7 @@ def delete_versions(path, versions)
190190
#
191191
# @return [true]
192192
def undelete_versions(path, versions)
193-
client.post("/v1/#{mount}/undelete/#{encode_path(path)}", JSON.fast_generate(versions: versions))
193+
client.post("/v1/#{mount}/undelete/#{encode_path(path)}", JSON.generate(versions: versions))
194194

195195
true
196196
end
@@ -222,7 +222,7 @@ def destroy(path)
222222
#
223223
# @return [true]
224224
def destroy_versions(path, versions)
225-
client.post("/v1/#{mount}/destroy/#{encode_path(path)}", JSON.fast_generate(versions: versions))
225+
client.post("/v1/#{mount}/destroy/#{encode_path(path)}", JSON.generate(versions: versions))
226226

227227
true
228228
end

‎lib/vault/api/logical.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def read(path, options = {})
6868
# @return [Secret]
6969
def write(path, data = {}, options = {})
7070
headers = extract_headers!(options)
71-
json = client.put("/v1/#{encode_path(path)}", JSON.fast_generate(data), headers)
71+
json = client.put("/v1/#{encode_path(path)}", JSON.generate(data), headers)
7272
if json.nil?
7373
return true
7474
else

‎lib/vault/api/sys/audit.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def audits
5454
#
5555
# @return [true]
5656
def enable_audit(path, type, description, options = {})
57-
client.put("/v1/sys/audit/#{encode_path(path)}", JSON.fast_generate(
57+
client.put("/v1/sys/audit/#{encode_path(path)}", JSON.generate(
5858
type: type,
5959
description: description,
6060
options: options,
@@ -86,7 +86,7 @@ def disable_audit(path)
8686
#
8787
# @return [String]
8888
def audit_hash(path, input)
89-
json = client.post("/v1/sys/audit-hash/#{encode_path(path)}", JSON.fast_generate(input: input))
89+
json = client.post("/v1/sys/audit-hash/#{encode_path(path)}", JSON.generate(input: input))
9090
json = json[:data] if json[:data]
9191
json[:hash]
9292
end

‎lib/vault/api/sys/auth.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def enable_auth(path, type, description = nil)
6060
payload = { type: type }
6161
payload[:description] = description if !description.nil?
6262

63-
client.post("/v1/sys/auth/#{encode_path(path)}", JSON.fast_generate(payload))
63+
client.post("/v1/sys/auth/#{encode_path(path)}", JSON.generate(payload))
6464
return true
6565
end
6666

@@ -108,7 +108,7 @@ def auth_tune(path)
108108
# @return [AuthConfig]
109109
# configuration of the given auth path
110110
def put_auth_tune(path, config = {})
111-
json = client.put("/v1/sys/auth/#{encode_path(path)}/tune", JSON.fast_generate(config))
111+
json = client.put("/v1/sys/auth/#{encode_path(path)}/tune", JSON.generate(config))
112112
if json.nil?
113113
return true
114114
else

‎lib/vault/api/sys/init.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def init_status
7070
#
7171
# @return [InitResponse]
7272
def init(options = {})
73-
json = client.put("/v1/sys/init", JSON.fast_generate(
73+
json = client.put("/v1/sys/init", JSON.generate(
7474
root_token_pgp_key: options.fetch(:root_token_pgp_key, nil),
7575
secret_shares: options.fetch(:secret_shares, options.fetch(:shares, 5)),
7676
secret_threshold: options.fetch(:secret_threshold, options.fetch(:threshold, 3)),

‎lib/vault/api/sys/lease.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class Sys
1414
#
1515
# @return [Secret]
1616
def renew(id, increment = 0)
17-
json = client.put("/v1/sys/renew/#{id}", JSON.fast_generate(
17+
json = client.put("/v1/sys/renew/#{id}", JSON.generate(
1818
increment: increment,
1919
))
2020
return Secret.decode(json)

0 commit comments

Comments
 (0)