katello 3.12.3 → 3.13.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/http-proxy-service.js

@@ -0,0 +1,53 @@
+/**
+ * @ngdoc service
+* @name  Bastion.repository.service:httpProxyPolicy
+*
+* @requires translate
+* @requires globalContentProxy
+*
+* @description
+*   Provides HTTP Proxy policy and name display
+*/
+angular.module('Bastion.repositories').service('HttpProxyPolicy',
+    ['translate', 'globalContentProxy', function (translate, globalContentProxy) {
+
+        this.globalContentProxyName = "";
+
+        if (globalContentProxy) {
+            this.globalContentProxyName = translate("Global Default") + " (" + globalContentProxy + ")";
+        } else {
+            this.globalContentProxyName = translate("Global Default (None)");
+        }
+
+        this.policies = [ {name: this.globalContentProxyName, label: 'global_default_http_proxy'},
+                            {name: translate("No HTTP Proxy"), label: 'none'},
+                            {name: translate("Use specific HTTP Proxy"), label: 'use_selected_http_proxy'}];
+
+        this.displayHttpProxyPolicyName = function (policy) {
+            var policies = {
+              'global_default_http_proxy': this.globalContentProxyName,
+              'none': translate("No HTTP Proxy"),
+              'use_selected_http_proxy': translate("Use specific HTTP Proxy")
+            };
+            return policies[policy];
+        };
+
+        this.displayHttpProxyName = function (proxies, proxyId) {
+            var findProxy = function(proxy) {
+                return proxy.id === this.id;
+            };
+
+            var foundProxy = proxies.find(findProxy, { id: proxyId });
+
+            if (proxies.length === 0) {
+                return translate("No HTTP Proxies found");
+            }
+
+            if (foundProxy) {
+                return foundProxy.name;
+            }
+
+            return "";
+        };
+    }]
+);

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

@@ -17,13 +17,14 @@
  * @requires Architecture
  * @requires RepositoryTypesService
  * @requires YumContentUnits
+ * #requires HttpProxyPolicy
  *
  * @description
  *   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',
-    function ($scope, Repository, Product, ContentCredential, FormUtils, translate, Notification, ApiErrorHandler, BastionConfig, Checksum, YumContentUnits, DownloadPolicy, OstreeUpstreamSyncPolicy, Architecture, RepositoryTypesService) {
+    ['$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) {
 
         function success() {
             Notification.setSuccessMessage(translate('Repository %s successfully created.').replace('%s', $scope.repository.name));
@@ -118,5 +119,20 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
             repository.$save(success, error);
         };
 
+        $scope.repository['http_proxy_policy'] = HttpProxyPolicy.policies[0].label;
+        $scope.policies = HttpProxyPolicy.policies;
+        $scope.proxies = [];
+
+        $scope.displayHttpProxyPolicyName = function (policy) {
+            return HttpProxyPolicy.displayHttpProxyPolicyName(policy);
+        };
+
+        $scope.displayHttpProxyName = function (proxyId) {
+            return HttpProxyPolicy.displayHttpProxyName($scope.proxies, proxyId);
+        };
+
+        HttpProxy.queryUnpaged(function (proxies) {
+            $scope.proxies = proxies.results;
+        });
     }]
 );

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

@@ -25,9 +25,9 @@
 
       <div bst-form-group label="{{ 'Description' | translate }}">
         <textarea id="description"
-	       name="description"
-	       ng-model="repository.description"
-	       type="text"/>
+                  name="description"
+                  ng-model="repository.description"
+                  type="text"/>
       </div>
 
       <div bst-form-group label="{{ 'Type' | translate }}">
@@ -60,8 +60,22 @@
         <p class="help-block" ng-show="repository.content_type === 'docker'" translate>
           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
+        </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"
+               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 ng-show="repository.content_type === 'deb'" bst-form-group label="{{ 'Releases' | translate }}">
         <input id="deb_releases"
                name="deb_releases"
@@ -166,7 +180,6 @@
         </p>
       </div>
 
-
       <div bst-form-group label="{{ 'Download Policy' | translate }}" ng-if="repository.content_type === 'yum'">
         <select id="download_policy"
                 name="download_policy"
@@ -175,6 +188,7 @@
         </select>
         <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.
           The Immediate option will download all metadata and packages immediately during the sync.
         </p>
@@ -191,16 +205,28 @@
         </p>
       </div>
 
-      <div class="checkbox">
-        <label>
-          <input id="ignore_global_proxy" name="ignore_global_proxy" ng-model="repository.ignore_global_proxy" type="checkbox"/>
-          <span translate>Ignore Global Http Proxy</span>
-        </label>
-
-        <p class="help-block" translate>
-          Selecting this option will result in the globally configured http proxy from not being used.
-        </p>
+      <div bst-form-group label="{{ 'Http Proxy Policy' | translate }}">
+        <select required
+                id="http_proxy_policy"
+                name="http_proxy_policy"
+                ng-model="repository.http_proxy_policy"
+                ng-options="type.label as type.name for type in policies">
+        </select>
       </div>
+      <span ng-show="repository.http_proxy_policy === 'use_selected_http_proxy'">
+        <div bst-form-group label="{{ 'Http Proxy' | translate }}">
+          <span translate ng-show="proxies.length == 0">
+            No HTTP Proxies found
+          </span>
+          <select
+              id="http_proxy"
+              name="http_proxy"
+              ng-model="repository.http_proxy_id"
+              ng-options="proxy.id as proxy.name for proxy in proxies"
+              ng-show="proxies.length > 0">
+          </select>
+        </div>
+      </span>
     </div>
 
     <div ng-show="repository.content_type === 'yum' || repository.content_type === 'puppet' || repository.content_type === 'deb' || repository.content_type === 'file'">
@@ -233,7 +259,7 @@
         </select>
       </div>
 
-      <div bst-form-group label="{{ 'SSL CA Cert' | translate }}" ng-show="repository.content_type === 'yum'">
+      <div bst-form-group label="{{ 'SSL CA Cert' | translate }}">
         <select id="ssl_ca_cert_id"
                 name="ssl_ca_cert_id"
                 ng-model="repository.ssl_ca_cert_id"
@@ -242,7 +268,7 @@
         </select>
       </div>
 
-      <div bst-form-group label="{{ 'SSL Client Cert' | translate }}" ng-show="repository.content_type === 'yum'">
+      <div bst-form-group label="{{ 'SSL Client Cert' | translate }}">
         <select id="ssl_client_cert_id"
                 name="ssl_client_cert_id"
                 ng-model="repository.ssl_client_cert_id"
@@ -251,7 +277,7 @@
         </select>
       </div>
 
-      <div bst-form-group label="{{ 'SSL Client Key' | translate }}" ng-show="repository.content_type === 'yum'">
+      <div bst-form-group label="{{ 'SSL Client Key' | translate }}">
         <select id="ssl_client_key_id"
                 name="ssl_client_key_id"
                 ng-model="repository.ssl_client_key_id"

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

@@ -181,6 +181,13 @@
               </div>
             </span>
 
+            <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 }}
+                </a>
+              </div>
+            </span>
           </td>
         </tr>
       </tbody>

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

@@ -125,6 +125,22 @@ angular.module('Bastion.products').controller('ProductsController',
             });
         };
 
+        $scope.openHttpProxyModal = function () {
+            nutupane.invalidate();
+            $uibModal.open({
+                templateUrl: 'products/bulk/views/products-bulk-http-proxy-modal.html',
+                controller: 'ProductsBulkHttpProxyModalController',
+                size: 'lg',
+                resolve: {
+                    bulkParams: function () {
+                        return getBulkParams();
+                    }
+                }
+            }).closed.then(function () {
+                nutupane.refresh();
+            });
+        };
+
         $scope.openAdvancedSyncModal = function () {
             nutupane.invalidate();
             $uibModal.open({

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/views/products.html

@@ -42,6 +42,12 @@
           </a>
         </li>
 
+        <li role="menuitem" ng-show="permitted('edit_products')" ng-class="{disabled: table.numSelected === 0}">
+          <a ng-click="openHttpProxyModal()" disable-link="table.numSelected === 0" translate>
+            Manage Http Proxy
+          </a>
+        </li>
+
         <li class="divider"></li>
 
         <li role="menuitem" ng-show="permitted('destroy_products')" ng-class="{disabled: table.numSelected === 0}">

data/lib/katello.rb

@@ -11,7 +11,6 @@ require "anemone"
 require "securerandom"
 
 require "runcible"
-require 'zest'
 require "deface"
 require 'qpid_messaging'
 

data/lib/katello/engine.rb

@@ -146,6 +146,7 @@ module Katello
       ::Organization.send :include, Katello::Concerns::OrganizationExtensions
       ::User.send :include, Katello::Concerns::UserExtensions
       ::Setting.send :include, Katello::Concerns::SettingExtensions
+      ::HttpProxy.send :include, Katello::Concerns::HttpProxyExtensions
       ForemanTasks::RecurringLogic.send :include, Katello::Concerns::RecurringLogicExtensions
 
       #Controller extensions
@@ -195,6 +196,7 @@ module Katello
 
       Katello::EventQueue.register_event(Katello::Events::ImportHostApplicability::EVENT_TYPE, Katello::Events::ImportHostApplicability)
       Katello::EventQueue.register_event(Katello::Events::ImportPool::EVENT_TYPE, Katello::Events::ImportPool)
+      Katello::EventQueue.register_event(Katello::Events::AutoPublishCompositeView::EVENT_TYPE, Katello::Events::AutoPublishCompositeView)
 
       ::HostsController.class_eval do
         helper Katello::Concerns::HostsAndHostgroupsHelperExtensions

data/lib/katello/permission_creator.rb

@@ -1,5 +1,5 @@
 module Katello
-  class PermissionCreator
+  class PermissionCreator # rubocop:disable Metrics/ClassLength
     def initialize(plugin)
       @plugin = plugin
     end
@@ -78,6 +78,7 @@ module Katello
                    'katello/api/v2/errata' => [:index, :show, :auto_complete_search, :compare, :available_errata],
                    'katello/api/v2/puppet_modules' => [:index, :show, :auto_complete_search, :compare],
                    'katello/api/v2/module_streams' => [:index, :show, :auto_complete_search, :compare],
+                   'katello/api/v2/ansible_collections' => [:index, :show, :auto_complete_search, :compare],
                    'katello/content_views' => [:auto_complete, :auto_complete_search],
                    'katello/errata' => [:short_details, :auto_complete],
                    'katello/packages' => [:details, :auto_complete],
@@ -93,6 +94,7 @@ module Katello
                                                 :errata_items,
                                                 :puppet_modules_items,
                                                 :module_streams,
+                                                :ansible_collections,
                                                 :view_packages,
                                                 :view_puppet_modules,
                                                 :repo_packages,
@@ -251,6 +253,7 @@ module Katello
                            'katello/api/v2/products' => [:index, :show, :auto_complete_search],
                            'katello/api/v2/repositories' => [:index, :show, :repository_types, :auto_complete_search, :cancel],
                            'katello/api/v2/packages' => [:index, :show, :auto_complete_search, :auto_complete_name, :auto_complete_arch, :compare],
+                           'katello/api/v2/srpms' => [:index, :show, :auto_complete_search, :compare],
                            'katello/api/v2/debs' => [:index, :show, :auto_complete_search, :compare],
                            'katello/api/v2/package_groups' => [:index, :show, :auto_complete_search, :compare],
                            'katello/api/v2/docker_manifests' => [:index, :show, :auto_complete_search, :compare],
@@ -261,6 +264,7 @@ module Katello
                            'katello/api/v2/errata' => [:index, :show, :auto_complete_search, :compare],
                            'katello/api/v2/puppet_modules' => [:index, :show, :auto_complete_search, :compare],
                            'katello/api/v2/module_streams' => [:index, :show, :auto_complete_search, :compare, :auto_complete_name],
+                           'katello/api/v2/ansible_collections' => [:index, :show, :auto_complete_search, :compare],
                            'katello/errata' => [:short_details, :auto_complete],
                            'katello/packages' => [:details, :auto_complete],
                            'katello/puppet_modules' => [:show],
@@ -276,6 +280,7 @@ module Katello
                                                         :errata_items,
                                                         :puppet_modules_items,
                                                         :module_streams,
+                                                        :ansible_collections,
                                                         :repo_packages,
                                                         :repo_errata,
                                                         :repo_puppet_modules,
@@ -295,7 +300,7 @@ module Katello
                          {
                            'katello/api/v2/products' => [:update],
                            'katello/api/v2/repositories' => [:update, :remove_content, :import_uploads, :upload_content, :republish],
-                           'katello/api/v2/products_bulk_actions' => [:update_sync_plans],
+                           'katello/api/v2/products_bulk_actions' => [:update_sync_plans, :update_http_proxy],
                            'katello/api/v2/content_uploads' => [:create, :update, :destroy],
                            'katello/api/v2/organizations' => [:repo_discover, :cancel_repo_discover]
                          },

data/lib/katello/permissions/host_permissions.rb

@@ -4,6 +4,7 @@ Foreman::AccessControl.permission(:edit_hosts).actions.concat [
   'api/v2/hosts/host_collections',
   'katello/api/v2/host_errata/apply',
   'katello/api/v2/host_errata/applicability',
+  'katello/api/v2/host_debs/auto_complete_search',
   'katello/api/v2/host_packages/install',
   'katello/api/v2/host_packages/upgrade',
   'katello/api/v2/host_packages/upgrade_all',
@@ -27,6 +28,7 @@ Foreman::AccessControl.permission(:edit_hosts).actions.concat [
   'katello/api/v2/hosts_bulk_actions/release_version',
   'katello/api/rhsm/candlepin_dynflow_proxy/upload_package_profile',
   'katello/api/rhsm/candlepin_dynflow_proxy/upload_profiles',
+  'katello/api/rhsm/candlepin_dynflow_proxy/deb_package_profile',
   'katello/api/rhsm/candlepin_proxies/regenerate_identity_certificates',
   'katello/api/rhsm/candlepin_proxies/hypervisors_update',
   'katello/api/rhsm/candlepin_proxies/async_hypervisors_update',
@@ -49,6 +51,7 @@ Foreman::AccessControl.permission(:view_hosts).actions.concat [
   'katello/api/v2/hosts_bulk_actions/installable_errata',
   'katello/api/v2/hosts_bulk_actions/available_incremental_updates',
   'katello/api/v2/hosts_bulk_actions/module_streams',
+  'katello/api/v2/host_debs/index',
   'katello/api/v2/host_packages/index',
   'katello/api/v2/host_tracer/index',
   'katello/remote_execution/new',

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.21'
+  requires_foreman '>= 1.23'
 
   sub_menu :top_menu, :content_menu, :caption => N_('Content'),
            :icon => 'fa fa-book', :after => :monitor_menu do
@@ -200,6 +200,7 @@ Foreman::Plugin.register :katello do
 
   allowed_template_helpers :subscription_manager_configuration_url, :repository_url
   extend_template_helpers Katello::KatelloUrlsHelper
+  register_global_js_file 'fills'
 
   search_path_override("Katello") do |resource|
     "/#{Katello::Util::Model.model_to_controller_path(resource)}/auto_complete_search"
@@ -211,7 +212,7 @@ Foreman::Plugin.register :katello do
     :content_facet_attributes => [:content_view_id, :lifecycle_environment_id, :content_source_id,
                                   :host, :kickstart_repository_id],
     :subscription_facet_attributes => [:release_version, :autoheal, :purpose_usage, :purpose_role, :service_level, :host,
-                                       {:installed_products => [:product_id, :product_name, :arch, :version]}, :facts, :hypervisor_guest_uuids => [], :purpose_addons => []]
+                                       {:installed_products => [:product_id, :product_name, :arch, :version]}, :facts, :hypervisor_guest_uuids => [], :purpose_addon_ids => []]
   parameter_filter Hostgroup, :content_view_id, :lifecycle_environment_id, :content_source_id,
     :kickstart_repository_id
   parameter_filter Organization, :label, :service_level

data/lib/katello/repository_types/ansible_collection.rb

@@ -0,0 +1,8 @@
+Katello::RepositoryTypeManager.register(::Katello::Repository::ANSIBLE_COLLECTION_TYPE) do
+  allow_creation_by_user true
+  pulp3_skip_publication true
+  pulp3_service_class Katello::Pulp3::Repository::AnsibleCollection
+  pulp3_plugin 'pulp_ansible'
+
+  content_type Katello::AnsibleCollection, :pulp3_service_class => ::Katello::Pulp3::AnsibleCollection, :user_removable => true
+end

data/lib/katello/repository_types/deb.rb

@@ -1,5 +1,6 @@
 Katello::RepositoryTypeManager.register(::Katello::Repository::DEB_TYPE) do
   service_class Katello::Pulp::Repository::Deb
   prevent_unneeded_metadata_publish
-  content_type Katello::Deb, :pulp2_service_class => ::Katello::Pulp::Deb, :user_removable => true
+  default_managed_content_type Katello::Deb
+  content_type Katello::Deb, :pulp2_service_class => ::Katello::Pulp::Deb, :removable => true, :uploadable => true
 end

data/lib/katello/repository_types/docker.rb

@@ -1,8 +1,27 @@
 Katello::RepositoryTypeManager.register(::Katello::Repository::DOCKER_TYPE) do
   service_class Katello::Pulp::Repository::Docker
+  default_managed_content_type Katello::DockerManifest
+  pulp3_service_class Katello::Pulp3::Repository::Docker
+  pulp3_skip_publication true
+  pulp3_plugin 'pulp_docker'
 
-  content_type Katello::DockerManifest, :priority => 1, :pulp2_service_class => ::Katello::Pulp::DockerManifest, :user_removable => true
-  content_type Katello::DockerManifestList, :priority => 2, :pulp2_service_class => ::Katello::Pulp::DockerManifestList
-  content_type Katello::DockerTag, :priority => 3, :pulp2_service_class => ::Katello::Pulp::DockerTag
-  content_type Katello::DockerBlob, :priority => 4, :pulp2_service_class => ::Katello::Pulp::DockerBlob, :index => false
+  content_type Katello::DockerManifest,
+               :priority => 1,
+               :pulp2_service_class => ::Katello::Pulp::DockerManifest,
+               :pulp3_service_class => ::Katello::Pulp3::DockerManifest,
+               :removable => true,
+               :uploadable => true
+  content_type Katello::DockerManifestList,
+               :priority => 2,
+               :pulp2_service_class => ::Katello::Pulp::DockerManifestList,
+               :pulp3_service_class => ::Katello::Pulp3::DockerManifestList
+  content_type Katello::DockerTag,
+               :priority => 3,
+               :pulp2_service_class => ::Katello::Pulp::DockerTag,
+               :pulp3_service_class => ::Katello::Pulp3::DockerTag
+  content_type Katello::DockerBlob,
+               :priority => 4,
+               :pulp2_service_class => ::Katello::Pulp::DockerBlob,
+               :pulp3_service_class => ::Katello::Pulp3::DockerBlob,
+               :index => false
 end

data/lib/katello/repository_types/file.rb

@@ -1,8 +1,14 @@
 Katello::RepositoryTypeManager.register(::Katello::Repository::FILE_TYPE) do
   allow_creation_by_user true
   service_class Katello::Pulp::Repository::File
+
   pulp3_service_class Katello::Pulp3::Repository::File
   pulp3_plugin 'pulp_file'
 
-  content_type Katello::FileUnit, :pulp2_service_class => ::Katello::Pulp::FileUnit, :user_removable => true
+  content_type Katello::FileUnit,
+               :pulp2_service_class => ::Katello::Pulp::FileUnit,
+               :pulp3_service_class => ::Katello::Pulp3::FileUnit,
+               :removable => true,
+               :uploadable => true
+  default_managed_content_type Katello::FileUnit
 end