katello 3.13.4 → 3.14.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/packages.controller.js

@@ -32,7 +32,7 @@ angular.module('Bastion.packages').controller('PackagesController',
 
         $scope.repository = {name: translate('All Repositories'), id: 'all'};
 
-        Repository.queryUnpaged({'organization_id': CurrentOrganization, 'content_type': 'yum'}, function (response) {
+        Repository.queryUnpaged({'organization_id': CurrentOrganization, 'content_type': 'yum', 'with_content': 'rpm'}, function (response) {
             $scope.repositories = [$scope.repository];
             $scope.repositories = $scope.repositories.concat(response.results);
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.controller.js

@@ -157,6 +157,18 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
             $scope.progress.uploading = false;
         };
 
+        $scope.handleFiles = function (element) {
+            var reader = new FileReader();
+            $scope.uploadedFile = true;
+            reader.addEventListener("loadend", function() {
+                var data = reader.result;
+                /* eslint-disable camelcase */
+                $scope.repository.ansible_collection_requirements = data;
+                $scope.$apply();
+            });
+            reader.readAsText(element.files[0]);
+        };
+
         $scope.checksums = Checksum.checksums;
         $scope.downloadPolicies = DownloadPolicy.downloadPolicies;
         $scope.ostreeUpstreamSyncPolicies = OstreeUpstreamSyncPolicy.syncPolicies;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-manage-content.controller.js

@@ -18,13 +18,14 @@
  * @requires File
  * @requires Deb
  * @requires ModuleStream
+ * @requires AnsibleCollection
  *
  * @description
  *   Provides the functionality for the repository details pane.
  */
 angular.module('Bastion.repositories').controller('RepositoryManageContentController',
-    ['$scope', '$state', 'translate', 'Notification', 'Nutupane', 'Repository', 'Package', 'PackageGroup', 'PuppetModule', 'DockerManifest', 'DockerManifestList', 'DockerTag', 'OstreeBranch', 'File', 'Deb', 'ModuleStream',
-    function ($scope, $state, translate, Notification, Nutupane, Repository, Package, PackageGroup, PuppetModule, DockerManifest, DockerManifestList, DockerTag, OstreeBranch, File, Deb, ModuleStream) {
+    ['$scope', '$state', 'translate', 'Notification', 'Nutupane', 'Repository', 'Package', 'PackageGroup', 'PuppetModule', 'DockerManifest', 'DockerManifestList', 'DockerTag', 'OstreeBranch', 'File', 'Deb', 'ModuleStream', 'AnsibleCollection',
+    function ($scope, $state, translate, Notification, Nutupane, Repository, Package, PackageGroup, PuppetModule, DockerManifest, DockerManifestList, DockerTag, OstreeBranch, File, Deb, ModuleStream, AnsibleCollection) {
         var contentTypes;
 
         function success(response, selected) {
@@ -63,7 +64,8 @@ angular.module('Bastion.repositories').controller('RepositoryManageContentContro
             'ostree-branches': { type: OstreeBranch, controllerName: 'katello_ostree_branches' },
             'files': { type: File, controllerName: 'katello_files' },
             'debs': { type: Deb, controllerName: 'katello_debs' },
-            'module-streams': { type: ModuleStream, controllerName: 'katello_module_streams' }
+            'module-streams': { type: ModuleStream, controllerName: 'katello_module_streams' },
+            'ansible-collections': { type: AnsibleCollection, controllerName: 'katello_ansible_collections'}
         };
 
         $scope.contentNutupane = new Nutupane(contentTypes[$scope.currentState].type, {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html

@@ -27,6 +27,11 @@
       <dd>{{ repository.content_type }}</dd>
     </dl>
 
+    <div class="alert alert-warning" ng-if="repository.content_type === 'ostree' || repository.content_type === 'puppet'">
+      <span class="pficon pficon-warning-triangle-o"></span>
+      <strong>Deprecation Warning: </strong>Puppet and OSTree will no longer be supported in Katello 3.16.
+    </div>
+
     <div class="divider"></div>
     <h4 translate>Sync Settings</h4>
     <dl class="dl-horizontal dl-horizontal-left">
@@ -76,10 +81,23 @@
       </span>
 
       <span ng-if="repository.content_type == 'ansible_collection'">
-        <dt translate>Whitelist</dt>
-        <dd bst-edit-textarea="repository.ansible_collection_whitelist"
+      <dt translate>Upload Requirements</dt>
+        <dd>
+          <input id="requirementFile" type="file" name="file_path" onclick="this.value = null" onchange="angular.element(this).scope().handleFiles(this)"/>
+          <p bst-alert='info' ng-show="repository.content_type == 'ansible_collection'">
+          <span translate>
+            You can upload a requirements.yml file above to auto-fill contents <b>OR</b> paste contents of <a ng-href="https://docs.ansible.com/ansible/devel/dev_guide/collections_tech_preview.html#install-multiple-collections-with-a-requirements-file" target="_blank"> Requirements.yml </a>below.
+          </span>
+      </p>
+        </dd>
+      </span>
+
+      <span ng-if="repository.content_type == 'ansible_collection'">
+        <dt translate>Requirements</dt>
+        <dd class="overflow-span" bst-edit-textarea="repository.ansible_collection_requirements"
             on-save="save(repository)"
-            readonly="denied('edit_products', product)">
+            readonly="denied('edit_products', product)"
+            edit-trigger="uploadedFile">
         </dd>
       </span>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-ansible-collections.html

@@ -0,0 +1,36 @@
+<span page-title ng-model="repository">{{ 'Manage Ansible Collections for Repository:' | translate }} {{ repository.name }}</span>
+
+<div data-extend-template="layouts/partials/table.html">
+    <div data-block="table">
+        <table class="table table-striped table-bordered" >
+
+            <thead>
+            <tr bst-table-head>
+                <th bst-table-column><span translate>Collection Name</span></th>
+                <th bst-table-column><span translate>Author</span></th>
+                <th bst-table-column><span translate>Version</span></th>
+                <th bst-table-column><span translate>Checksum</span></th>
+            </tr>
+            </thead>
+
+            <tbody>
+            <tr bst-table-row ng-repeat="collection in table.rows">
+                <td bst-table-cell>
+                    <a href="ansible_collections/{{ collection.id }}">
+                        {{ collection.name }}
+                    </a>
+                </td>
+                <td bst-table-cell>
+                    {{ collection.namespace }}
+                </td>
+                <td bst-table-cell>
+                    {{ collection.version }}
+                </td>
+                <td bst-table-cell>
+                    {{ collection.checksum }}
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/download-policy.service.js

@@ -12,7 +12,7 @@ angular.module('Bastion.repositories').service('DownloadPolicy',
 
         this.downloadPolicies = {
             'on_demand': translate('On Demand'),
-            'background': translate('Background'),
+            'background': translate('Background (Deprecated)'),
             'immediate': translate('Immediate')
         };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js

@@ -3,6 +3,7 @@
  * @name  Bastion.repositories.controller:NewRepositoryController
  *
  * @requires $scope
+ * @requires $sce
  * @requires Repository
  * @requires Product
  * @requires ContentCredential
@@ -23,8 +24,8 @@
  *   Controls the creation of an empty Repository object for use by sub-controllers.
  */
 angular.module('Bastion.repositories').controller('NewRepositoryController',
-    ['$scope', 'Repository', 'Product', 'ContentCredential', 'FormUtils', 'translate', 'Notification', 'ApiErrorHandler', 'BastionConfig', 'Checksum', 'YumContentUnits', 'DownloadPolicy', 'OstreeUpstreamSyncPolicy', 'Architecture', 'RepositoryTypesService', 'HttpProxy', 'HttpProxyPolicy',
-    function ($scope, Repository, Product, ContentCredential, FormUtils, translate, Notification, ApiErrorHandler, BastionConfig, Checksum, YumContentUnits, DownloadPolicy, OstreeUpstreamSyncPolicy, Architecture, RepositoryTypesService, HttpProxy, HttpProxyPolicy) {
+    ['$scope', '$sce', 'Repository', 'Product', 'ContentCredential', 'FormUtils', 'translate', 'Notification', 'ApiErrorHandler', 'BastionConfig', 'Checksum', 'YumContentUnits', 'DownloadPolicy', 'OstreeUpstreamSyncPolicy', 'Architecture', 'RepositoryTypesService', 'HttpProxy', 'HttpProxyPolicy',
+    function ($scope, $sce, Repository, Product, ContentCredential, FormUtils, translate, Notification, ApiErrorHandler, BastionConfig, Checksum, YumContentUnits, DownloadPolicy, OstreeUpstreamSyncPolicy, Architecture, RepositoryTypesService, HttpProxy, HttpProxyPolicy) {
 
         function success() {
             Notification.setSuccessMessage(translate('Repository %s successfully created.').replace('%s', $scope.repository.name));
@@ -87,6 +88,17 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
             }
         });
 
+        $scope.handleFiles = function (element) {
+            var reader = new FileReader();
+            reader.addEventListener("loadend", function() {
+                var data = reader.result;
+              /* eslint-disable camelcase */
+                $scope.repository.ansible_collection_requirements = data;
+                $scope.$apply();
+            });
+            reader.readAsText(element.files[0]);
+        };
+
         ContentCredential.queryUnpaged(function (contentCredentials) {
             $scope.contentCredentials = contentCredentials.results;
         });
@@ -123,6 +135,16 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
         $scope.policies = HttpProxyPolicy.policies;
         $scope.proxies = [];
 
+        $scope.collectionURLPopover = $sce.trustAsHtml("You can sync collections utilizing just the url:<br/>" +
+          "<b>1. For all collections in Ansible Galaxy:</b><br/>" +
+          "https://galaxy.ansible.com/api/v2/collections <br/>" +
+          "<b>2. For specific collection with URL filtering:</b><br/>" +
+          "https://galaxy.ansible.com/api/v2/collections/testing/k8s_demo_collection <br/>" +
+          "<b>3. For specific collections with Requirements.yml:</b><br/>" +
+          "Use base URL https://galaxy.ansible.com/ and specify requirements.yml below to specify collections");
+
+        $scope.requirementPopover = $sce.trustAsHtml("To learn more about requirement.yml specification, visit <a href='https://docs.ansible.com/ansible/devel/dev_guide/collections_tech_preview.html#install-multiple-collections-with-a-requirements-file' target=\"_blank\">documentation </a>");
+
         $scope.displayHttpProxyPolicyName = function (policy) {
             return HttpProxyPolicy.displayHttpProxyPolicyName(policy);
         };

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html

@@ -35,10 +35,15 @@
                 id="content_type"
                 name="content_type"
                 ng-model="repository.content_type"
-                ng-options="type.name as type.name for type in repositoryTypes">
+                ng-options="type.name as type.name.replace('_',' ') for type in repositoryTypes">
         </select>
       </div>
 
+      <div class="alert alert-warning" ng-if="repository.content_type === 'ostree' || repository.content_type === 'puppet'">
+        <span class="pficon pficon-warning-triangle-o"></span>
+        <strong>Deprecation Warning: </strong>Puppet and OSTree will no longer be supported in Katello 3.16.
+      </div>
+
       <div bst-form-group label="{{ 'Restrict to Architecture' | translate }}" ng-show="repository.content_type === 'yum'">
         <select id="architecture_restricted"
                 name="architecture_restricted"
@@ -52,7 +57,7 @@
     </div>
     <div ng-show="repository.content_type !== undefined">
       <h4 translate> Sync Settings </h4>
-      <div bst-form-group label="{{ 'Upstream URL' | translate }}">
+      <div bst-form-group label="{{ 'Upstream URL' | translate }} ">
         <input id="url"
                name="url"
                ng-model="repository.url"
@@ -61,21 +66,30 @@
           URL of the registry you want to sync. Example: https://registry-1.docker.io/
         </p>
         <p class="help-block" ng-show="repository.content_type === 'ansible_collection'" translate>
-          URL of the ansible content sharing hub you want to sync. Example: https://galaxy.ansible.com
+          Content synced depends on the specifity of the URL and/or the optional requirements.yaml specified below <a class="fa fa-question-circle" ng-show="repository.content_type === 'ansible_collection'"
+                                                                      uib-popover-html="collectionURLPopover" popover-class="popover-large" popover-trigger="'outsideClick'" popover-append-to-body="true" popover-title="Upstream URL">
+        </a>
         </p>
 
       </div>
 
-      <div ng-show="repository.content_type === 'ansible_collection'" bst-form-group label="{{ 'Whitelist' | translate }}">
-        <textarea id="collection_whitelist"
-               name="collection_whitelists"
-               ng-model="repository.ansible_collection_whitelist"
+      <div ng-show="repository.content_type === 'ansible_collection'" bst-form-group label="{{ 'Requirements.yml' | translate }}">
+        <textarea id="ansible_collection_requirements"
+               name="ansible_collection_requirements"
+               ng-model="repository.ansible_collection_requirements"
+               rows="10"
+               placeholder= "{{ 'You can upload a requirements.yml file below to auto-fill contents or paste contents of requirement.yml here' | translate }}"
                type="text"/>
-        <p class="help-block" translate>
-          Name / Comma-separated names of ansible collection(s) you want to sync from the galaxy. ex: newswangerd.collection_demo, devoperate.base
-        </p>
       </div>
 
+      <div class="form-group" ng-show="repository.content_type === 'ansible_collection'">
+        <input id="requirementFile" type="file" name="file_path" onclick="this.value = null" onchange="angular.element(this).scope().handleFiles(this)"/>
+        <p class="help-block" translate>Upload Requirements.yml file <a class="fa fa-question-circle" ng-show="repository.content_type === 'ansible_collection'"
+                                                                        uib-popover-html="requirementPopover" popover-class="popover-large" popover-trigger="'outsideClick'" popover-append-to-body="true">
+        </a></p>
+      </div>
+
+
       <div ng-show="repository.content_type === 'deb'" bst-form-group label="{{ 'Releases' | translate }}">
         <input id="deb_releases"
                name="deb_releases"
@@ -117,9 +131,9 @@
                ng-model="repository.ostree_upstream_sync_depth"
                type="number"
                ng-disabled="repository.ostree_upstream_sync_policy !== 'custom'"/>
-        <h6 translate>
+        <p class="help-block" translate>
           Choose one of the policy selections for downloading ostree content from upstream url during synchronization. Choose "Latest" for downloading the latest version of the upstream branch. Choose "All History" to download all available versions of the upstream repository (this may take a large amount of space). Choose "Custom Depth" and provide an number to indicate the number of prior versions of the upstream branch to download.
-        </h6>
+        </p>
 
       </div>
 
@@ -143,9 +157,9 @@
                 ng-options="id as name for (id, name) in ignorableYumContentUnits">
         </select>
 
-        <h6 translate>
+        <p class="help-block" translate>
           Select content units to ignore while synchronizing this repository.
-        </h6>
+        </p>
       </div>
 
       <div class="checkbox">
@@ -189,7 +203,7 @@
         <p class="help-block" translate>
           For On Demand synchronization, only the metadata is downloaded during sync and packages are fetched and stored on the filesystem when clients request them.
           On Demand is not recommended for custom repositories unless the upstream repository maintains older versions of packages within the repository.
-          For Background synchronization, a background task will download all packages after the initial sync.
+          For Background synchronization, a background task will download all packages after the initial sync (Deprecated).
           The Immediate option will download all metadata and packages immediately during the sync.
         </p>
       </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/repositories.routes.js

@@ -161,6 +161,15 @@
                 label: "{{'Debs' | translate }}",
                 parent: 'product.repository.info'
             }
+        })
+        .state('product.repository.manage-content.ansible-collections', {
+            url: '/content/ansible_collections',
+            permission: 'view_products',
+            templateUrl: 'products/details/repositories/details/views/repository-manage-ansible-collections.html',
+            ncyBreadcrumb: {
+              label: "{{'Ansible Collections' | translate }}",
+              parent: 'product.repository.info'
+            }
         });
 
         $stateProvider.state('product.repository.tasks', {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/views/product-repositories.html

@@ -184,7 +184,7 @@
             <span ng-show="repository.content_type == 'ansible_collection'">
               <div>
                 <a translate ui-sref="product.repository.manage-content.ansible-collections({productId: product.id, repositoryId: repository.id})">
-                  {{ repository.content_counts.ansible_collection || 0 }}
+                  {{ repository.content_counts.ansible_collection || 0 }} Ansible Collections
                 </a>
               </div>
             </span>

data/engines/bastion_katello/app/assets/stylesheets/bastion_katello/bastion_katello.scss

@@ -31,6 +31,10 @@
   }
 }
 
+.overflow-span {
+  max-height:20em;
+  overflow:auto;
+}
 .list-aligned {
   list-style-position: inside;
 }
@@ -59,4 +63,8 @@
 .kat-inline {
   float: left;
   padding-right: 5px;
+}
+
+.popover-large {
+  max-width: 100%;
 }

data/engines/bastion_katello/lib/bastion_katello/engine.rb

@@ -35,19 +35,19 @@ module BastionKatello
           lifecycle_environments
           products
           puppet_modules
-          legacy_subscriptions
           sync_plans
           host_collections
           katello_tasks
           select_organization
         ),
-        :config => {
-          'consumerCertRPM' => consumer_cert_rpm,
-          'defaultDownloadPolicy' => !Foreman.in_rake? && db_migrated && Setting['default_download_policy'],
-          'remoteExecutionPresent' => ::Katello.with_remote_execution?,
-          'remoteExecutionByDefault' => ::Katello.with_remote_execution? &&
-                                        db_migrated && Setting['remote_execution_by_default']
-        }
+        :config_generator =>  lambda do
+          { 'consumerCertRPM' => consumer_cert_rpm,
+            'defaultDownloadPolicy' => !Foreman.in_rake? && db_migrated && Setting['default_download_policy'],
+            'remoteExecutionPresent' => ::Katello.with_remote_execution?,
+            'remoteExecutionByDefault' => ::Katello.with_remote_execution? &&
+                                          db_migrated && Setting['remote_execution_by_default']
+          }
+        end
       )
     end
   end

data/lib/katello/engine.rb

@@ -134,10 +134,6 @@ module Katello
                                  )
       FastGettext.default_text_domain = 'katello'
 
-      unless SETTINGS[:organizations_enabled]
-        fail Foreman::Exception, N_("Organizations disabled, try allowing them in foreman/config/settings.yaml")
-      end
-
       # Lib Extensions
       ::Foreman::Renderer::Scope::Variables::Base.send :include, Katello::Concerns::RendererExtensions
       ::Foreman::Renderer::Scope::Base.send :include, Katello::Concerns::BaseTemplateScopeExtensions

data/lib/katello/plugin.rb

@@ -3,7 +3,7 @@ require 'katello/repository_types.rb'
 
 # rubocop:disable Metrics/BlockLength
 Foreman::Plugin.register :katello do
-  requires_foreman '>= 1.23'
+  requires_foreman '>= 1.24'
 
   sub_menu :top_menu, :content_menu, :caption => N_('Content'),
            :icon => 'fa fa-book', :after => :monitor_menu do
@@ -164,6 +164,17 @@ Foreman::Plugin.register :katello do
            :turbolinks => false
     end
 
+    if ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::ANSIBLE_COLLECTION_TYPE)
+      menu :top_menu,
+           :ansible_collections,
+           :caption => N_('Ansible Collections'),
+           :url => '/ansible_collections',
+           :url_hash => {:controller => 'katello/api/v2/ansible_collections',
+                         :action => 'index'},
+           :engine => Katello::Engine,
+           :turbolinks => false
+    end
+
     if ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::PUPPET_TYPE)
       menu :top_menu,
            :puppet_modules,
@@ -253,6 +264,9 @@ Foreman::Plugin.register :katello do
   register_custom_status(Katello::PurposeStatus)
   register_custom_status(Katello::TraceStatus)
 
+  register_ping_extension { Katello::Ping.ping }
+  register_status_extension { Katello::Ping.status }
+
   extend_rabl_template 'api/v2/smart_proxies/main', 'katello/api/v2/smart_proxies/download_policy'
   extend_rabl_template 'api/v2/hosts/show', 'katello/api/v2/hosts/host_collections'
 
@@ -276,6 +290,10 @@ Foreman::Plugin.register :katello do
     extend_model ::Katello::Concerns::SubscriptionFacetHostExtensions
   end
 
+  describe_host do
+    overview_buttons_provider :content_host_overview_button
+  end
+
   if Katello.with_remote_execution?
     RemoteExecutionFeature.register(:katello_package_install, N_("Katello: Install Package"), :description => N_("Install package via Katello interface"), :provided_inputs => ['package'])
     RemoteExecutionFeature.register(:katello_package_update, N_("Katello: Update Package"), :description => N_("Update package via Katello interface"), :provided_inputs => ['package'])

data/lib/katello/repository_types/yum.rb

@@ -1,5 +1,7 @@
 Katello::RepositoryTypeManager.register(::Katello::Repository::YUM_TYPE) do
   service_class Katello::Pulp::Repository::Yum
+  pulp3_service_class Katello::Pulp3::Repository::Yum
+  pulp3_plugin 'pulp_rpm'
   prevent_unneeded_metadata_publish
 
   default_managed_content_type Katello::Rpm

data/lib/katello/tasks/delete_orphaned_content.rake

@@ -15,7 +15,7 @@ namespace :katello do
   end
 
   def remove_orphan(proxy)
-    ForemanTasks.async_task(Actions::Katello::CapsuleContent::RemoveOrphans, proxy)
+    ForemanTasks.async_task(Actions::Katello::OrphanCleanup::RemoveOrphans, proxy)
     puts _("Orphaned content deletion started in background.")
   rescue RuntimeError => e
     Rails.logger.error "Smart proxy with ID #{proxy.id} may be down: #{e}"