From 8d42bdf9909581744891a6351a30a31dec57bb88 Mon Sep 17 00:00:00 2001 From: Joe Rafaniello Date: Tue, 22 Aug 2023 16:24:13 -0400 Subject: [PATCH 1/4] Fix CI 'if' ruby-version check for 3.0 --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7f36c18..6738fca 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -44,6 +44,6 @@ jobs: - name: Run tests run: bundle exec rake - name: Report code coverage - if: "${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '2.7' }}" + if: "${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.0' }}" continue-on-error: true uses: paambaati/codeclimate-action@v5 From 0395870142cb34c4053e6e204a25b912b89cd592 Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Mon, 18 Sep 2023 11:11:35 -0400 Subject: [PATCH 2/4] Update actions/checkout version to v4 --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6738fca..337aec3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -30,7 +30,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 From 8018b681fccaff5d71dc2341b6d72a1a600996aa Mon Sep 17 00:00:00 2001 From: Adam Grare Date: Tue, 10 Oct 2023 13:37:04 -0400 Subject: [PATCH 3/4] Fix for blockstorage_client changed API The blockstorage_client API changed from positional arguments to a single hash argument. --- .../manageiq/providers/oracle_cloud/inventory/collector.rb | 4 ++-- manageiq-providers-oracle_cloud.gemspec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/manageiq/providers/oracle_cloud/inventory/collector.rb b/app/models/manageiq/providers/oracle_cloud/inventory/collector.rb index f78777c..01c7164 100644 --- 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 index a89c9b6..a35711d 100644 --- 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" spec.add_development_dependency "manageiq-style" spec.add_development_dependency "simplecov", ">= 0.21.2" From 7c3c4215c7c4e82d18c90ed6d44bac73af152ad2 Mon Sep 17 00:00:00 2001 From: Adam Grare Date: Tue, 10 Oct 2023 14:20:45 -0400 Subject: [PATCH 4/4] Update oci-ruby-sdk to only update patch versions oci-ruby-sdk doesn't follow semver and will introduce breaking changes in minor versions. --- manageiq-providers-oracle_cloud.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manageiq-providers-oracle_cloud.gemspec b/manageiq-providers-oracle_cloud.gemspec index a35711d..4cee30e 100644 --- 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.19" + spec.add_dependency "oci", "~> 2.19.0" spec.add_development_dependency "manageiq-style" spec.add_development_dependency "simplecov", ">= 0.21.2"