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

ManageIQ · Nov 4, 2024 · 0a06b22 · 0a06b22
2 parents 2b89bdf + 182421a
commit 0a06b22
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -45,4 +45,4 @@ jobs:
     - name: Report code coverage
       if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.1' }}
       continue-on-error: true
-      uses: paambaati/codeclimate-action@v8
+      uses: paambaati/codeclimate-action@v9
diff --git a/app/models/manageiq/providers/kubernetes/container_manager.rb b/app/models/manageiq/providers/kubernetes/container_manager.rb
@@ -520,9 +520,7 @@ def self.params_for_create
                     :id          => 'options.image_inspector_options.cve_url',
                     :name        => 'options.image_inspector_options.cve_url',
                     :label       => _('CVE Location'),
-                    :helperText  => _('Enables defining a URL path prefix for XCCDF file instead of accessing the default location.
-example: http://my_file_server.org:3333/xccdf_files/
-Expecting to find com.redhat.rhsa-RHEL7.ds.xml.bz2 file there.'),
+                    :helperText  => _('Alternative URL path for the XCCDF file, where a com.redhat.rhsa-RHEL7.ds.xml.bz2 file is expected. example: http://my_file_server.example.org:3333/xccdf_files/'),
                     :placeholder => ::Settings.ems.ems_kubernetes.image_inspector_cve_url
                   },
                 ],

diff --git a/app/models/manageiq/providers/kubernetes/container_manager/options.rb b/app/models/manageiq/providers/kubernetes/container_manager/options.rb
@@ -47,9 +47,8 @@ def advanced_settings
             },
             :cve_url     => {
               :label          => N_('CVE Location'),
-              :help_text      => N_('Enables defining a URL path prefix for XCCDF file instead of accessing the default location.
-  example: http://my_file_server.org:3333/xccdf_files/
-  Expecting to find com.redhat.rhsa-RHEL7.ds.xml.bz2 file there.'),
+              :help_text      => N_('Alternative URL path for the XCCDF file, where a com.redhat.rhsa-RHEL7.ds.xml.bz2 file is expected. example: http://my_file_server.example.org:3333/xccdf_files/'),
+
               # Future versions of image inspector will extend this.
               :global_default => ::Settings.ems.ems_kubernetes.image_inspector_cve_url,
             },