foreman_rh_cloud 13.2.1 → 14.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5e7b586ab66c7626630b06b05d508e7ca37eecd26e8db94ed9bc07114569ded
-  data.tar.gz: fabc72a7cacd4e517460892f3b73a3c68b25cd22fdb51dbea43d25827349fcda
+  metadata.gz: 8eb6a1e3cb928ad1aabeca2ddd577f311eb022578dd7ca781e890b28e7108736
+  data.tar.gz: 562bf4c8074e87420d54d496ab67f69301a40b01600df53c6c715010db951e7a
 SHA512:
-  metadata.gz: bbc47e52aeb39d59b5c8242e27fb2ace2cfae5a20511e279559bcd886de945b8526ea6860771ece1fc1dde8a64e1c584c63e72b423bf0d75f42bdcdf57559fc9
-  data.tar.gz: 4f1f5646b46802ecb9abe66f7087e7dc0dd8833ff887d5d80262f8fdf8ad674cd958fd28e8c3b918703ae8304ed8349783de96c178df91b72b1873a1bfc918b8
+  metadata.gz: 64e5d4ccc30a3c6036615e2f429be90f609102e9bbd6d714f6264d22e515d32b6fb825ca9155136a53cb9545ac8d9d8a5a0e7b34cd586dd1ec5c2c18c138d98c
+  data.tar.gz: c1c2d4224a9234278354d3cc1a98b8d3d966a3088870c89a84e94fad001e6d0bc3b93f28c76edb7ef617585989b9e66e830d1b6d030464bb5e190408e18d1525

data/lib/foreman_inventory_upload/generators/fact_helpers.rb

@@ -28,14 +28,6 @@ module ForemanInventoryUpload
         @organization_accounts[organization.id] ||= organization.pools.where.not(account_number: nil).pluck(:account_number).first
       end
 
-      def golden_ticket?(organization)
-        result = organization.try(:golden_ticket?)
-        result = organization.content_access_mode == 'org_environment' if result.nil?
-
-        @organization_golden_tickets ||= {}
-        @organization_golden_tickets[organization.id] ||= result
-      end
-
       def cloud_provider(host)
         bios_version = fact_value(host, 'dmi::bios::version')
 

data/lib/foreman_inventory_upload/generators/queries.rb

@@ -62,7 +62,7 @@ module ForemanInventoryUpload
             :content_facet,
             :host_statuses,
             :inventory_upload_facts,
-            subscription_facet: [:pools, :installed_products, :hypervisor_host]
+            subscription_facet: [:installed_products, :hypervisor_host]
           )
       end
 

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -230,7 +230,7 @@ module ForemanInventoryUpload
         @stream.simple_field('system_purpose_sla', host.subscription_facet.service_level)
         @stream.simple_field('distribution_version', fact_value(host, 'distribution::version'))
         @stream.simple_field('satellite_instance_id', Foreman.try(:instance_id))
-        @stream.simple_field('is_simple_content_access', golden_ticket?(host.organization))
+        @stream.simple_field('is_simple_content_access', true)
         @stream.simple_field('is_hostname_obfuscated', !!obfuscate_hostname?(host))
         @stream.simple_field('organization_id', host.organization_id, :last)
       end

data/lib/foreman_inventory_upload.rb

@@ -1,10 +1,10 @@
 module ForemanInventoryUpload
   def self.base_folder
     # in production setup, where selinux is enabled, we only have rights to
-    # create folders under /ver/lib/foreman. If the folder does not exist, it's
-    # a dev setup, where we can use our current root
+    # create folders under /var/lib/foreman. If the folder does not exist, it's
+    # a dev setup, where we can use the parent of the current working directory
     @base_folder ||= File.join(
-      Dir.glob('/var/lib/foreman').first || Dir.getwd,
+      Dir.glob('/var/lib/foreman').first || File.dirname(Dir.getwd),
       'red_hat_inventory/'
     )
   end
@@ -30,11 +30,6 @@ module ForemanInventoryUpload
     File.join(ForemanInventoryUpload.done_folder, filename)
   end
 
-  def self.report_file_paths(organization_id)
-    filename = facts_archive_name(organization_id)
-    Dir[ForemanInventoryUpload.uploads_file_path(filename), ForemanInventoryUpload.done_file_path(filename)]
-  end
-
   def self.generated_reports_folder
     @generated_reports_folder ||= ensure_folder(
       File.join(
@@ -44,6 +39,26 @@ module ForemanInventoryUpload
     )
   end
 
+  def self.generated_reports_file_path(filename)
+    File.join(ForemanInventoryUpload.generated_reports_folder, filename)
+  end
+
+  def self.report_file_paths(organization_id)
+    filename = facts_archive_name(organization_id)
+    # Report files start in generated
+    # They are then MOVED (not copied) to uploads, then done.
+    # When they are moved to the new folder, they overwrite any file with the same name.
+    # If it's a generate-only, it will be in generated
+    # Failed or incomplete uploads will be in uploads
+    # Completed uploads will be in done
+    # The ordering here ensures we get the correct file path every time.
+    Dir[
+      ForemanInventoryUpload.generated_reports_file_path(filename),
+      ForemanInventoryUpload.uploads_file_path(filename),
+      ForemanInventoryUpload.done_file_path(filename),
+    ]
+  end
+
   def self.outputs_folder
     @outputs_folder ||= ensure_folder(File.join(ForemanInventoryUpload.base_folder, 'outputs/'))
   end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '13.2.1'.freeze
+  VERSION = '14.0.2'.freeze
 end

data/package.json

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

data/test/controllers/insights_cloud/api/machine_telemetries_controller_test.rb

@@ -192,7 +192,7 @@ module InsightsCloud::Api
           organization: env.organization
         )
 
-        @host.subscription_facet.pools << FactoryBot.create(:katello_pool, account_number: '5678', cp_id: 1)
+        @host.organization.pools << FactoryBot.create(:katello_pool, account_number: '5678', cp_id: 1)
 
         uuid = @host.subscription_facet.uuid
 

data/test/jobs/inventory_full_sync_test.rb

@@ -27,7 +27,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
 
     pool = FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
 
-    @host1.subscription_facet.pools << pool
+    @host1.organization.pools << pool
 
     # this host would pass our plugin queries, so it could be uploaded to the cloud.
     @host2 = FactoryBot.create(
@@ -39,7 +39,6 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
       organization: env.organization
     )
 
-    @host2.subscription_facet.pools << pool
     @host2_inventory_id = '4536bf5c-ff03-4154-a8c9-32ff4b40e40c'
 
     # this host would pass our plugin queries, so it could be uploaded to the cloud.
@@ -52,8 +51,6 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
       organization: env.organization
     )
 
-    @host3.subscription_facet.pools << pool
-
     ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
 
     inventory_json = <<-INVENTORY_JSON
@@ -88,7 +85,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
               "facts": {
                 "virtual_host_name": "virt-who-nobody.home-1",
                 "satellite_instance_id": "fc4d0cb0-a0b0-421e-b096-b028319b8e47",
-                "is_simple_content_access": false,
+                "is_simple_content_access": true,
                 "distribution_version": "7.3",
                 "satellite_version": "6.8.4",
                 "organization_id": 1,
@@ -139,7 +136,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
               "facts": {
                 "virtual_host_name": "virt-who-nobody.home-1",
                 "satellite_instance_id": "fc4d0cb0-a0b0-421e-b096-b028319b8e47",
-                "is_simple_content_access": false,
+                "is_simple_content_access": true,
                 "distribution_version": "8.3",
                 "satellite_version": "6.8.4",
                 "organization_id": 1,
@@ -192,7 +189,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
               "facts": {
                 "satellite_instance_id": "fb3643d8-9030-487b-b95c-684783806ffd",
                 "system_purpose_sla": "",
-                "is_simple_content_access": false,
+                "is_simple_content_access": true,
                 "distribution_version": "8.3",
                 "satellite_version": "6.8.1",
                 "organization_id": 1,

data/test/jobs/inventory_hosts_sync_test.rb

@@ -23,7 +23,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
 
     pool = FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
 
-    @host1.subscription_facet.pools << pool
+    @host1.organization.pools << pool
 
     # this host would pass our plugin queries, so it could be uploaded to the cloud.
     @host2 = FactoryBot.create(
@@ -34,8 +34,6 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
       lifecycle_environment: env,
       organization: env.organization
     )
-
-    @host2.subscription_facet.pools << pool
     @host2_inventory_id = '4536bf5c-ff03-4154-a8c9-32ff4b40e40c'
 
     ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
@@ -71,7 +69,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
               "facts": {
                 "virtual_host_name": "virt-who-nobody.home-1",
                 "satellite_instance_id": "fc4d0cb0-a0b0-421e-b096-b028319b8e47",
-                "is_simple_content_access": false,
+                "is_simple_content_access": true,
                 "distribution_version": "7.3",
                 "satellite_version": "6.8.4",
                 "organization_id": 1,
@@ -122,7 +120,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
               "facts": {
                 "virtual_host_name": "virt-who-nobody.home-1",
                 "satellite_instance_id": "fc4d0cb0-a0b0-421e-b096-b028319b8e47",
-                "is_simple_content_access": false,
+                "is_simple_content_access": true,
                 "distribution_version": "7.3",
                 "satellite_version": "6.8.4",
                 "organization_id": 1,
@@ -173,7 +171,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
               "facts": {
                 "virtual_host_name": "virt-who-nobody.home-1",
                 "satellite_instance_id": "fc4d0cb0-a0b0-421e-b096-b028319b8e47",
-                "is_simple_content_access": false,
+                "is_simple_content_access": true,
                 "distribution_version": "8.3",
                 "satellite_version": "6.8.4",
                 "organization_id": 1,
@@ -226,7 +224,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
               "facts": {
                 "satellite_instance_id": "fb3643d8-9030-487b-b95c-684783806ffd",
                 "system_purpose_sla": "",
-                "is_simple_content_access": false,
+                "is_simple_content_access": true,
                 "distribution_version": "8.3",
                 "satellite_version": "6.8.1",
                 "organization_id": 1,

data/test/jobs/inventory_self_host_sync_test.rb

@@ -53,7 +53,7 @@ class InventorySelfHostSyncTest < ActiveSupport::TestCase
               "facts": {
                 "virtual_host_name": "virt-who-nobody.home-1",
                 "satellite_instance_id": "fc4d0cb0-a0b0-421e-b096-b028319b8e47",
-                "is_simple_content_access": false,
+                "is_simple_content_access": true,
                 "distribution_version": "8.3",
                 "satellite_version": "6.8.4",
                 "organization_id": 1,

data/test/unit/archived_report_generator_test.rb

@@ -18,7 +18,7 @@ class ArchivedReportGeneratorTest < ActiveSupport::TestCase
       organization: env.organization
     )
 
-    @host.subscription_facet.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
+    @host.organization.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
   end
 
   def interesting_facts
@@ -51,7 +51,6 @@ class ArchivedReportGeneratorTest < ActiveSupport::TestCase
     test_org = FactoryBot.create(:organization)
 
     ForemanInventoryUpload::Generators::Queries.expects(:for_org).with(test_org.id, hosts_query: '').returns(batches)
-    ForemanInventoryUpload::Generators::Slice.any_instance.stubs(:golden_ticket?).returns(false)
     Dir.mktmpdir do |tmpdir|
       target = File.join(tmpdir, 'test.tar.gz')
       generator = ForemanInventoryUpload::Generators::ArchivedReport.new(target, Logger.new(STDOUT))

data/test/unit/fact_helpers_test.rb

@@ -12,22 +12,6 @@ class FactHelpersTest < ActiveSupport::TestCase
     @org = FactoryBot.create(:organization)
   end
 
-  test 'golden_ticket uses golden_ticket method when defined' do
-    @org.expects(:golden_ticket?).returns(true)
-
-    actual = @instance.golden_ticket?(@org)
-
-    assert actual
-  end
-
-  test 'golden_ticket uses content_access_mode method when golden_ticket not defined' do
-    @org.expects(:content_access_mode).returns('org_environment')
-
-    actual = @instance.golden_ticket?(@org)
-
-    assert actual
-  end
-
   test 'obfuscates ips with insights-client data' do
     host = mock('host')
     @instance.expects(:fact_value).with(host, 'insights_client::obfuscated_ipv4').returns(

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

@@ -19,7 +19,7 @@ class BranchInfoTest < ActiveSupport::TestCase
       organization: env.organization
     )
 
-    @host.subscription_facet.pools << FactoryBot.create(:katello_pool, account_number: '5678', cp_id: 1)
+    @host.organization.pools << FactoryBot.create(:katello_pool, account_number: '5678', cp_id: 1)
   end
 
   test 'should generate branch info for host' do

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

@@ -29,7 +29,7 @@ class CloudRequestForwarderTest < ActiveSupport::TestCase
       organization: env.organization
     )
 
-    @host.subscription_facet.pools << FactoryBot.create(:katello_pool, account_number: '5678', cp_id: 1)
+    @host.organization.pools << FactoryBot.create(:katello_pool, account_number: '5678', cp_id: 1)
   end
 
   test 'should prepare correct cloud url' do

data/test/unit/slice_generator_test.rb

@@ -641,6 +641,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_tag('1', actual_host, 'int_param', 'satellite_parameter')
 
     assert_equal false, satellite_facts['is_hostname_obfuscated']
+    assert_equal true, satellite_facts['is_simple_content_access']
 
     version = satellite_facts['satellite_version']
     if defined?(ForemanThemeSatellite)
@@ -702,22 +703,6 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_equal 'test_sla', fact_values['system_purpose_sla']
   end
 
-  test 'generates a report for a golden ticket' do
-    batch = Host.where(id: @host.id).in_batches.first
-    generator = create_generator(batch) do |generator|
-      generator.stubs(:golden_ticket?).returns(true)
-    end
-
-    json_str = generator.render
-    actual = JSON.parse(json_str.join("\n"))
-
-    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
-    assert_not_nil(actual_host = actual['hosts'].first)
-    assert_equal @host.fqdn, actual_host['fqdn']
-    assert_equal '1234', actual_host['account']
-    assert_equal 1, generator.hosts_count
-  end
-
   test 'skips hosts without subscription' do
     a_host = FactoryBot.create(
       :host,
@@ -1131,11 +1116,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
 
   def create_generator(batch, name = '00000000-0000-0000-0000-000000000000')
     generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], name)
-    if block_given?
-      yield(generator)
-    else
-      generator.stubs(:golden_ticket?).returns(false)
-    end
+    yield(generator) if block_given?
     generator
   end
 

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/PageDescription.js

@@ -7,6 +7,8 @@ import { getDocsURL } from 'foremanReact/common/helpers';
 import { FormattedMessage } from 'react-intl';
 import { selectSubscriptionConnectionEnabled } from '../../../InventorySettings/InventorySettingsSelectors';
 
+import { getSubscriptionServiceDocsUrl } from '../../../../ForemanInventoryHelpers';
+
 export const PageDescription = () => {
   const subscriptionConnectionEnabled = useSelector(
     selectSubscriptionConnectionEnabled
@@ -80,7 +82,7 @@ export const PageDescription = () => {
         {__('For more information about the Subscriptions service, see:')}
          
         <a
-          href="https://docs.redhat.com/en/documentation/subscription_central/1-latest/html/getting_started_with_the_subscriptions_service/index"
+          href={getSubscriptionServiceDocsUrl()}
           target="_blank"
           rel="noopener noreferrer"
         >

data/webpack/ForemanInventoryUpload/ForemanInventoryHelpers.js

@@ -11,6 +11,13 @@ export const getInventoryDocsUrl = () =>
     )}`
   );
 
+export const getSubscriptionServiceDocsUrl = () =>
+  foremanUrl(
+    `/links/manual/?root_url=${URI.encode(
+      'https://docs.redhat.com/en/documentation/subscription_central/1-latest/html-single/getting_started_with_the_subscriptions_service/index'
+    )}`
+  );
+
 export const getActionsHistoryUrl = () =>
   foremanUrl(
     '/foreman_tasks/tasks?search=label+%3D+ForemanInventoryUpload%3A%3AAsync%3A%3AHostInventoryReportJob+or+label+%3D+ForemanInventoryUpload%3A%3AAsync%3A%3AGenerateAllReportsJob&page=1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 13.2.1
+  version: 14.0.2
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team