Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

revert fastjsonparser #703

Merged
merged 2 commits into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/bosh_azure_cpi/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ gem 'azure-storage-table', '~> 2.0', '>= 2.0.4'
gem 'bosh_common'
gem 'bosh_cpi'
gem 'concurrent-ruby'
gem 'fast_jsonparser'
gem 'jwt'
gem 'deep_merge'
gem 'net-smtp'
Expand Down
2 changes: 0 additions & 2 deletions src/bosh_azure_cpi/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ GEM
faraday-retry (1.0.3)
faraday_middleware (1.2.1)
faraday (~> 1.0)
fast_jsonparser (0.6.0)
hashdiff (1.1.2)
httpclient (2.8.3)
json (2.8.2)
Expand Down Expand Up @@ -157,7 +156,6 @@ DEPENDENCIES
bosh_cpi
concurrent-ruby
deep_merge
fast_jsonparser
jwt
net-smtp
ostruct
Expand Down
9 changes: 1 addition & 8 deletions src/bosh_azure_cpi/lib/cloud/azure.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,7 @@ module AzureCloud; end
require 'fcntl'
require 'fileutils'
require 'logging'

begin
require 'fast_jsonparser'
rescue LoadError
require 'monkey_patches/fast_json_monkey_patch'
Bosh::AzureCloud::FastJsonMonkeyPatch.apply_patch
end

require 'json'
require 'jwt'
require 'open3'
require 'pp'
Expand Down
10 changes: 5 additions & 5 deletions src/bosh_azure_cpi/lib/cloud/azure/restapi/azure_client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def get_resource_by_id(url, params = {})
begin
uri = http_url(url, params)
response = http_get(uri)
result = FastJsonparser.parse(response.body, symbolize_keys: false) unless response.body.nil? || response.body == ''
result = JSON.parse(response.body, symbolize_keys: false) unless response.body.nil? || response.body == ''
rescue AzureNotFoundError => e
@logger.debug("Resource not found for url #{url} with parms #{params}")
result = nil
Expand All @@ -148,7 +148,7 @@ def get_resources_by_url(url, params = {})
uri = http_url(url, params)
response = http_get(uri)
unless response.body.nil?
body = FastJsonparser.parse(response.body, symbolize_keys: false)
body = JSON.parse(response.body, symbolize_keys: false)
result = body
next_url = body['nextLink']
end
Expand All @@ -159,7 +159,7 @@ def get_resources_by_url(url, params = {})
response = http_get(uri)
cloud_error("Got empty page from nextLink #{next_url}") if response.body.nil?

body = FastJsonparser.parse(response.body, symbolize_keys: false)
body = JSON.parse(response.body, symbolize_keys: false)
result.deep_merge!(body)
next_url = body['nextLink']
end
Expand Down Expand Up @@ -455,7 +455,7 @@ def create_virtual_machine(resource_group_name, vm_params, network_interfaces, a
}

response = http_put(url, vm, params)
result = FastJsonparser.parse(response.body, symbolize_keys: false) unless response.body.nil? || response.body == ''
result = JSON.parse(response.body, symbolize_keys: false) unless response.body.nil? || response.body == ''

_parse_virtual_machine(result, false)
end
Expand Down Expand Up @@ -2290,7 +2290,7 @@ def redact_credentials_in_request_body(body)

# @return [Object]
def redact_credentials_in_response_body(body)
is_debug_mode(@azure_config) ? body : redact_credentials(CREDENTIAL_KEYWORD_LIST, FastJsonparser.parse(body, symbolize_keys: false)).to_json
is_debug_mode(@azure_config) ? body : redact_credentials(CREDENTIAL_KEYWORD_LIST, JSON.parse(body, symbolize_keys: false)).to_json
rescue StandardError => e
body
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def _get_metadata(name)
metadata = @blob_manager.get_blob_metadata(@default_storage_account_name, STEMCELL_CONTAINER, "#{name}.vhd")
return nil if metadata.nil?

metadata['image'] = FastJsonparser.parse(metadata['image'], symbolize_keys: false)
metadata['image'] = JSON.parse(metadata['image'], symbolize_keys: false)
metadata
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def collect_events(max = 4)
event_files = Dir["#{@events_dir}/*.tld"]
event_files = event_files[0...max] if event_files.length > max
event_files.each do |file|
hash = FastJsonparser.load(file, symbolize_keys: false)
hash = JSON.parse(File.read(file))
event_list << Bosh::AzureCloud::TelemetryEvent.parse_hash(hash)
rescue StandardError => e
@logger.warn("[Telemetry] Failed to collect event from '#{file}'. Error:\n#{e.inspect}\n#{e.backtrace.join("\n")}")
Expand Down
22 changes: 0 additions & 22 deletions src/bosh_azure_cpi/lib/monkey_patches/fast_json_monkey_patch.rb

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@

context 'if everything is is ok' do
it 'should collect events' do
expect(FastJsonparser).to receive(:load).and_call_original.twice
expect(JSON).to receive(:parse).and_call_original.twice
expect(Bosh::AzureCloud::TelemetryEvent).to receive(:parse_hash).and_call_original.twice
expect(File).to receive(:delete).and_call_original.twice
expect do
Expand All @@ -162,7 +162,7 @@
let(:event_number) { 1 }

it 'should raise the error' do
expect(FastJsonparser).to receive(:load).and_raise 'unknown error'
expect(JSON).to receive(:parse).and_raise 'unknown error'
expect(Bosh::AzureCloud::TelemetryEvent).not_to receive(:parse_hash)
expect(File).to receive(:delete).and_call_original
expect(logger).to receive(:warn).with(/unknown error/)
Expand Down