Merge pull request #707 from jrafanie/ruby31

Support ruby 3.1
ManageIQ · Oct 16, 2023 · 9a60db5 · 9a60db5
2 parents 26c9501 + d38a7c6
commit 9a60db5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/db/migrate/20180606155924_move_ansible_container_secrets_into_database.rb b/db/migrate/20180606155924_move_ansible_container_secrets_into_database.rb
@@ -14,6 +14,10 @@ def up
     update_authentications
   end
 
+  def self.read_token(file)
+    File.read(file)
+  end
+
   private
 
   def containerized?
@@ -88,7 +92,7 @@ def update_or_create_authentication!(find_args, update_args)
   def request_params
     {
       'Accept'         => "application/json",
-      'Authorization'  => "Bearer #{File.read(TOKEN_FILE)}",
+      'Authorization'  => "Bearer #{self.class.read_token(TOKEN_FILE)}",
       :ssl_ca_cert     => CA_CERT_FILE,
       :ssl_verify_mode => OpenSSL::SSL::VERIFY_PEER
     }

diff --git a/manageiq-schema.gemspec b/manageiq-schema.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ancestry"
   spec.add_dependency "activerecord-id_regions", "~> 0.3.2"
   spec.add_dependency "linux_admin",             "~> 2.0"
-  spec.add_dependency "manageiq-password",       "< 2"
+  spec.add_dependency "manageiq-password",       ">= 1.2.0", "< 2"
   spec.add_dependency "more_core_extensions",    ">= 3.5", "< 5"
   spec.add_dependency "pg"
   spec.add_dependency "rails",                   ">=6.0.4", "<7.0"

diff --git a/spec/migrations/20180606155924_move_ansible_container_secrets_into_database_spec.rb b/spec/migrations/20180606155924_move_ansible_container_secrets_into_database_spec.rb
@@ -111,7 +111,7 @@
   end
 
   def expect_request
-    expect(File).to receive(:read).with(token_path).and_return("totally-a-token")
+    expect(described_class).to receive(:read_token).with(token_path).and_return("totally-a-token")
     response = double("RequestIO", :read => secret_json)
     expect(uri_stub).to receive(:open).with({
       'Accept'         => "application/json",

diff --git a/spec/support/yaml_alias_load_as_unsafe_load.rb b/spec/support/yaml_alias_load_as_unsafe_load.rb
@@ -0,0 +1,4 @@
+if Psych::VERSION >= "4.0"
+  require 'yaml'
+  YAML.singleton_class.alias_method :load, :unsafe_load
+end