From 5880670d9436544d4c4c422ffe1c3347b850a8ac Mon Sep 17 00:00:00 2001 From: Joe Rafaniello Date: Fri, 19 Jan 2024 09:32:14 -0500 Subject: [PATCH] Add ruby 3.1 to the test matrix Load aliases with safe_load if YAML supports it. Disable YAML.load security cop on versions that don't have safe_load. --- .github/workflows/ci.yaml | 1 + lib/manageiq/appliance_console/message_configuration.rb | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 66cf0aa2..9fd16839 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,6 +12,7 @@ jobs: matrix: ruby-version: - '3.0' + - '3.1' rails-version: - '6.1' - '7.0' diff --git a/lib/manageiq/appliance_console/message_configuration.rb b/lib/manageiq/appliance_console/message_configuration.rb index a99f6f4d..e7e0671c 100644 --- a/lib/manageiq/appliance_console/message_configuration.rb +++ b/lib/manageiq/appliance_console/message_configuration.rb @@ -110,7 +110,13 @@ def configure_messaging_yaml return if file_found?(messaging_yaml_path) - messaging_yaml = YAML.load_file(messaging_yaml_sample_path) + data = File.read(messaging_yaml_sample_path) + messaging_yaml = + if YAML.respond_to?(:safe_load) + YAML.safe_load(data, :aliases => true) + else + YAML.load(data) # rubocop:disable Security/YAMLLoad + end messaging_yaml["production"]["host"] = message_server_host messaging_yaml["production"]["port"] = message_server_port