Skip to content
Open
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
9 changes: 4 additions & 5 deletions features/step_definitions/cli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@
When /^I run oc create( as admin)? (?:over|with) #{QUOTED} replacing paths:$/ do |admin, file, table|
if file.include? '://'
step %Q|I download a file from "#{file}"|
resource_hash = YAML.load(@result[:response])
resource_hash = YAML.load(@result[:response], aliases: true, permitted_classes: [Symbol, Regexp])
else
resource_hash = YAML.load_file(expand_path(file))
resource_hash = YAML.safe_load_file(expand_path(file), aliases: true, permitted_classes: [Symbol, Regexp])
end

# replace paths from table
Expand All @@ -91,9 +91,9 @@
When /^I run oc replace( as admin)? (?:over|with) #{QUOTED} replacing paths:$/ do |admin, file, table|
if file.include? '://'
step %Q|I download a file from "#{file}"|
resource_hash = YAML.load(@result[:response])
resource_hash = YAML.load(@result[:response], aliases: true, permitted_classes: [Symbol, Regexp])
else
resource_hash = YAML.load_file(expand_path(file))
resource_hash = YAML.safe_load_file(expand_path(file), aliases: true, permitted_classes: [Symbol, Regexp])
end

# replace paths from table
Expand Down Expand Up @@ -263,4 +263,3 @@
end
end
end

4 changes: 2 additions & 2 deletions features/step_definitions/pv.rb
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,9 @@

if location.include? '://'
step %Q/I download a file from "#{location}"/
pv_hash = YAML.load @result[:response]
pv_hash = YAML.load @result[:response], aliases: true, permitted_classes: [Symbol, Regexp]
else
pv_hash = YAML.load_file location
pv_hash = YAML.safe_load_file location, aliases: true, permitted_classes: [Symbol, Regexp]
end

# use random name to avoid interference
Expand Down
4 changes: 2 additions & 2 deletions features/step_definitions/pvc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@
When /^I create a (manual|dynamic) pvc from #{QUOTED} replacing paths:$/ do |type, file, table|
if file.include? '://'
step %Q|I download a file from "#{file}"|
resource_hash = YAML.load(@result[:response])
resource_hash = YAML.load(@result[:response], aliases: true, permitted_classes: [Symbol, Regexp])
else
resource_hash = YAML.load_file(expand_path(file))
resource_hash = YAML.safe_load_file(expand_path(file), aliases: true, permitted_classes: [Symbol, Regexp])
end

# replace paths from table
Expand Down
2 changes: 1 addition & 1 deletion features/step_definitions/scc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
raise "no policy template found: #{path}" unless File.exist?(path)

## figure out policy name for clean-up
policy_name = YAML.load_file(path)["metadata"]["name"]
policy_name = YAML.safe_load_file(path, aliases: true, permitted_classes: [Symbol, Regexp])["metadata"]["name"]
raise "no policy name in template" unless policy_name

@result = admin.cli_exec(:create, f: path)
Expand Down
26 changes: 13 additions & 13 deletions features/step_definitions/storage_class.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

if location.include? '://'
step %Q/I download a file from "#{location}"/
sc_hash = YAML.load @result[:response]
sc_hash = YAML.load @result[:response], aliases: true, permitted_classes: [Symbol, Regexp]
else
sc_hash = YAML.load_file location
sc_hash = YAML.safe_load_file location, aliases: true, permitted_classes: [Symbol, Regexp]
end

# use random name to avoid interference
Expand Down Expand Up @@ -235,11 +235,11 @@
ensure_admin_tagged
project_name = project.name

platform = infrastructure('cluster').platform.downcase
platform = infrastructure('cluster').platform.downcase
case platform
when 'aws'
provisioner = 'aws-ebs'
when 'gcp'
when 'gcp'
provisioner = 'gce-pd'
when 'azure'
provisioner = 'azure-disk'
Expand All @@ -252,9 +252,9 @@
skip_this_scenario
end

# load file
# load file
file = "#{BushSlicer::HOME}/testdata/storage/misc/in-tree-storageClass-template.yaml"
sc_hash = YAML.load_file file
sc_hash = YAML.safe_load_file file, aliases: true, permitted_classes: [Symbol, Regexp]

# replace paths from table
sc_hash["parameters"] ||= {}
Expand All @@ -263,22 +263,22 @@
end

# After CSI Migration the default volumeType change to 'gp3', but most aws local zones nodes don't support gp3 type volume
if platform == "aws"
if platform == "aws"
sc_hash["parameters"]["type"] = "gp2"
end

# if no volumeBindingMode exists in tc, we need to pass vSphere=Immediate, others=WaitForFirstConsumer
if !sc_hash.dig("volumeBindingMode")
if platform == "vsphere"
sc_hash["volumeBindingMode"] = "Immediate"
else
if platform == "vsphere"
sc_hash["volumeBindingMode"] = "Immediate"
else
sc_hash["volumeBindingMode"] = "WaitForFirstConsumer"
end
end

# replace the provisioner value according to platform wise
# replace the provisioner value according to platform wise
sc_hash["provisioner"] = "kubernetes.io/#{provisioner}"

logger.info("Creating StorageClass:\n#{sc_hash.to_yaml}")
@result = BushSlicer::StorageClass.create(by: admin, spec: sc_hash)

Expand All @@ -292,7 +292,7 @@
else
logger.error(@result[:response])
raise "failed to clone StorageClass from: #{src_sc}"
end
end
end

Given(/^default storage class exists$/) do
Expand Down
2 changes: 1 addition & 1 deletion features/step_definitions/volume_snapshot.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
raise "No volumesnapshot template for #{iaas_type} platform"
end

resource_hash = YAML.load_file file
resource_hash = YAML.safe_load_file file, aliases: true, permitted_classes: [Symbol, Regexp]
# replace paths from table
table.raw.each do |path, value|
eval "resource_hash#{path} = value"
Expand Down
2 changes: 1 addition & 1 deletion features/step_definitions/web.rb
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
]
browser_opts.any? do |file|
if File.exist? file
init_params.merge! YAML.load_file(file)
init_params.merge! YAML.safe_load_file(file, aliases: true, permitted_classes: [Symbol, Regexp])
end
end
if conf[:browser]
Expand Down
4 changes: 2 additions & 2 deletions lib/configuration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def initialize(opts = {})
end

def load_file(config_file)
config = YAML.load_file(config_file)
config = YAML.safe_load_file(config_file, aliases: true, permitted_classes: [Symbol, Regexp])
end

## return full raw configuration
Expand All @@ -37,7 +37,7 @@ def raw

# merge config from environment if present
if ENV["BUSHSLICER_CONFIG"] && !ENV["BUSHSLICER_CONFIG"].strip.empty?
raw_configs << YAML.load(ENV["BUSHSLICER_CONFIG"])
raw_configs << YAML.safe_load(ENV["BUSHSLICER_CONFIG"], aliases: true, permitted_classes: [Symbol, Regexp])
end

# merge all config files
Expand Down
2 changes: 1 addition & 1 deletion lib/openshift/cluster_resource.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def default_user(user=nil, optional: false)
def self.create(by:, spec:, **opts)
if spec.kind_of? String
# assume a file path (TODO: be more intelligent)
spec = YAML.load_file(spec)
spec = YAML.safe_load_file(spec, aliases: true, permitted_classes: [Symbol, Regexp])
end
name = spec["metadata"]["name"] || raise("no name specified for resource")
init_opts = {name: name, env: by.env}
Expand Down
4 changes: 2 additions & 2 deletions lib/openshift/project_resource.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ def self.create(by:, project:, spec:, **opts)
# assume a file path (TODO: be more intelligent)
case spec
when %r{https?://}
spec = YAML.load(Http.get(url: spec, raise_on_error: true)[:response])
spec = YAML.load(Http.get(url: spec, raise_on_error: true)[:response], aliases: true, permitted_classes: [Symbol, Regexp])
else
spec = YAML.load_file(spec)
spec = YAML.safe_load_file(spec, aliases: true, permitted_classes: [Symbol, Regexp])
end
end
name = spec["metadata"]["name"]
Expand Down
2 changes: 1 addition & 1 deletion lib/rules_common.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ def self.load(*sources)
return sources.flatten.reduce({}) { |rules, source|
if source.kind_of? Hash
elsif File.file? source
source = YAML.load_file source
source = YAML.safe_load_file source, aliases: true, permitted_classes: [Symbol, Regexp]
elsif File.directory? source
files = []
if source.end_with? "/"
Expand Down
2 changes: 1 addition & 1 deletion lib/webauto/webconsole_executor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def executor(user)
if File.exist? browser_opts_overrides_file
logger.debug "recreating web console browser for user #{user.name}" \
"using overrides from '#{browser_opts_overrides_file}'"
browser_opts_overrides = YAML.load_file browser_opts_overrides_file
browser_opts_overrides = YAML.safe_load_file browser_opts_overrides_file, aliases: true, permitted_classes: [Symbol, Regexp]
browser_opts.merge! browser_opts_overrides
e.finalize
e = @executors[user.name] = Web4Cucumber.new(**browser_opts)
Expand Down
2 changes: 1 addition & 1 deletion test/lib/launchers/o_c_m_cluster_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ def test_creating_osd
ocm = BushSlicer::OCMCluster.new(options)
ocm.create_osd("osd4-001")
ocpinfo_file = File.join(BushSlicer::Host.localhost.workdir, 'install-dir', 'OCPINFO.yml')
ocpinfo = YAML.load_file(ocpinfo_file)
ocpinfo = YAML.safe_load_file(ocpinfo_file, aliases: true, permitted_classes: [Symbol, Regexp])
assert_equal('osd4-001.w95o.s1.foo.com', ocpinfo['ocp_domain'])
assert_equal('https://console-openshift-console.apps.osd4-001.w95o.s1.foo.com', ocpinfo['ocp_console_url'])
assert_equal('https://api.osd4-001.w95o.s1.foo.com:6443', ocpinfo['ocp_api_url'])
Expand Down
2 changes: 1 addition & 1 deletion tools/launch_instance.rb
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def run
"the template launcher"
c.action do |args, options|
say 'terminating..'
terminate(YAML.load_file args[0])
terminate(YAML.safe_load_file args[0], aliases: true, permitted_classes: [Symbol, Regexp])
end
end

Expand Down
2 changes: 1 addition & 1 deletion tools/polarshift.rb
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ def run
test_run_id = args.first

if options.testcase_file
new_status = YAML.load_file(File.expand_path(options.testcase_file))
new_status = YAML.safe_load_file(File.expand_path(options.testcase_file), aliases: true, permitted_classes: [Symbol, Regexp])
else
new_status = options.status
new_status ||= 'Waiting'
Expand Down
6 changes: 3 additions & 3 deletions tools/stompbus/stompbuscli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def run
setup_global_opts(options)

if options.file
msg = YAML.load_file options.file
msg = YAML.safe_load_file options.file, aliases: true, permitted_classes: [Symbol, Regexp]
msg[:body] = msg[:body].to_json unless String === msg[:body]
elsif options.message
msg = { body: options.message }
Expand All @@ -66,9 +66,9 @@ def run
end

if options.header
msg[:header] = YAML.load options.header
msg[:header] = YAML.safe_load options.header, aliases: true, permitted_classes: [Symbol, Regexp]
elsif ENV["STOMP_HEADER"] && !ENV["STOMP_HEADER"].strip.empty?
msg[:header] = YAML.load ENV["STOMP_HEADER"]
msg[:header] = YAML.safe_load ENV["STOMP_HEADER"], aliases: true, permitted_classes: [Symbol, Regexp]
else
msg[:header] = {}
end
Expand Down
2 changes: 1 addition & 1 deletion tools/tcms_query.rb
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ def report_query_result(options)
table.head = ['case_id', 'summary', 'ruby script', 'auto_by']

query_file = options.query
params = YAML.load_file(query_file)
params = YAML.safe_load_file(query_file, aliases: true, permitted_classes: [Symbol, Regexp])
params_hash = BushSlicer::Collections.hash_symkeys(params['filters'])

# translate tag names into ids
Expand Down