Commit 7bbc1dd8 authored by syasonik's avatar syasonik

Prefer safe_load and deep_symbolize_keys

parent 7647353f
...@@ -21,13 +21,12 @@ module Gitlab ...@@ -21,13 +21,12 @@ module Gitlab
# Returns a new dashboard hash with the results of # Returns a new dashboard hash with the results of
# running transforms on the dashboard. # running transforms on the dashboard.
def process(dashboard) def process(raw_dashboard)
dashboard = dashboard.deep_transform_keys(&:to_sym) raw_dashboard.deep_symbolize_keys.tap do |dashboard|
sequence.each do |stage|
stage_params = [@project, @environment] stage.new(@project, @environment).transform!(dashboard)
sequence.each { |stage| stage.new(*stage_params).transform!(dashboard) } end
end
dashboard
end end
private private
......
...@@ -23,7 +23,7 @@ module Gitlab ...@@ -23,7 +23,7 @@ module Gitlab
# Returns the base metrics shipped with every GitLab service. # Returns the base metrics shipped with every GitLab service.
def system_dashboard def system_dashboard
YAML.load_file(SYSTEM_DASHBOARD_PATH) YAML.safe_load(File.read(SYSTEM_DASHBOARD_PATH))
end end
def cache_key def cache_key
...@@ -32,7 +32,7 @@ module Gitlab ...@@ -32,7 +32,7 @@ module Gitlab
# Returns a new dashboard Hash, supplemented with DB info # Returns a new dashboard Hash, supplemented with DB info
def process_dashboard(dashboard) def process_dashboard(dashboard)
Processor.new(project, params[:environment]).process(dashboard) Gitlab::Metrics::Dashboard::Processor.new(project, params[:environment]).process(dashboard)
end end
end end
end end
......
...@@ -485,7 +485,7 @@ describe Projects::EnvironmentsController do ...@@ -485,7 +485,7 @@ describe Projects::EnvironmentsController do
context 'when the dashboard could not be provided' do context 'when the dashboard could not be provided' do
before do before do
allow(YAML).to receive(:load_file).and_return({}) allow(YAML).to receive(:safe_load).and_return({})
end end
it 'returns an error response' do it 'returns an error response' do
......
...@@ -19,7 +19,7 @@ describe Gitlab::Metrics::Dashboard::Service, :use_clean_rails_memory_store_cach ...@@ -19,7 +19,7 @@ describe Gitlab::Metrics::Dashboard::Service, :use_clean_rails_memory_store_cach
end end
it 'caches the dashboard for subsequent calls' do it 'caches the dashboard for subsequent calls' do
expect(YAML).to receive(:load_file).once.and_call_original expect(YAML).to receive(:safe_load).once.and_call_original
described_class.new(project, environment).get_dashboard described_class.new(project, environment).get_dashboard
described_class.new(project, environment).get_dashboard described_class.new(project, environment).get_dashboard
...@@ -27,7 +27,7 @@ describe Gitlab::Metrics::Dashboard::Service, :use_clean_rails_memory_store_cach ...@@ -27,7 +27,7 @@ describe Gitlab::Metrics::Dashboard::Service, :use_clean_rails_memory_store_cach
context 'when the dashboard is configured incorrectly' do context 'when the dashboard is configured incorrectly' do
before do before do
allow(YAML).to receive(:load_file).and_return({}) allow(YAML).to receive(:safe_load).and_return({})
end end
it 'returns an appropriate message and status code' do it 'returns an appropriate message and status code' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment