foreman_rh_cloud 3.0.17 → 3.0.18

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '3.0.17'.freeze
+  VERSION = '3.0.18'.freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "3.0.17",
+  "version": "3.0.18",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {

data/test/controllers/accounts_controller_test.rb

@@ -14,17 +14,13 @@ class AccountsControllerTest < ActionController::TestCase
     upload_label = ForemanInventoryUpload::Async::UploadReportJob.output_label(test_org.id)
     upload_output = ForemanInventoryUpload::Async::ProgressOutput.register(upload_label)
     upload_output.status = 'upload_status_test'
-    FactoryBot.create(:setting, :name => 'allow_auto_inventory_upload', :value => true)
-    assert_equal true, Setting[:allow_auto_inventory_upload]
 
     get :index, session: set_session_user
 
     assert_response :success
     actual = JSON.parse(response.body)
-    actual_account_statuses = actual['accounts'][test_org.id.to_s]
+    actual_account_statuses = actual['accounts'][test_org.label]
     assert_equal 'generate_status_test', actual_account_statuses['generate_report_status']
     assert_equal 'upload_status_test', actual_account_statuses['upload_report_status']
-
-    assert_equal true, actual['autoUploadEnabled']
   end
 end

data/test/controllers/uploads_controller_test.rb

@@ -18,17 +18,4 @@ class UploadsControllerTest < ActionController::TestCase
     actual = JSON.parse(response.body)
     assert_equal 'test output', actual['output']
   end
-
-  test 'should update allow_auto_inventory_upload setting' do
-    FactoryBot.create(:setting, :name => 'allow_auto_inventory_upload', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => false)
-
-    assert_equal false, Setting[:allow_auto_inventory_upload]
-
-    post :auto_upload, params: { value: true }, session: set_session_user
-
-    assert_response :success
-    actual = JSON.parse(response.body)
-    assert_equal true, actual['autoUploadEnabled']
-    assert_equal true, Setting[:allow_auto_inventory_upload]
-  end
 end

data/test/controllers/uploads_settings_controller_test.rb

@@ -0,0 +1,31 @@
+require 'test_plugin_helper'
+
+class UploadsSettingsControllerTest < ActionController::TestCase
+  tests ForemanInventoryUpload::UploadsSettingsController
+
+  test 'should get upload inventory settings' do
+    FactoryBot.create(:setting, :name => 'allow_auto_inventory_upload', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => true)
+
+    assert_equal true, Setting[:allow_auto_inventory_upload]
+
+    get :index, session: set_session_user
+
+    assert_response :success
+    actual = JSON.parse(response.body)
+    assert_equal true, actual['autoUploadEnabled']
+    assert_equal true, Setting[:allow_auto_inventory_upload]
+  end
+
+  test 'should update allow_auto_inventory_upload setting' do
+    FactoryBot.create(:setting, :name => 'allow_auto_inventory_upload', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => false)
+
+    assert_equal false, Setting[:allow_auto_inventory_upload]
+
+    post :set_advanced_setting, params: { setting: :allow_auto_inventory_upload, value: true }, session: set_session_user
+
+    assert_response :success
+    actual = JSON.parse(response.body)
+    assert_equal true, actual['autoUploadEnabled']
+    assert_equal true, Setting[:allow_auto_inventory_upload]
+  end
+end

data/test/test_plugin_helper.rb

@@ -24,3 +24,16 @@ module FolderIsolation
     end
   end
 end
+
+module KatelloLocationFix
+  extend ActiveSupport::Concern
+
+  included do
+    setup do
+      FactoryBot.create(:setting, name: 'default_location_subscribed_hosts')
+      FactoryBot.create(:setting, name: 'default_location_puppet_content')
+      Setting[:default_location_subscribed_hosts] = Location.first.title
+      Setting[:default_location_puppet_content] = Location.first.title
+    end
+  end
+end

data/test/unit/services/foreman_rh_cloud/branch_info_test.rb

@@ -46,15 +46,15 @@ class BranchInfoTest < ActiveSupport::TestCase
 
     labels = ::ForemanRhCloud::BranchInfo.new.generate('a1', @host, 'branch', 'foo')[:labels]
 
-    org_label = labels.find { |label| label[:key] == 'Organization' }
-    loc_label = labels.find { |label| label[:key] == 'Location' }
+    org_label = labels.find { |label| label[:key] == 'organization' }
+    loc_label = labels.find { |label| label[:key] == 'location' }
     assert_equal @host.organization.title, org_label[:value]
     assert_equal @host.location.title, loc_label[:value]
 
-    hg_label = labels.find { |label| label[:key] == 'Host Group' }
-    host_colections = labels.select { |label| label[:key] == 'Host Collection' }
+    hg_label = labels.find { |label| label[:key] == 'hostgroup' }
+    host_colections = labels.select { |label| label[:key] == 'host collection' }
     assert_equal @host.hostgroup.name, hg_label[:value]
     assert_equal 2, host_colections.count
-    refute_empty labels.select { |label| label[:namespace] == 'SatelliteParameter' }
+    refute_empty labels.select { |label| label[:namespace] == 'satellite_parameter' }
   end
 end

data/test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb

@@ -4,20 +4,55 @@ require 'puma/null_io'
 class CloudRequestForwarderTest < ActiveSupport::TestCase
   setup do
     @forwarder = ::ForemanRhCloud::CloudRequestForwarder.new
+
+    @cert1 = "-----BEGIN CERTIFICATE-----\r\n" +
+      "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\r\n" +
+      "osxMtcaZZ1E=\r\n" +
+      "-----END CERTIFICATE-----"
   end
 
   test 'should prepare correct cloud url' do
     paths = {
-      "/redhat_access/r/insights/platform/module-update-router/v1/channel?module=insights-core" => "https://cloud.redhat.com/api/module-update-router/v1/channel?module=insights-core",
+      "/redhat_access/r/insights/platform/module-update-router/v1/channel?module=insights-core" => "https://cert.cloud.redhat.com/api/module-update-router/v1/channel?module=insights-core",
       "/redhat_access/r/insights/v1/static/release/insights-core.egg" => "https://cloud.redhat.com/api/v1/static/release/insights-core.egg",
       "/redhat_access/r/insights/v1/static/uploader.v2.json" => "https://cloud.redhat.com/api/v1/static/uploader.v2.json",
       "/redhat_access/r/insights/v1/static/uploader.v2.json.asc" => "https://cloud.redhat.com/api/v1/static/uploader.v2.json.asc",
-      "/redhat_access/r/insights/platform/inventory/v1/hosts" => "https://cloud.redhat.com/api/inventory/v1/hosts",
-      "/redhat_access/r/insights/platform/ingress/v1/upload" => "https://cloud.redhat.com/api/ingress/v1/upload",
+      "/redhat_access/r/insights/platform/inventory/v1/hosts" => "https://cert.cloud.redhat.com/api/inventory/v1/hosts",
+      "/redhat_access/r/insights/platform/ingress/v1/upload" => "https://cert.cloud.redhat.com/api/ingress/v1/upload",
+      "/redhat_access/r/insights/uploads/67200803-132b-474b-a6f9-37be74185df4" => "https://cert-api.access.redhat.com/r/insights/uploads/67200803-132b-474b-a6f9-37be74185df4",
     }
 
     paths.each do |key, value|
-      assert_equal value, @forwarder.prepare_forward_cloud_url(ForemanRhCloud.base_url, key)
+      actual_params = @forwarder.path_params(key, { cert: @cert1, key: OpenSSL::PKey::RSA.new(1024).to_pem })
+      assert_equal value, actual_params[:url]
     end
   end
 

data/test/unit/slice_generator_test.rb

@@ -1,12 +1,16 @@
 require 'test_plugin_helper'
 
 class SliceGeneratorTest < ActiveSupport::TestCase
+  include KatelloLocationFix
+
   setup do
     User.current = User.find_by(login: 'secret_admin')
 
     env = FactoryBot.create(:katello_k_t_environment)
     cv = env.content_views << FactoryBot.create(:katello_content_view, organization: env.organization)
 
+    location = FactoryBot.create(:location)
+
     @host = FactoryBot.create(
       :host,
       :redhat,
@@ -14,7 +18,8 @@ class SliceGeneratorTest < ActiveSupport::TestCase
       :with_content,
       content_view: cv.first,
       lifecycle_environment: env,
-      organization: env.organization
+      organization: env.organization,
+      location: location
     )
 
     @host.organization.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
@@ -287,7 +292,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
   end
 
   test 'generates a report with satellite facts' do
-    hostgroup = FactoryBot.create(:hostgroup)
+    hostgroup = FactoryBot.create(:hostgroup, name: 'Special"name')
     @host.hostgroup = hostgroup
     @host.save!
 

data/test/unit/tags_generator_test.rb

@@ -0,0 +1,60 @@
+require 'test_plugin_helper'
+
+class TagsGeneratorTest < ActiveSupport::TestCase
+  include KatelloLocationFix
+
+  setup do
+    User.current = User.find_by(login: 'secret_admin')
+
+    env = FactoryBot.create(:katello_k_t_environment)
+    cv = env.content_views << FactoryBot.create(:katello_content_view, organization: env.organization)
+
+    @location1 = FactoryBot.create(:location)
+    @location2 = FactoryBot.create(:location, parent: @location1)
+
+    @hostgroup1 = FactoryBot.create(:hostgroup)
+    @hostgroup2 = FactoryBot.create(:hostgroup, parent: @hostgroup1)
+
+    @host = FactoryBot.create(
+      :host,
+      :redhat,
+      :with_subscription,
+      :with_content,
+      content_view: cv.first,
+      lifecycle_environment: env,
+      organization: env.organization,
+      location: @location2,
+      hostgroup: @hostgroup2
+    )
+
+    @host.organization.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
+    @host.interfaces.first.identifier = 'test_nic1'
+    @host.save!
+  end
+
+  test 'generates tags for a single host' do
+    generator = create_generator
+
+    actual = generator.generate.group_by { |key, value| key }
+
+    locations = actual['location']
+    assert_equal 3, locations.length
+
+    hostgroups = actual['hostgroup']
+    assert_equal 3, hostgroups.length
+
+    assert_nil actual['host collection']
+
+    assert_equal @host.organization.name, actual['organization'].first.last
+    assert_equal @host.lifecycle_environment.name, actual['lifecycle_environment'].first.last
+    assert_equal @host.content_view.name, actual['content_view'].first.last
+    assert_equal Foreman.instance_id, actual['satellite_instance_id'].first.last
+    assert_equal @host.organization_id.to_s, actual['organization_id'].first.last
+  end
+
+  private
+
+  def create_generator
+    ForemanInventoryUpload::Generators::Tags.new(@host)
+  end
+end

data/webpack/ForemanInventoryUpload/Components/AccountList/AccountList.fixtures.js

@@ -1,18 +1,18 @@
-import { noop } from 'patternfly-react';
+import { noop } from 'foremanReact/common/helpers';
 
 export const accounts = {
   Account1: {
-    label: 'test_org1',
+    id: 1,
     upload_report_status: 'running',
     generate_report_status: 'running',
   },
   Account2: {
-    label: 'test_org2',
+    id: 2,
     upload_report_status: 'unknown',
     generate_report_status: 'failure',
   },
   Account3: {
-    label: 'test_org3',
+    id: 3,
     upload_report_status: 'success',
     generate_report_status: 'running',
   },
@@ -30,18 +30,8 @@ export const accountID = 'user@redhat.com';
 
 export const processStatusName = 'upload_report_status';
 
-export const autoUploadEnabled = true;
-
-export const hostObfuscationEnabled = true;
-
-export const ipsObfuscationEnabled = true;
-
 export const filterTerm = 'some_filter';
 
-export const cloudToken = true;
-
-export const excludePackages = false;
-
 export const CloudConnectorStatus = {
   id: 7,
   task: { id: 11 },
@@ -57,11 +47,6 @@ export const props = {
 
 export const pollingResponse = {
   accounts,
-  autoUploadEnabled,
-  hostObfuscationEnabled,
-  ipsObfuscationEnabled,
-  cloudToken,
-  excludePackages,
   CloudConnectorStatus,
 };
 

data/webpack/ForemanInventoryUpload/Components/AccountList/AccountList.js

@@ -1,4 +1,5 @@
 import React, { Component } from 'react';
+import { isEmpty } from 'lodash';
 import { noop } from 'foremanReact/common/helpers';
 import { Accordion } from '@patternfly/react-core';
 import PropTypes from 'prop-types';
@@ -24,24 +25,23 @@ class AccountList extends Component {
 
   render() {
     const { accounts, error, filterTerm } = this.props;
-    const accountIds = Object.keys(accounts);
-    const filteredAccountIds = filterAccounts(accounts, accountIds, filterTerm);
+    const filteredAccount = filterAccounts(accounts, filterTerm);
 
     if (error) {
       return <ErrorState error={error} />;
     }
 
-    if (accountIds.length === 0) {
+    if (isEmpty(accounts)) {
       return <EmptyState />;
     }
 
-    if (filteredAccountIds.length === 0) {
+    if (isEmpty(filteredAccount)) {
       return <EmptyResults />;
     }
 
-    const items = filteredAccountIds.map((accountID, index) => {
-      const account = accounts[accountID];
-      return <ListItem key={index} accountID={accountID} account={account} />;
+    const items = Object.keys(filteredAccount).map((label, index) => {
+      const account = accounts[label];
+      return <ListItem key={index} label={label} account={account} />;
     });
     return <Accordion className="account-list">{items}</Accordion>;
   }

data/webpack/ForemanInventoryUpload/Components/AccountList/AccountListHelper.js

@@ -1,10 +1,10 @@
-export const filterAccounts = (accounts, accountIds, filterTerm) => {
-  if (!filterTerm || !accountIds.length) {
-    return accountIds;
-  }
+import { pickBy } from 'lodash';
+
+export const filterAccounts = (accounts, filterTerm) => {
+  if (!filterTerm) return accounts;
 
   const filterTermLowerCased = filterTerm.toLowerCase();
-  return accountIds.filter(id =>
-    accounts[id].label.toLowerCase().includes(filterTermLowerCased)
+  return pickBy(accounts, (value, key) =>
+    key.toLowerCase().includes(filterTermLowerCased)
   );
 };

data/webpack/ForemanInventoryUpload/Components/AccountList/AccountListReducer.js

@@ -1,8 +1,4 @@
 import Immutable from 'seamless-immutable';
-import { AUTO_UPLOAD_TOGGLE } from '../AutoUploadSwitcher/AutoUploadSwitcherConstants';
-import { HOST_OBFUSCATION_TOGGLE } from '../HostObfuscationSwitcher/HostObfuscationSwitcherConstants';
-import { IPS_OBFUSCATION_TOGGLE } from '../IpsObfuscationSwitcher/IpsObfuscationSwitcherConstants';
-import { EXCLUDE_PACKAGES_TOGGLE } from '../ExcludePackagesSwitcher/ExcludePackagesSwitcherConstants';
 import {
   INVENTORY_ACCOUNT_STATUS_POLLING,
   INVENTORY_ACCOUNT_STATUS_POLLING_ERROR,
@@ -24,11 +20,6 @@ export default (state = initialState, action) => {
       accounts,
       accountID,
       processStatusName,
-      autoUploadEnabled,
-      hostObfuscationEnabled,
-      ipsObfuscationEnabled,
-      cloudToken,
-      excludePackages,
       CloudConnectorStatus,
     } = {},
   } = action;
@@ -38,11 +29,6 @@ export default (state = initialState, action) => {
       return state.merge({
         ...state,
         accounts,
-        autoUploadEnabled,
-        hostObfuscationEnabled,
-        ipsObfuscationEnabled,
-        cloudToken,
-        excludePackages,
         CloudConnectorStatus,
         error: null,
       });
@@ -65,26 +51,6 @@ export default (state = initialState, action) => {
           [processStatusName]: 'Restarting...',
         },
       });
-    case AUTO_UPLOAD_TOGGLE:
-      return state.merge({
-        ...state,
-        autoUploadEnabled,
-      });
-    case HOST_OBFUSCATION_TOGGLE:
-      return state.merge({
-        ...state,
-        hostObfuscationEnabled,
-      });
-    case EXCLUDE_PACKAGES_TOGGLE:
-      return state.merge({
-        ...state,
-        excludePackages,
-      });
-    case IPS_OBFUSCATION_TOGGLE:
-      return state.merge({
-        ...state,
-        ipsObfuscationEnabled,
-      });
     default:
       return state;
   }