foreman_rh_cloud 13.2.1 → 14.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5e7b586ab66c7626630b06b05d508e7ca37eecd26e8db94ed9bc07114569ded
-  data.tar.gz: fabc72a7cacd4e517460892f3b73a3c68b25cd22fdb51dbea43d25827349fcda
+  metadata.gz: 950f48953eb5a5166946f1dafb84b60eeaee2722fe1ad6460ea09c5a7549da73
+  data.tar.gz: e077f396cb37162ff28bb575ccd9bcab00b0c7fc09e87c72cc4936eca6cbf728
 SHA512:
-  metadata.gz: bbc47e52aeb39d59b5c8242e27fb2ace2cfae5a20511e279559bcd886de945b8526ea6860771ece1fc1dde8a64e1c584c63e72b423bf0d75f42bdcdf57559fc9
-  data.tar.gz: 4f1f5646b46802ecb9abe66f7087e7dc0dd8833ff887d5d80262f8fdf8ad674cd958fd28e8c3b918703ae8304ed8349783de96c178df91b72b1873a1bfc918b8
+  metadata.gz: d81cc6e6ce4b375cb5ae70c04424b3edcb777a18c22910c3c9090fcf780abe05b2d78a4a5e71824c16cc2136ca77efc5b04d6360c9ef446af843261a7540ce32
+  data.tar.gz: 5fe94f6b998f9e86b0c42ed768e4306d9bddc6a27aace8dc2fed38bb2a4ee9ab035453095b85338b98b0f865683886da0073c8f4f646b7c2ba24e32bd87cf898

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.1'.freeze
 end