Merge remote-tracking branch 'origin/master' into quinteros

ManageIQ · Oct 26, 2023 · 453c3b6 · 453c3b6
2 parents effd3e3 + 39e891b
commit 453c3b6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -29,7 +29,7 @@ jobs:
       PGPASSWORD: smartvm
       CC_TEST_REPORTER_ID: "${{ secrets.CC_TEST_REPORTER_ID }}"
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up system
       run: bin/before_install
     - name: Set up Ruby

diff --git a/app/models/manageiq/providers/oracle_cloud/inventory/collector.rb b/app/models/manageiq/providers/oracle_cloud/inventory/collector.rb
@@ -12,7 +12,7 @@ def availability_domains
 
   def boot_volumes
     @boot_volumes ||= availability_domains.flat_map do |availability_domain|
-      blockstorage_client.list_boot_volumes(availability_domain.name, availability_domain.compartment_id).data
+      blockstorage_client.list_boot_volumes(:availability_domain => availability_domain.name, :compartment_id => availability_domain.compartment_id).data
     end
   end
 
@@ -105,7 +105,7 @@ def vnic_attachments_by_instance_id
 
   def volumes
     @volumes ||= compartments.flat_map do |compartment|
-      blockstorage_client.list_volumes(compartment.id).data
+      blockstorage_client.list_volumes(:compartment_id => compartment.id).data
     end
   end
 

diff --git a/manageiq-providers-oracle_cloud.gemspec b/manageiq-providers-oracle_cloud.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "oci", "~> 2.18"
+  spec.add_dependency "oci", "~> 2.19.0"
 
   spec.add_development_dependency "manageiq-style"
   spec.add_development_dependency "simplecov", ">= 0.21.2"