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

Author: Fryguy

.github/workflows/ci.yaml

@@ -43,6 +43,6 @@ jobs:
     - name: Run tests
       run: bundle exec rake
     - name: Report code coverage
-      if: "${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.0' }}"
+      if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.1' }}
       continue-on-error: true
-      uses: paambaati/codeclimate-action@v6
+      uses: paambaati/codeclimate-action@v8

.whitesource

@@ -1,4 +1,3 @@
 {
   "settingsInheritedFrom": "ManageIQ/whitesource-config@master"
 }
-

.yarn/releases/yarn-4.2.2.cjs renamed to .yarn/releases/yarn-4.3.1.cjs

@@ -4,4 +4,4 @@ enableGlobalCache: true
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.2.2.cjs
+yarnPath: .yarn/releases/yarn-4.3.1.cjs

.yarnrc.yml

@@ -2,9 +2,13 @@
 
 class ManageIQ::Providers::IbmPowerVc::CloudManager::Vm < ManageIQ::Providers::Openstack::CloudManager::Vm
   supports :html5_console do
-    return _("VM Console not supported because VM is not powered on") unless current_state == "on"
-    return _("VM Console not supported because VM is orphaned")       if orphaned?
-    return _("VM Console not supported because VM is archived")       if archived?
+    if current_state != "on"
+      _("VM Console not supported because VM is not powered on")
+    elsif orphaned?
+      _("VM Console not supported because VM is orphaned")
+    elsif archived?
+      _("VM Console not supported because VM is archived")
+    end
   end
   supports :launch_html5_console
 

app/models/manageiq/providers/ibm_power_vc/cloud_manager/vm.rb

@@ -18,5 +18,5 @@
     "npm": ">= 6.0.0",
     "yarn": ">= 0.20.1"
   },
-  "packageManager": "yarn@4.2.2"
+  "packageManager": "yarn@4.3.1"
 }