Fixes #38055 - Fix future-dated subscriptions (Katello#11243)

* Fixes #38055 - Send active=include for Product.all * Refs #38055 - Send add_future when getting upstream pools * Refs #38055 - Update app/lib/katello/resources/candlepin/product.rb --------- Co-authored-by: Partha Aji <[email protected]> Co-authored-by: Quinn James <[email protected]>
ATIX-AG · Dec 4, 2024 · 74241a4 · 74241a4
1 parent adfb230
commit 74241a4
Show file tree

Hide file tree

Showing 11 changed files with 381,357 additions and 757 deletions.
diff --git a/app/lib/katello/resources/candlepin/product.rb b/app/lib/katello/resources/candlepin/product.rb
@@ -4,7 +4,8 @@ module Candlepin
       class Product < CandlepinResource
         class << self
           def all(owner_label, included = [])
-            products = JSON.parse(Candlepin::CandlepinResource.get(path(owner_label) + "?#{included_list(included)}", self.default_headers).body)
+            url = path(owner_label) + "?active=include" + "&#{included_list(included)}"
+            products = JSON.parse(Candlepin::CandlepinResource.get(url, self.default_headers).body)
             ::Katello::Util::Data.array_with_indifferent_access products
           end
 

diff --git a/app/models/katello/upstream_pool.rb b/app/models/katello/upstream_pool.rb
@@ -33,6 +33,7 @@ def base_params(params)
         params[:consumer] = upstream_consumer_id if attachable
         params[:sort_by] = 'Product.name'
         params[:order] = 'asc'
+        params[:add_future] = true
         params
       end
 

diff --git a/test/fixtures/vcr_cassettes/scenarios/import_manifest_manifest_small_modified_zip.yml b/test/fixtures/vcr_cassettes/scenarios/import_manifest_manifest_small_modified_zip.yml
diff --git a/test/fixtures/vcr_cassettes/scenarios/import_manifest_manifest_small_zip.yml b/test/fixtures/vcr_cassettes/scenarios/import_manifest_manifest_small_zip.yml