foreman_rh_cloud 5.0.37 → 5.0.38

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '5.0.37'.freeze
+  VERSION = '5.0.38'.freeze
 end

data/lib/insights_cloud/async/cloud_connector_announce_task.rb

@@ -0,0 +1,44 @@
+module InsightsCloud
+  module Async
+    class CloudConnectorAnnounceTask < ::Actions::EntryAction
+      def self.subscribe
+        Actions::RemoteExecution::RunHostsJob
+      end
+
+      def self.connector_feature_id
+        @connector_feature_id ||= RemoteExecutionFeature.feature!(ForemanRhCloud::CloudConnector::CLOUD_CONNECTOR_FEATURE).id
+      end
+
+      def plan(job_invocation)
+        return unless connector_playbook_job?(job_invocation)
+
+        plan_self
+      end
+
+      def finalize
+        Organization.unscoped.each do |org|
+          presence = ForemanRhCloud::CloudPresence.new(org, logger)
+          presence.announce_to_sources
+        rescue StandardError => ex
+          logger.warn(ex)
+        end
+      end
+
+      def rescue_strategy_for_self
+        Dynflow::Action::Rescue::Skip
+      end
+
+      def connector_playbook_job?(job_invocation)
+        job_invocation&.remote_execution_feature_id == connector_feature_id
+      end
+
+      def connector_feature_id
+        self.class.connector_feature_id
+      end
+
+      def logger
+        action_logger
+      end
+    end
+  end
+end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "5.0.37",
+  "version": "5.0.38",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {
@@ -22,14 +22,14 @@
     "url": "http://projects.theforeman.org/projects/foreman_rh_cloud/issues"
   },
   "peerDependencies": {
-    "@theforeman/vendor": "~8.16.0"
+    "@theforeman/vendor": ">=8.16.0"
   },
   "devDependencies": {
     "@babel/core": "~7.7.0",
-    "@theforeman/builder": "~8.16.0",
-    "@theforeman/stories": "~8.16.0",
-    "@theforeman/test": "~8.16.0",
-    "@theforeman/eslint-plugin-foreman": "~8.16.0",
+    "@theforeman/builder": ">=8.16.0",
+    "@theforeman/stories": ">=8.16.0",
+    "@theforeman/test": ">=8.16.0",
+    "@theforeman/eslint-plugin-foreman": ">=8.16.0",
     "babel-eslint": "~10.0.0",
     "eslint": "~6.7.2",
     "eslint-plugin-spellcheck": "~0.0.17",

data/test/jobs/cloud_connector_announce_task_test.rb

@@ -0,0 +1,125 @@
+require 'json'
+require 'test_plugin_helper'
+require 'foreman_tasks/test_helpers'
+require "#{ForemanTasks::Engine.root}/test/support/dummy_dynflow_action"
+
+class CloudConnectorAnnounceTaskTest < ActiveSupport::TestCase
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
+
+  setup do
+    RemoteExecutionFeature.register(
+      :ansible_configure_cloud_connector,
+      N_('Configure Cloud Connector on given hosts'),
+      :description => N_('Configure Cloud Connector on given hosts'),
+      :proxy_selector_override => ::RemoteExecutionProxySelector::INTERNAL_PROXY
+    )
+
+    @job_invocation = generate_job_invocation(:ansible_configure_cloud_connector)
+
+    # reset connector feature ID cache
+    InsightsCloud::Async::CloudConnectorAnnounceTask.instance_variable_set(:@connector_feature_id, nil)
+  end
+
+  test 'It executes cloud presence announcer' do
+    ForemanRhCloud::CloudPresence.any_instance.expects(:announce_to_sources).times(Organization.unscoped.count)
+
+    ForemanTasks.sync_task(InsightsCloud::Async::CloudConnectorAnnounceTask, @job_invocation)
+  end
+
+  private
+
+  def generate_job_invocation(feature_name)
+    job_template = FactoryBot.build(
+      :job_template,
+      :template => 'BLEH'
+    )
+    feature = RemoteExecutionFeature.feature!(feature_name).id
+
+    job_invocation = FactoryBot.create(
+      :job_invocation,
+      remote_execution_feature_id: feature,
+      task_id: FactoryBot.create(:dynflow_task).id
+    )
+
+    job_template.template_inputs << playbook_url_input = FactoryBot.build(:template_input,
+      :name => 'playbook_url',
+      :input_type => 'user',
+      :required => true)
+    job_template.template_inputs << report_url_input = FactoryBot.build(:template_input,
+      :name => 'report_url',
+      :input_type => 'user',
+      :required => true)
+    job_template.template_inputs << correlation_id_input = FactoryBot.build(:template_input,
+      :name => 'correlation_id',
+      :input_type => 'user',
+      :required => true)
+    job_template.template_inputs << report_interval_input = FactoryBot.build(:template_input,
+      :name => 'report_interval',
+      :input_type => 'user',
+      :required => true)
+
+    template_invocation = FactoryBot.build(:template_invocation,
+      :template => job_template,
+      :job_invocation => job_invocation
+    )
+
+    template_invocation.input_values << FactoryBot.create(
+      :template_invocation_input_value,
+      :template_invocation => template_invocation,
+      :template_input => playbook_url_input,
+      :value => 'http://example.com/TEST_PLAYBOOK'
+    )
+    template_invocation.input_values << FactoryBot.create(
+      :template_invocation_input_value,
+      :template_invocation => template_invocation,
+      :template_input => report_url_input,
+      :value => 'http://example.com/TEST_REPORT'
+    )
+    template_invocation.input_values << FactoryBot.create(
+      :template_invocation_input_value,
+      :template_invocation => template_invocation,
+      :template_input => correlation_id_input,
+      :value => 'TEST_CORRELATION'
+    )
+    template_invocation.input_values << FactoryBot.create(
+      :template_invocation_input_value,
+      :template_invocation => template_invocation,
+      :template_input => report_interval_input,
+      :value => '1'
+    )
+
+    @host1 = FactoryBot.create(:host, :with_insights_hits, name: 'host1')
+    @host1.insights.uuid = 'TEST_UUID1'
+    @host1.insights.save!
+    @host2 = FactoryBot.create(:host, :with_insights_hits, name: 'host2')
+    @host2.insights.uuid = 'TEST_UUID2'
+    @host2.insights.save!
+
+    targeting = FactoryBot.create(:targeting, hosts: [@host1, @host2])
+    job_invocation.targeting = targeting
+    job_invocation.save!
+
+    job_invocation.template_invocations << FactoryBot.create(
+      :template_invocation,
+      run_host_job_task: FactoryBot.create(:dynflow_task),
+      host_id: @host1.id
+    )
+    job_invocation.template_invocations << FactoryBot.create(
+      :template_invocation,
+      run_host_job_task: FactoryBot.create(:dynflow_task),
+      host_id: @host2.id
+    )
+
+    fake_output = (1..5).map do |i|
+      { 'timestamp' => (Time.now - (5 - i)).to_f, 'output' => "#{i}\n" }
+    end
+    Support::DummyDynflowAction.any_instance.stubs(:live_output).returns(fake_output)
+    Support::DummyDynflowAction.any_instance.stubs(:exit_status).returns(0)
+
+    job_invocation
+  end
+
+  def read_jsonl(jsonl)
+    jsonl.lines.map { |l| JSON.parse(l) }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 5.0.37
+  version: 5.0.38
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-25 00:00:00.000000000 Z
+date: 2022-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -182,6 +182,7 @@ files:
 - app/views/layouts/foreman_rh_cloud/application.html.erb
 - config/Gemfile.lock.gh_test
 - config/database.yml.example
+- config/package-lock.json
 - config/package-lock.json.gh_test
 - config/package-lock.json.plugin
 - config/rh_cert-api_chain.pem
@@ -221,6 +222,7 @@ files:
 - lib/foreman_rh_cloud/engine.rb
 - lib/foreman_rh_cloud/version.rb
 - lib/insights_cloud.rb
+- lib/insights_cloud/async/cloud_connector_announce_task.rb
 - lib/insights_cloud/async/connector_playbook_execution_reporter_task.rb
 - lib/insights_cloud/async/insights_client_status_aging.rb
 - lib/insights_cloud/async/insights_full_sync.rb
@@ -255,6 +257,7 @@ files:
 - test/controllers/uploads_settings_controller_test.rb
 - test/factories/insights_factories.rb
 - test/factories/inventory_upload_factories.rb
+- test/jobs/cloud_connector_announce_task_test.rb
 - test/jobs/connector_playbook_execution_reporter_task_test.rb
 - test/jobs/insights_client_status_aging_test.rb
 - test/jobs/insights_full_sync_test.rb
@@ -672,7 +675,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Summary of ForemanRhCloud.
@@ -688,33 +691,34 @@ test_files:
 - test/controllers/uploads_settings_controller_test.rb
 - test/factories/insights_factories.rb
 - test/factories/inventory_upload_factories.rb
-- test/jobs/insights_client_status_aging_test.rb
-- test/jobs/inventory_scheduled_sync_test.rb
-- test/jobs/upload_report_job_test.rb
+- test/jobs/cloud_connector_announce_task_test.rb
 - test/jobs/connector_playbook_execution_reporter_task_test.rb
+- test/jobs/insights_client_status_aging_test.rb
 - test/jobs/insights_full_sync_test.rb
 - test/jobs/insights_resolutions_sync_test.rb
 - test/jobs/insights_rules_sync_test.rb
 - test/jobs/inventory_full_sync_test.rb
 - test/jobs/inventory_hosts_sync_test.rb
+- test/jobs/inventory_scheduled_sync_test.rb
 - test/jobs/inventory_self_host_sync_test.rb
+- test/jobs/upload_report_job_test.rb
 - test/models/insights_client_report_status_test.rb
 - test/test_plugin_helper.rb
 - test/unit/archived_report_generator_test.rb
 - test/unit/fact_helpers_test.rb
+- test/unit/foreman_rh_cloud_self_host_test.rb
 - test/unit/insights_facet_test.rb
 - test/unit/metadata_generator_test.rb
+- test/unit/playbook_progress_generator_test.rb
 - test/unit/rh_cloud_http_proxy_test.rb
 - test/unit/rh_cloud_permissions_test.rb
 - test/unit/services/foreman_rh_cloud/branch_info_test.rb
-- test/unit/services/foreman_rh_cloud/insights_status_cleaner_test.rb
 - test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb
 - test/unit/services/foreman_rh_cloud/cloud_status_service_test.rb
 - test/unit/services/foreman_rh_cloud/hit_remediations_retriever_test.rb
+- test/unit/services/foreman_rh_cloud/insights_status_cleaner_test.rb
 - test/unit/services/foreman_rh_cloud/template_renderer_helper_test.rb
 - test/unit/services/foreman_rh_cloud/url_remediations_retriever_test.rb
 - test/unit/shell_process_job_test.rb
 - test/unit/slice_generator_test.rb
 - test/unit/tags_generator_test.rb
-- test/unit/foreman_rh_cloud_self_host_test.rb
-- test/unit/playbook_progress_generator_test.rb