foreman_rh_cloud 11.2.0 → 11.3.0

data/test/jobs/insights_full_sync_test.rb

@@ -65,6 +65,8 @@ class InsightsFullSyncTest < ActiveSupport::TestCase
   end
 
   test 'Hits data is replaced with data from cloud' do
+    Organization.any_instance.stubs(:manifest_expired?).returns(false)
+    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
     InsightsCloud::Async::InsightsFullSync.any_instance.expects(:query_insights_hits).returns(@hits)
 
     InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_hosts_sync)
@@ -79,7 +81,31 @@ class InsightsFullSyncTest < ActiveSupport::TestCase
     assert_equal 1, @host2.insights.hits.count
   end
 
+  test 'Manifest is expired do not run task steps' do
+    Organization.any_instance.stubs(:manifest_expired?).returns(true)
+    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
+
+    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:query_insights_hits).never
+    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_hosts_sync).never
+    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_self).never
+
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync, [@host1.organization])
+  end
+
+  test 'Manifest is deleted do not run task steps' do
+    Organization.any_instance.stubs(:manifest_expired?).returns(false)
+    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(false)
+
+    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:query_insights_hits).never
+    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_hosts_sync).never
+    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_self).never
+
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync, [@host1.organization])
+  end
+
   test 'Hits counters are reset correctly' do
+    Organization.any_instance.stubs(:manifest_expired?).returns(false)
+    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
     InsightsCloud::Async::InsightsFullSync.any_instance.expects(:query_insights_hits).returns(@hits).twice
 
     InsightsCloud::Async::InsightsFullSync.any_instance.stubs(:plan_hosts_sync)
@@ -97,6 +123,8 @@ class InsightsFullSyncTest < ActiveSupport::TestCase
   end
 
   test 'Hits ignoring non-existent hosts' do
+    Organization.any_instance.stubs(:manifest_expired?).returns(false)
+    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
     hits_json = <<-HITS_JSON
     [
         {

data/test/jobs/insights_resolutions_sync_test.rb

@@ -73,6 +73,7 @@ class InsightsResolutionsSyncTest < ActiveSupport::TestCase
   end
 
   test 'Resolutions data is replaced with data from cloud' do
+    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
     InsightsCloud::Async::InsightsResolutionsSync.any_instance.stubs(:query_insights_resolutions).returns(@resolutions)
 
     ForemanTasks.sync_task(InsightsCloud::Async::InsightsResolutionsSync)
@@ -82,7 +83,28 @@ class InsightsResolutionsSyncTest < ActiveSupport::TestCase
     assert_equal 2, @rule.resolutions.count
   end
 
+  test 'Manifest is deleted do not run task steps' do
+    Organization.any_instance.stubs(:manifest_expired?).returns(false)
+    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(false)
+    InsightsCloud::Async::InsightsResolutionsSync.any_instance.expects(:query_insights_resolutions).never
+
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsResolutionsSync)
+
+    assert_equal 0, InsightsResolution.all.count
+  end
+
+  test 'Manifest is expired do not run task steps' do
+    Organization.any_instance.stubs(:manifest_expired?).returns(true)
+    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
+    InsightsCloud::Async::InsightsResolutionsSync.any_instance.expects(:query_insights_resolutions).never
+
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsResolutionsSync)
+
+    assert_equal 0, InsightsResolution.all.count
+  end
+
   test 'Skips pinging the cloud if no rule ids were found' do
+    Katello::UpstreamConnectionChecker.any_instance.stubs(:can_connect?).returns(true)
     InsightsCloud::Async::InsightsResolutionsSync.any_instance.expects(:query_insights_resolutions).never
     InsightsRule.all.delete_all
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 11.2.0
+  version: 11.3.0
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-10 00:00:00.000000000 Z
+date: 2025-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_ansible
@@ -90,7 +90,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/assets/javascripts/foreman_rh_cloud/locale/en/foreman_rh_cloud.js
 - app/assets/javascripts/foreman_rh_cloud/locale/fr/foreman_rh_cloud.js
 - app/assets/javascripts/foreman_rh_cloud/locale/ja/foreman_rh_cloud.js
 - app/assets/javascripts/foreman_rh_cloud/locale/ka/foreman_rh_cloud.js
@@ -220,8 +219,6 @@ files:
 - lib/tasks/insights.rake
 - lib/tasks/rh_cloud_inventory.rake
 - locale/Makefile
-- locale/en/LC_MESSAGES/foreman_rh_cloud.mo
-- locale/en/foreman_rh_cloud.po
 - locale/foreman_rh_cloud.pot
 - locale/fr/LC_MESSAGES/foreman_rh_cloud.mo
 - locale/fr/foreman_rh_cloud.po

data/app/assets/javascripts/foreman_rh_cloud/locale/en/foreman_rh_cloud.js

@@ -1,589 +0,0 @@
- locales['foreman_rh_cloud'] = locales['foreman_rh_cloud'] || {}; locales['foreman_rh_cloud']['en'] = {
-  "domain": "foreman_rh_cloud",
-  "locale_data": {
-    "foreman_rh_cloud": {
-      "": {
-        "Project-Id-Version": "foreman_rh_cloud 1.0.0",
-        "Report-Msgid-Bugs-To": "",
-        "PO-Revision-Date": "2025-02-10 20:07+0100",
-        "Last-Translator": "FULL NAME <EMAIL@ADDRESS>",
-        "Language-Team": "LANGUAGE <LL@li.org>",
-        "Language": "",
-        "MIME-Version": "1.0",
-        "Content-Type": "text/plain; charset=UTF-8",
-        "Content-Transfer-Encoding": "8bit",
-        "Plural-Forms": "nplurals=INTEGER; plural=EXPRESSION;",
-        "lang": "en",
-        "domain": "foreman_rh_cloud",
-        "plural_forms": "nplurals=INTEGER; plural=EXPRESSION;"
-      },
-      " Sync all inventory status": [
-        ""
-      ],
-      "%s organizations": [
-        ""
-      ],
-      "About subscription watch": [
-        ""
-      ],
-      "Actions history": [
-        ""
-      ],
-      "Advanced Inventory Settings": [
-        ""
-      ],
-      "All recommendations are now selected.": [
-        ""
-      ],
-      "Any Organization": [
-        ""
-      ],
-      "Apply Insights recommendations": [
-        ""
-      ],
-      "Automatic inventory upload": [
-        ""
-      ],
-      "Automatic mismatch deletion": [
-        ""
-      ],
-      "Cancel": [
-        ""
-      ],
-      "Clear": [
-        ""
-      ],
-      "Clear Selection": [
-        ""
-      ],
-      "Cloud Connector has been configured however obfuscating host names setting is enabled, it's recommended to disable it": [
-        ""
-      ],
-      "Cloud Connector has been configured however the inventory auto-upload is disabled, it's recommended to enable it": [
-        ""
-      ],
-      "Cloud Connector is in progress": [
-        ""
-      ],
-      "Cloud connector job link": [
-        ""
-      ],
-      "Cloud connector setup has failed: ": [
-        ""
-      ],
-      "Cloud connector setup has started: ": [
-        ""
-      ],
-      "Cloud connector setup is in progress now: ": [
-        ""
-      ],
-      "Completed": [
-        ""
-      ],
-      "Configure": [
-        ""
-      ],
-      "Configure Cloud Connector on given hosts": [
-        ""
-      ],
-      "Configure cloud connector": [
-        ""
-      ],
-      "Connectivity test": [
-        ""
-      ],
-      "Critical": [
-        ""
-      ],
-      "Current page": [
-        ""
-      ],
-      "Disconnected hosts: ": [
-        ""
-      ],
-      "Displays manifest statuses per accessible organizations.": [
-        ""
-      ],
-      "Documentation": [
-        ""
-      ],
-      "Download Report": [
-        ""
-      ],
-      "Download latest report": [
-        ""
-      ],
-      "Enable automatic deletion of mismatched host records from the Red Hat cloud": [
-        ""
-      ],
-      "Enable automatic synchronization of Insights recommendations from the Red Hat cloud": [
-        ""
-      ],
-      "Enable automatic upload of your host inventory to the Red Hat cloud": [
-        ""
-      ],
-      "Enable automatic upload of your hosts inventory to the Red Hat cloud": [
-        ""
-      ],
-      "Enable cloud connector": [
-        ""
-      ],
-      "Enable inventory upload": [
-        ""
-      ],
-      "Encountered an error while trying to access the server:": [
-        ""
-      ],
-      "Exclude installed Packages": [
-        ""
-      ],
-      "Exclude installed packages from being uploaded to the Red Hat cloud": [
-        ""
-      ],
-      "Exclude packages": [
-        ""
-      ],
-      "Exclude packages from being uploaded to the Red Hat cloud": [
-        ""
-      ],
-      "Exit Code: %s": [
-        ""
-      ],
-      "Fetch Insights-related host details": [
-        ""
-      ],
-      "Fetching data about your accounts": [
-        ""
-      ],
-      "Filter..": [
-        ""
-      ],
-      "Fix host": [
-        ""
-      ],
-      "For more info, please visit the": [
-        ""
-      ],
-      "For more information about Insights and Cloud Connector, see:": [
-        ""
-      ],
-      "For more information about the Subscriptions service, see:": [
-        ""
-      ],
-      "Foreman plugin that process & upload data to Red Hat Cloud": [
-        ""
-      ],
-      "Full Screen": [
-        ""
-      ],
-      "Generate and upload report": [
-        ""
-      ],
-      "Generate the report, but do not upload": [
-        ""
-      ],
-      "Generating": [
-        ""
-      ],
-      "Go to Foreman Insights page": [
-        ""
-      ],
-      "Go to first page": [
-        ""
-      ],
-      "Go to last page": [
-        ""
-      ],
-      "Go to next page": [
-        ""
-      ],
-      "Go to previous page": [
-        ""
-      ],
-      "Grab hosts that are missing in RH Cloud": [
-        ""
-      ],
-      "Host Insights recommendations": [
-        ""
-      ],
-      "Host was not uploaded to your RH cloud inventory": [
-        ""
-      ],
-      "Hostname": [
-        ""
-      ],
-      "Hosts with subscription in organization: ": [
-        ""
-      ],
-      "ID of the RHC(Yggdrasil) daemon": [
-        ""
-      ],
-      "Important": [
-        ""
-      ],
-      "Include parameters in insights-client reports": [
-        ""
-      ],
-      "Insights": [
-        ""
-      ],
-      "Inventory": [
-        ""
-      ],
-      "Inventory Auto Upload": [
-        ""
-      ],
-      "Inventory Upload": [
-        ""
-      ],
-      "Inventory sync has failed: ": [
-        ""
-      ],
-      "Inventory sync has started:": [
-        ""
-      ],
-      "Items per page": [
-        ""
-      ],
-      "Knowledgebase article": [
-        ""
-      ],
-      "List of host UUIDs": [
-        ""
-      ],
-      "Loading": [
-        ""
-      ],
-      "Loading...": [
-        ""
-      ],
-      "Low": [
-        ""
-      ],
-      "Manual": [
-        ""
-      ],
-      "Moderate": [
-        ""
-      ],
-      "More details can be found in": [
-        ""
-      ],
-      "Next run: ": [
-        ""
-      ],
-      "No": [
-        ""
-      ],
-      "No recommendations were found for this host!": [
-        ""
-      ],
-      "No results found": [
-        ""
-      ],
-      "No task was found": [
-        ""
-      ],
-      "Not reporting": [
-        ""
-      ],
-      "Nothing to sync, there are no hosts with subscription for this organization.": [
-        ""
-      ],
-      "Notice": [
-        ""
-      ],
-      "Obfuscate IPs": [
-        ""
-      ],
-      "Obfuscate host ipv4 addresses": [
-        ""
-      ],
-      "Obfuscate host names": [
-        ""
-      ],
-      "Obfuscate host names sent to the Red Hat cloud": [
-        ""
-      ],
-      "Obfuscate ipv4 addresses sent to the Red Hat cloud": [
-        ""
-      ],
-      "Oops! Couldn't find organization that matches your query": [
-        ""
-      ],
-      "Organization status": [
-        ""
-      ],
-      "Pagination": [
-        ""
-      ],
-      "Playbook": [
-        ""
-      ],
-      "RH Cloud": [
-        ""
-      ],
-      "RHC daemon id": [
-        ""
-      ],
-      "RHCloud": [
-        ""
-      ],
-      "Read more about it in RH cloud insights": [
-        ""
-      ],
-      "Reboot Required": [
-        ""
-      ],
-      "Recommendation": [
-        ""
-      ],
-      "Recommendation sync has failed: ": [
-        ""
-      ],
-      "Recommendation sync has started: ": [
-        ""
-      ],
-      "Recommendations": [
-        ""
-      ],
-      "Recommendations selected: %s.": [
-        ""
-      ],
-      "Recommendations synced successfully": [
-        ""
-      ],
-      "Reconfigure cloud connector": [
-        ""
-      ],
-      "Red Hat Cloud Inventory": [
-        ""
-      ],
-      "Red Hat Insights": [
-        ""
-      ],
-      "Red Hat Insights Data and Application Security": [
-        ""
-      ],
-      "Red Hat Inventory": [
-        ""
-      ],
-      "Remain": [
-        ""
-      ],
-      "Remediate": [
-        ""
-      ],
-      "Remediation summary": [
-        ""
-      ],
-      "Reporting": [
-        ""
-      ],
-      "Resolution": [
-        ""
-      ],
-      "Run RH Cloud playbook": [
-        ""
-      ],
-      "Run playbook genrated by Red Hat remediations app": [
-        ""
-      ],
-      "Run remediation playbook generated by Insights": [
-        ""
-      ],
-      "Satellite server has %{hits_count} recommendations by Red Hat": [
-        ""
-      ],
-      "Scoped search string for host removal": [
-        ""
-      ],
-      "Select recommendations from all pages": [
-        ""
-      ],
-      "Set the current organization context for the request": [
-        ""
-      ],
-      "Settings": [
-        ""
-      ],
-      "Should import include parameter tags from Foreman?": [
-        ""
-      ],
-      "Show Advanced Settings": [
-        ""
-      ],
-      "Show if system is configured to use local iop-advisor-engine.": [
-        ""
-      ],
-      "Start inventory synchronization": [
-        ""
-      ],
-      "Start report generation": [
-        ""
-      ],
-      "Successfully synced hosts: ": [
-        ""
-      ],
-      "Successfully uploaded to your RH cloud inventory": [
-        ""
-      ],
-      "Sync automatically": [
-        ""
-      ],
-      "Sync recommendations": [
-        ""
-      ],
-      "Synchronize recommendations Automatically": [
-        ""
-      ],
-      "The Foreman inventory upload plugin automatically uploads Foreman host inventory data to the Inventory service of Insights, where it can also be used by the Subscriptions service for subscription reporting. If you use the Subscriptions service, enabling inventory uploads is required.": [
-        ""
-      ],
-      "The Red Hat Hybrid Cloud Console provides a set of cloud services, including Red Hat Insights and Subscriptions, that provide predictive analysis, remediation of issues, and unified subscription reporting for this Foreman instance.": [
-        ""
-      ],
-      "The report file %{filename} doesn't exist": [
-        ""
-      ],
-      "The scheduled process is disabled because this Foreman is configured with the use_local_advisor_engine option.": [
-        ""
-      ],
-      "The server returned the following error: %s": [
-        ""
-      ],
-      "The task failed with the following error:": [
-        ""
-      ],
-      "There are no recommendations for your hosts": [
-        ""
-      ],
-      "This action will also enable automatic reports upload": [
-        ""
-      ],
-      "To enable this reporting for all Foreman organizations, set {uploadButtonName} to on. The data will be reported automatically once per day.": [
-        ""
-      ],
-      "To manually upload the data for a specific organization, select an organization and click {restartButtonName}.": [
-        ""
-      ],
-      "Total risk": [
-        ""
-      ],
-      "Total risks": [
-        ""
-      ],
-      "Upload hits from iop-advisor-engine": [
-        ""
-      ],
-      "Upload hits information": [
-        ""
-      ],
-      "Upload rules related to the hits": [
-        ""
-      ],
-      "Uploading": [
-        ""
-      ],
-      "Value %{value} is not a valid UUID": [
-        ""
-      ],
-      "View all recommendations": [
-        ""
-      ],
-      "View in Red Hat Insights": [
-        ""
-      ],
-      "Wait and %s": [
-        ""
-      ],
-      "Whether the resolution requires reboot": [
-        ""
-      ],
-      "category name": [
-        ""
-      ],
-      "generic": [
-        ""
-      ],
-      "hosts page": [
-        ""
-      ],
-      "impact name": [
-        ""
-      ],
-      "iop payload including resolutions, rules, hits": [
-        ""
-      ],
-      "items": [
-        ""
-      ],
-      "likelihood number": [
-        ""
-      ],
-      "more info": [
-        ""
-      ],
-      "page": [
-        ""
-      ],
-      "per page": [
-        ""
-      ],
-      "publish date (YYYY-MM-DD)": [
-        ""
-      ],
-      "rating": [
-        ""
-      ],
-      "reason": [
-        ""
-      ],
-      "reboot required": [
-        ""
-      ],
-      "resolution description": [
-        ""
-      ],
-      "resolution risk": [
-        ""
-      ],
-      "result url": [
-        ""
-      ],
-      "rule description": [
-        ""
-      ],
-      "rule id": [
-        ""
-      ],
-      "rule title": [
-        ""
-      ],
-      "solution url": [
-        ""
-      ],
-      "summary": [
-        ""
-      ],
-      "total risk": [
-        ""
-      ],
-      "type": [
-        ""
-      ],
-      "upload hits details json": [
-        ""
-      ],
-      "upload resolutions related to the hits": [
-        ""
-      ],
-      "view the job in progress": [
-        ""
-      ],
-      "view the task page for more details": [
-        ""
-      ]
-    }
-  }
-};