foreman_rh_cloud 13.0.9 → 13.0.10

data/app/models/task_output_status.rb

@@ -1,2 +0,0 @@
-class TaskOutputStatus < ApplicationRecord
-end

data/lib/foreman_inventory_upload/async/generate_report_job.rb

@@ -1,61 +0,0 @@
-module ForemanInventoryUpload
-  module Async
-    class GenerateReportJob < ShellProcess
-      def self.output_label(label)
-        "report_for_#{label}"
-      end
-
-      def plan(base_folder, organization_id, disconnected = false, hosts_filter = nil)
-        sequence do
-          super(
-            GenerateReportJob.output_label("#{organization_id}#{hosts_filter.empty? ? nil : "[#{hosts_filter.to_s.parameterize}]"}"),
-            organization_id: organization_id,
-            base_folder: base_folder,
-            hosts_filter: hosts_filter
-          )
-
-          unless content_disconnected?(disconnected)
-            plan_action(
-              QueueForUploadJob,
-              base_folder,
-              ForemanInventoryUpload.facts_archive_name(organization_id, hosts_filter),
-              organization_id
-            )
-          end
-        end
-      end
-
-      def rake_prefix
-        'foreman-' unless Rails.env.development?
-      end
-
-      def command
-        "#{rake_prefix}rake rh_cloud_inventory:report:generate"
-      end
-
-      def env
-        super.merge(
-          'target' => base_folder,
-          'organization_id' => organization_id,
-          'hosts_filter' => hosts_filter
-        )
-      end
-
-      def content_disconnected?(disconnected)
-        disconnected || !Setting[:subscription_connection_enabled]
-      end
-
-      def base_folder
-        input[:base_folder]
-      end
-
-      def organization_id
-        input[:organization_id]
-      end
-
-      def hosts_filter
-        input[:hosts_filter]
-      end
-    end
-  end
-end

data/lib/foreman_inventory_upload/async/progress_output.rb

@@ -1,38 +0,0 @@
-module ForemanInventoryUpload
-  module Async
-    class ProgressOutput
-      def self.get(label)
-        ProgressOutput.new(label, :reader)
-      end
-
-      def self.register(label)
-        TaskOutputLine.where(label: @label).delete_all
-        ProgressOutput.new(label, :writer)
-      end
-
-      def initialize(label, mode)
-        @label = label
-        @mode = mode
-      end
-
-      def full_output
-        TaskOutputLine.where(label: @label).order(:created_at).pluck(:line).join("\n")
-      end
-
-      def write_line(line)
-        TaskOutputLine.create!(label: @label, line: line)
-      end
-
-      def close
-      end
-
-      def status
-        TaskOutputStatus.where(label: @label).pluck(:status).first || ''
-      end
-
-      def status=(status)
-        TaskOutputStatus.upsert({ label: @label, status: status }, unique_by: :label)
-      end
-    end
-  end
-end

data/lib/foreman_inventory_upload/async/shell_process.rb

@@ -1,77 +0,0 @@
-require 'open3'
-
-module ForemanInventoryUpload
-  module Async
-    class ShellProcess < ::Actions::EntryAction
-      include AsyncHelpers
-      include ::ForemanRhCloud::Async::ExponentialBackoff
-
-      def plan(instance_label, more_inputs = {})
-        clear_task_output(instance_label)
-        inputs = more_inputs.merge(instance_label: instance_label)
-        plan_self(inputs)
-      end
-
-      def try_execute
-        klass_name = self.class.name
-        logger.debug("Starting #{klass_name} with label #{instance_label}")
-        progress_output do |progress_output|
-          Open3.popen2e(hash_to_s(env), *preprocess_command(command)) do |_stdin, stdout_stderr, wait_thread|
-            progress_output.status = "Running in pid #{wait_thread.pid}"
-
-            stdout_stderr.each do |out_line|
-              progress_output.write_line(out_line)
-            end
-
-            progress_output.status = wait_thread.value.to_s
-          end
-        end
-        logger.debug("Finished job #{klass_name} with label #{instance_label}")
-
-        assert_task_status(ProgressOutput.get(instance_label).status)
-        done!
-      end
-
-      def command
-      end
-
-      def progress_output
-        progress_output = ProgressOutput.register(instance_label)
-        yield(progress_output)
-      ensure
-        progress_output.close
-      end
-
-      def env
-        {}
-      end
-
-      def logger
-        Foreman::Logging.logger('background')
-      end
-
-      def rescue_strategy_for_self
-        Dynflow::Action::Rescue::Fail
-      end
-
-      def clear_task_output(label)
-        TaskOutputLine.where(label: label).delete_all
-        TaskOutputStatus.where(label: label).delete_all
-      end
-
-      private
-
-      def preprocess_command(command)
-        command.kind_of?(Array) ? command : [command]
-      end
-
-      def instance_label
-        input[:instance_label]
-      end
-
-      def assert_task_status(status)
-        raise Foreman::Exception.new('Process exited with an unknown status: %{status}', status: status) unless status.match?(/pid \d+ exit 0/)
-      end
-    end
-  end
-end

data/test/controllers/reports_controller_test.rb

@@ -1,21 +0,0 @@
-require 'test_plugin_helper'
-
-class ReportsControllerTest < ActionController::TestCase
-  tests ForemanInventoryUpload::ReportsController
-
-  test 'Returns latest report generation status' do
-    progress_output = mock('progress_output')
-    test_org = FactoryBot.create(:organization)
-    ForemanInventoryUpload::Async::ProgressOutput
-      .expects(:get)
-      .with(ForemanInventoryUpload::Async::GenerateReportJob.output_label(test_org.id))
-      .returns(progress_output)
-    progress_output.expects(:full_output).returns('test output')
-
-    get :last, params: { organization_id: test_org.id }, session: set_session_user
-
-    assert_response :success
-    actual = JSON.parse(response.body)
-    assert_equal 'test output', actual['output']
-  end
-end

data/test/controllers/uploads_controller_test.rb

@@ -1,21 +0,0 @@
-require 'test_plugin_helper'
-
-class UploadsControllerTest < ActionController::TestCase
-  tests ForemanInventoryUpload::UploadsController
-
-  test 'Returns latest upload status' do
-    progress_output = mock('progress_output')
-    test_org = FactoryBot.create(:organization)
-    ForemanInventoryUpload::Async::ProgressOutput
-      .expects(:get)
-      .with(ForemanInventoryUpload::Async::UploadReportDirectJob.output_label(test_org.id))
-      .returns(progress_output)
-    progress_output.expects(:full_output).returns('test output')
-
-    get :last, params: { organization_id: test_org.id }, session: set_session_user
-
-    assert_response :success
-    actual = JSON.parse(response.body)
-    assert_equal 'test output', actual['output']
-  end
-end

data/test/jobs/generate_report_job_test.rb

@@ -1,146 +0,0 @@
-require 'test_plugin_helper'
-require 'foreman_tasks/test_helpers'
-
-class GenerateReportJobTest < ActiveSupport::TestCase
-  include Dynflow::Testing::Factories
-  include Dynflow::Testing::Assertions
-
-  let(:organization) { FactoryBot.create(:organization) }
-  let(:base_folder) { Dir.mktmpdir }
-
-  setup do
-    # Stub settings
-    Setting.stubs(:[]).with(:subscription_connection_enabled).returns(true)
-    Setting.stubs(:[]).with("foreman_tasks_sync_task_timeout").returns(120)
-    Setting.stubs(:[]).with(:content_default_http_proxy).returns(nil)
-    Setting.stubs(:[]).with(:http_proxy).returns(nil)
-  end
-
-  teardown do
-    FileUtils.remove_entry base_folder if Dir.exist?(base_folder)
-  end
-
-  test 'disconnected parameter defaults to false' do
-    # When disconnected defaults to false and subscription_connection is enabled,
-    # QueueForUploadJob should be scheduled
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::GenerateReportJob,
-      base_folder,
-      organization.id
-    )
-
-    assert_action_planned(action, ForemanInventoryUpload::Async::QueueForUploadJob)
-  end
-
-  test 'disconnected parameter can be set to true explicitly' do
-    # When disconnected is explicitly true, QueueForUploadJob should NOT be scheduled
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::GenerateReportJob,
-      base_folder,
-      organization.id,
-      true
-    )
-
-    refute_action_planned(action, ForemanInventoryUpload::Async::QueueForUploadJob)
-  end
-
-  test 'disconnected parameter can be set to false explicitly' do
-    # When disconnected is explicitly false and subscription_connection is enabled,
-    # QueueForUploadJob should be scheduled
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::GenerateReportJob,
-      base_folder,
-      organization.id,
-      false
-    )
-
-    assert_action_planned(action, ForemanInventoryUpload::Async::QueueForUploadJob)
-  end
-
-  test 'skips upload when subscription_connection_enabled is false' do
-    Setting.stubs(:[]).with(:subscription_connection_enabled).returns(false)
-
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::GenerateReportJob,
-      base_folder,
-      organization.id,
-      false
-    )
-
-    refute_action_planned(action, ForemanInventoryUpload::Async::QueueForUploadJob)
-  end
-
-  test 'schedules upload when disconnected is false and subscription_connection is enabled' do
-    Setting.stubs(:[]).with(:subscription_connection_enabled).returns(true)
-
-    expected_archive_name = ForemanInventoryUpload.facts_archive_name(organization.id, nil)
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::GenerateReportJob,
-      base_folder,
-      organization.id,
-      false
-    )
-
-    assert_action_planned_with(
-      action,
-      ForemanInventoryUpload::Async::QueueForUploadJob,
-      base_folder,
-      expected_archive_name,
-      organization.id
-    )
-  end
-
-  test 'handles hosts_filter parameter' do
-    hosts_filter = 'name~test'
-    expected_archive_name = ForemanInventoryUpload.facts_archive_name(organization.id, hosts_filter)
-
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::GenerateReportJob,
-      base_folder,
-      organization.id,
-      false,
-      hosts_filter
-    )
-
-    assert_action_planned_with(
-      action,
-      ForemanInventoryUpload::Async::QueueForUploadJob,
-      base_folder,
-      expected_archive_name,
-      organization.id
-    )
-  end
-
-  test 'output_label generates correct label' do
-    label = ForemanInventoryUpload::Async::GenerateReportJob.output_label('test_org')
-    assert_equal 'report_for_test_org', label
-  end
-
-  test 'output_label with filter includes parameterized filter' do
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::GenerateReportJob,
-      base_folder,
-      organization.id,
-      false,
-      'name~production'
-    )
-
-    # The output label should include organization id and parameterized filter
-    expected_label = "report_for_#{organization.id}[name-production]"
-    assert_equal expected_label, action.input[:instance_label]
-  end
-
-  test 'output_label without filter includes only organization id' do
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::GenerateReportJob,
-      base_folder,
-      organization.id,
-      false,
-      ''
-    )
-
-    # The output label should include only organization id when filter is empty
-    expected_label = "report_for_#{organization.id}"
-    assert_equal expected_label, action.input[:instance_label]
-  end
-end

data/test/unit/shell_process_job_test.rb

@@ -1,29 +0,0 @@
-require 'test_plugin_helper'
-require 'foreman_tasks/test_helpers'
-
-class ShellProcessJobTest < ActiveSupport::TestCase
-  class TestProcessJob < ForemanInventoryUpload::Async::ShellProcess
-    def command
-      'echo testing env: $testenv'
-    end
-
-    def env
-      super.merge(
-        'testenv' => 'test_val'
-      )
-    end
-  end
-
-  include ForemanTasks::TestHelpers::WithInThreadExecutor
-  include FolderIsolation
-
-  test 'Runs a process with environment vars' do
-    label = Foreman.uuid
-    ForemanTasks.sync_task(TestProcessJob, label)
-
-    progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)
-
-    assert_match(/test_val/, progress_output.full_output)
-    assert_match(/exit 0/, progress_output.status)
-  end
-end

data/webpack/ForemanInventoryUpload/Components/Dashboard/DashboardActions.js

@@ -1,88 +0,0 @@
-import { API } from 'foremanReact/redux/API';
-import { selectActiveTab } from './DashboardSelectors';
-import { inventoryUrl } from '../../ForemanInventoryHelpers';
-import {
-  INVENTORY_POLLING_START,
-  INVENTORY_POLLING_STOP,
-  INVENTORY_POLLING,
-  INVENTORY_TAB_CHANGED,
-  INVENTORY_POLLING_ERROR,
-  INVENTORY_REPORTS_DOWNLOAD,
-  INVENTORY_TOGGLE_TERMINAL_FULL_SCREEN,
-} from './DashboardConstants';
-
-export const startPolling = (accountID, pollingProcessID) => ({
-  type: INVENTORY_POLLING_START,
-  payload: {
-    accountID,
-    pollingProcessID,
-  },
-});
-
-export const stopPolling = (accountID, pollingProcessID) => dispatch => {
-  clearInterval(pollingProcessID);
-  dispatch({
-    type: INVENTORY_POLLING_STOP,
-    payload: {
-      accountID,
-    },
-  });
-};
-
-export const fetchLogs = accountID => async (dispatch, getState) => {
-  const activeTab = selectActiveTab(getState(), accountID);
-  try {
-    const processController = activeTab === 'uploading' ? 'uploads' : 'reports';
-    const {
-      data: { output, scheduled },
-    } = await API.get(inventoryUrl(`${accountID}/${processController}/last`));
-    const outputArray = output.split('\n');
-    dispatch({
-      type: INVENTORY_POLLING,
-      payload: {
-        accountID,
-        activeTab,
-        logs: outputArray,
-        scheduled,
-      },
-    });
-  } catch (error) {
-    dispatch({
-      type: INVENTORY_POLLING_ERROR,
-      payload: {
-        accountID,
-        activeTab,
-        error: error.message,
-      },
-    });
-  }
-};
-
-export const setActiveTab = (accountID, tabName) => ({
-  type: INVENTORY_TAB_CHANGED,
-  payload: {
-    accountID,
-    activeTab: tabName,
-  },
-});
-
-export const downloadReports = accountID => {
-  window.open(inventoryUrl(`${accountID}/uploads/file`), '_blank');
-  return {
-    type: INVENTORY_REPORTS_DOWNLOAD,
-    payload: {
-      accountID,
-    },
-  };
-};
-
-export const toggleFullScreen = accountID => (dispatch, getState) => {
-  const activeTab = selectActiveTab(getState(), accountID);
-  dispatch({
-    type: INVENTORY_TOGGLE_TERMINAL_FULL_SCREEN,
-    payload: {
-      activeTab,
-      accountID,
-    },
-  });
-};

data/webpack/ForemanInventoryUpload/Components/Dashboard/DashboardConstants.js

@@ -1,9 +0,0 @@
-export const INVENTORY_POLLING = 'INVENTORY_POLLING';
-export const INVENTORY_POLLING_START = 'INVENTORY_POLLING_START';
-export const INVENTORY_POLLING_STOP = 'INVENTORY_POLLING_STOP';
-export const INVENTORY_POLLING_ERROR = 'INVENTORY_POLLING_ERROR';
-export const INVENTORY_TAB_CHANGED = 'INVENTORY_TAB_CHANGED';
-export const INVENTORY_REPORTS_DOWNLOAD = 'INVENTORY_REPORTS_DOWNLOAD';
-export const INVENTORY_PROCESS_RESTART = 'INVENTORY_PROCESS_RESTART';
-export const INVENTORY_TOGGLE_TERMINAL_FULL_SCREEN =
-  'INVENTORY_TOGGLE_TERMINAL_FULL_SCREEN';

data/webpack/ForemanInventoryUpload/Components/Dashboard/DashboardReducer.js

@@ -1,68 +0,0 @@
-import Immutable from 'seamless-immutable';
-
-import {
-  INVENTORY_POLLING_START,
-  INVENTORY_POLLING,
-  INVENTORY_TAB_CHANGED,
-  INVENTORY_POLLING_ERROR,
-  INVENTORY_TOGGLE_TERMINAL_FULL_SCREEN,
-} from './DashboardConstants';
-
-const initialState = Immutable({});
-
-export default (state = initialState, action) => {
-  const {
-    payload: {
-      accountID,
-      pollingProcessID,
-      logs,
-      error,
-      activeTab,
-      scheduled,
-    } = {},
-  } = action;
-
-  const getTabState = () =>
-    state[accountID] ? state[accountID][activeTab] : {};
-  switch (action.type) {
-    case INVENTORY_POLLING_START:
-      return state.setIn([accountID], {
-        ...state[accountID],
-        pollingProcessID,
-        activeTab: 'generating',
-      });
-    case INVENTORY_POLLING:
-      return state.setIn([accountID], {
-        ...state[accountID],
-        [activeTab]: {
-          ...getTabState(),
-          logs,
-          scheduled,
-          error: null,
-        },
-      });
-    case INVENTORY_TAB_CHANGED:
-      return state.setIn([accountID], {
-        ...state[accountID],
-        activeTab,
-      });
-    case INVENTORY_POLLING_ERROR:
-      return state.setIn([accountID], {
-        ...state[accountID],
-        [activeTab]: {
-          ...getTabState(),
-          error,
-        },
-      });
-    case INVENTORY_TOGGLE_TERMINAL_FULL_SCREEN:
-      return state.setIn([accountID], {
-        ...state[accountID],
-        [activeTab]: {
-          ...getTabState(),
-          showFullScreen: !state[accountID][activeTab].showFullScreen,
-        },
-      });
-    default:
-      return state;
-  }
-};

data/webpack/ForemanInventoryUpload/Components/Dashboard/DashboardSelectors.js

@@ -1,17 +0,0 @@
-import { selectForemanInventoryUpload } from '../../../ForemanRhCloudSelectors';
-
-export const selectDashboard = (state, accountID) =>
-  selectForemanInventoryUpload(state).dashboard[accountID] || {};
-export const selectUploading = (state, accountID) =>
-  selectDashboard(state, accountID).uploading;
-export const selectGenerating = (state, accountID) =>
-  selectDashboard(state, accountID).generating;
-export const selectPollingProcessID = (state, accountID) =>
-  selectDashboard(state, accountID).pollingProcessID;
-export const selectActiveTab = (state, accountID) =>
-  selectDashboard(state, accountID).activeTab || 'generating';
-export const selectShowFullScreen = (state, accountID) => {
-  const activeTab = selectActiveTab(state, accountID);
-  const tabProperties = selectDashboard(state, accountID)[activeTab];
-  return tabProperties ? tabProperties.showFullScreen || false : false;
-};

data/webpack/ForemanInventoryUpload/Components/Dashboard/__tests__/DashboardActions.test.js

@@ -1,51 +0,0 @@
-import { testActionSnapshotWithFixtures } from '@theforeman/test';
-import { API } from 'foremanReact/redux/API';
-import {
-  startPolling,
-  stopPolling,
-  fetchLogs,
-  setActiveTab,
-  downloadReports,
-  toggleFullScreen,
-} from '../DashboardActions';
-import {
-  pollingProcessID,
-  serverMock,
-  activeTab,
-  accountID,
-} from '../Dashboard.fixtures';
-import { rhCloudStateWrapper } from '../../../../ForemanRhCloudTestHelpers';
-
-jest.mock('foremanReact/redux/API');
-API.get.mockImplementation(() => serverMock);
-
-const runWithGetState = (state, action, params) => dispatch => {
-  const getState = () => rhCloudStateWrapper({ dashboard: state });
-  action(params)(dispatch, getState);
-};
-
-const fixtures = {
-  'should startPolling': () => startPolling(accountID, pollingProcessID),
-  'should fetchLogs': () =>
-    runWithGetState({ activeTab: 'uploads' }, fetchLogs, accountID),
-  'should stopPolling': () => stopPolling(accountID, pollingProcessID),
-  'should setActiveTab': () => setActiveTab(accountID, activeTab),
-  'should downloadReports': () => downloadReports(accountID),
-  'should toggleFullScreen': () =>
-    runWithGetState({ activeTab: 'reports' }, toggleFullScreen, accountID),
-};
-
-describe('Dashboard actions', () => {
-  const { open } = window;
-
-  beforeAll(() => {
-    delete window.open;
-    window.open = jest.fn();
-  });
-
-  afterAll(() => {
-    window.open = open;
-  });
-
-  return testActionSnapshotWithFixtures(fixtures);
-});

data/webpack/ForemanInventoryUpload/Components/Dashboard/__tests__/DashboardIntegration.test.js

@@ -1,17 +0,0 @@
-import React from 'react';
-import { IntegrationTestHelper } from '@theforeman/test';
-
-import Dashboard from '../Dashboard';
-import reducers from '../../../../ForemanRhCloudReducers';
-import { accountID } from '../Dashboard.fixtures';
-
-describe('Dashboard integration test', () => {
-  it('should flow', async () => {
-    const integrationTestHelper = new IntegrationTestHelper(reducers);
-    const component = integrationTestHelper.mount(
-      <Dashboard accountID={accountID} />
-    );
-    component.update();
-    /** Create a Flow test */
-  });
-});