katello 3.12.3 → 3.13.0.rc1

data/app/views/katello/api/v2/srpms/index.json.rabl

@@ -0,0 +1,7 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+
+child @collection[:results] => :results do
+  extends 'katello/api/v2/srpms/show'
+end

data/app/views/katello/api/v2/srpms/show.json.rabl

@@ -0,0 +1,5 @@
+object @resource
+
+attributes :id, :pulp_id, :name, :filename
+attributes :created_at, :updated, :version, :arch, :release
+attributes :epoch, :checksum, :summary, :nvra

data/app/views/katello/api/v2/subscription_facet/base.json.rabl

@@ -1,5 +1,9 @@
-attributes :id, :uuid, :last_checkin, :service_level, :release_version, :autoheal, :registered_at, :registered_through, :purpose_role, :purpose_usage, :purpose_addons
+attributes :id, :uuid, :last_checkin, :service_level, :release_version, :autoheal, :registered_at, :registered_through, :purpose_role, :purpose_usage
 
 child :user => :user do
   attributes :id, :login
 end
+
+node :purpose_addons do |sub|
+  sub.purpose_addons.pluck(:name)
+end

data/config/katello.yaml.example

@@ -8,6 +8,7 @@
     :puppet: true
     :docker: true
     :ostree: true
+    :ansible_collection: true
 
   :use_cp: true # set to true/false if you want to override default
   :use_pulp: true # set to true/false if you want to override default

data/config/routes/api/rhsm.rb

@@ -47,6 +47,7 @@ Katello::Engine.routes.draw do
       match '/consumers/:id/profiles/' => 'candlepin_dynflow_proxy#upload_profiles', :via => :put
       match '/consumers/:id/profile/' => 'candlepin_dynflow_proxy#upload_package_profile', :via => :put
       match '/consumers/:id/packages/' => 'candlepin_dynflow_proxy#upload_package_profile', :via => :put
+      match '/systems/:id/deb_package_profile' => 'candlepin_dynflow_proxy#deb_package_profile', :via => :put
       match '/consumers/:id/tracer/' => 'candlepin_proxies#upload_tracer_profile', :via => :put
       match '/consumers/:id/checkin/' => 'candlepin_proxies#checkin', :via => :put
       match '/consumers/:id' => 'candlepin_proxies#facts', :via => :put

data/config/routes/api/v2.rb

@@ -122,6 +122,13 @@ Katello::Engine.routes.draw do
           end
         end
 
+        api_resources :ansible_collections, :only => [:index, :show] do
+          collection do
+            get :auto_complete_search
+            get :compare
+          end
+        end
+
         api_resources :ostree_branches, :only => [:index, :show] do
           collection do
             get :auto_complete_search
@@ -295,6 +302,13 @@ Katello::Engine.routes.draw do
           end
         end
 
+        api_resources :srpms, :only => [:index, :show], :controller => 'srpms' do
+          collection do
+            get :auto_complete_search
+            get :compare
+          end
+        end
+
         api_resources :subscriptions, :only => [:index, :show] do
           collection do
             get :auto_complete_search
@@ -355,6 +369,7 @@ Katello::Engine.routes.draw do
           api_resources :docker_tags, :only => [:index, :show]
           api_resources :debs, :only => [:index, :show]
           api_resources :module_streams, :only => [:index, :show]
+          api_resources :ansible_collections, :only => [:index, :show]
 
           api_resources :ostree_branches, :only => [:index, :show]
 
@@ -397,6 +412,7 @@ Katello::Engine.routes.draw do
             match '/bulk/destroy' => 'products_bulk_actions#destroy_products', :via => :put
             match '/bulk/sync' => 'products_bulk_actions#sync_products', :via => :put
             match '/bulk/sync_plan' => 'products_bulk_actions#update_sync_plans', :via => :put
+            match '/bulk/http_proxy' => 'products_bulk_actions#update_http_proxy', :via => :put
           end
         end
 

data/config/routes/overrides.rb

@@ -96,6 +96,10 @@ Foreman::Application.routes.draw do
             get :auto_complete_search, :on => :collection
           end
 
+          resources :debs, :only => [:index], :controller => :host_debs do
+            get :auto_complete_search, :on => :collection
+          end
+
           resources :subscriptions, :only => [:index], :controller => :host_subscriptions do
             collection do
               put :auto_attach

data/db/migrate/20180502155123_add_installed_deb.rb

@@ -0,0 +1,23 @@
+class AddInstalledDeb < ActiveRecord::Migration[4.2]
+  def change
+    create_table "katello_installed_debs" do |t|
+      t.string 'name', :null => false, :limit => 255
+      t.string 'version', :null => false, :limit => 255
+      t.string 'architecture', :null => false, :limit => 255
+    end
+
+    create_table "katello_host_installed_debs" do |t|
+      t.references 'host', :null => false, :index => true
+      t.references 'installed_deb', :null => false, :index => true
+    end
+
+    add_foreign_key "katello_host_installed_debs", "hosts",
+                    :name => "katello_host_installed_debs_host_id", :column => "host_id"
+
+    add_foreign_key "katello_host_installed_debs", "katello_installed_debs",
+                    :name => "katello_host_installed_debs_installed_deb_id", :column => "installed_deb_id"
+
+    add_index :katello_installed_debs, [:name, :version, :architecture], :unique => true, :name => :katello_installed_debs_n_id_v_id_a_id
+    add_index :katello_host_installed_debs, [:host_id, :installed_deb_id], :unique => true, :name => :katello_host_installed_debs_h_id_ip_id
+  end
+end

data/db/migrate/20190513162209_drop_repository_reference_publisher_href.rb

@@ -0,0 +1,5 @@
+class DropRepositoryReferencePublisherHref < ActiveRecord::Migration[5.2]
+  def change
+    remove_column :katello_repository_references, :publisher_href
+  end
+end

data/db/migrate/20190605014649_add_purpose_addons.rb

@@ -0,0 +1,29 @@
+class AddPurposeAddons < ActiveRecord::Migration[5.2]
+  def change
+    create_table :katello_purpose_addons do |t|
+      t.string :name, null: false
+    end
+
+    create_table :katello_subscription_facet_purpose_addons do |t|
+      t.references :purpose_addon, index: { name: :katello_sub_facet_purpose_addons_paid }
+      t.references :subscription_facet, index: { name: :katello_sub_facet_purpose_addons_sfid }
+    end
+
+    add_foreign_key :katello_subscription_facet_purpose_addons, :katello_subscription_facets, column: :subscription_facet_id, name: :katello_sub_facet_purpose_addon_facet_id
+    add_foreign_key :katello_subscription_facet_purpose_addons, :katello_purpose_addons, column: :purpose_addon_id, name: :katello_sub_facet_purpose_addon_purpose_addon_id
+
+    Katello::Host::SubscriptionFacet.pluck(:id, :purpose_addons).each do |facet|
+      yaml_string = facet[1]
+      next if yaml_string.nil?
+
+      parsed = YAML.parse(yaml_string)
+      addon_names = parsed.root.children.map(&:value)
+      addon_names.each do |addon|
+        purpose_addon = Katello::PurposeAddon.find_or_create_by(name: addon)
+        Katello::SubscriptionFacetPurposeAddon.create(purpose_addon_id: purpose_addon.id, subscription_facet_id: facet[0])
+      end
+    end
+
+    remove_column :katello_subscription_facets, :purpose_addons, :text
+  end
+end

data/db/migrate/20190617142328_create_katello_ansible_collections.rb

@@ -0,0 +1,25 @@
+class CreateKatelloAnsibleCollections < ActiveRecord::Migration[5.2]
+  def change
+    create_table :katello_ansible_collections do |t|
+      t.string :pulp_id, :null => false, :limit => 255
+      t.string :checksum
+      t.string :name
+      t.string :namespace
+      t.string :version
+      t.timestamps
+    end
+
+    add_index :katello_ansible_collections, :pulp_id, :unique => true, :name => 'katello_ansible_collections_pulp_id_index'
+
+    create_table "katello_repository_ansible_collections" do |t|
+      t.references :ansible_collection, :null => false, index: { :name => 'index_katello_repo_ansible_collections' }
+      t.references :repository, :null => false
+      t.timestamps
+    end
+
+    add_index :katello_repository_ansible_collections, [:ansible_collection_id, :repository_id], :unique => true, :name => 'repository_ansible_collection_ids'
+
+    add_foreign_key "katello_repository_ansible_collections", "katello_ansible_collections", :column => "ansible_collection_id"
+    add_foreign_key "katello_repository_ansible_collections", "katello_repositories", :column => "repository_id"
+  end
+end

data/db/migrate/20190618034438_add_ansible_collection_whitelist_to_katello_root_repositories.rb

@@ -0,0 +1,5 @@
+class AddAnsibleCollectionWhitelistToKatelloRootRepositories < ActiveRecord::Migration[5.2]
+  def change
+    add_column :katello_root_repositories, :ansible_collection_whitelist, :text
+  end
+end

data/db/migrate/20190619192151_add_activation_key_system_purpose_attributes.rb

@@ -0,0 +1,14 @@
+class AddActivationKeySystemPurposeAttributes < ActiveRecord::Migration[5.2]
+  def change
+    create_table :katello_activation_key_purpose_addons do |t|
+      t.references :purpose_addon, index: { name: :katello_activation_key_purpose_addons_paid }
+      t.references :activation_key, index: { name: :katello_activation_key_purpose_addons_akid }
+    end
+
+    add_column :katello_activation_keys, :purpose_role, :string
+    add_column :katello_activation_keys, :purpose_usage, :string
+
+    add_foreign_key :katello_activation_key_purpose_addons, :katello_activation_keys, column: :activation_key_id, name: :katello_act_key_purpose_addon_act_key_id
+    add_foreign_key :katello_activation_key_purpose_addons, :katello_purpose_addons, column: :purpose_addon_id, name: :katello_act_key_purpose_addon_purpose_addon_id
+  end
+end

data/db/migrate/20190701174401_add_http_proxy_policy_to_repository_root.rb

@@ -0,0 +1,12 @@
+class AddHttpProxyPolicyToRepositoryRoot < ActiveRecord::Migration[5.2]
+  def change
+    add_column :katello_root_repositories, :http_proxy_policy, :string,
+      default: Katello::RootRepository::GLOBAL_DEFAULT_HTTP_PROXY
+
+    Katello::RootRepository.where(ignore_global_proxy: true).each do |repo|
+      repo.update(http_proxy_policy: Katello::RootRepository::NO_DEFAULT_HTTP_PROXY)
+    end
+
+    remove_column :katello_root_repositories, :ignore_global_proxy
+  end
+end

data/db/migrate/20190701192616_add_http_proxy_to_repository_root.rb

@@ -0,0 +1,6 @@
+class AddHttpProxyToRepositoryRoot < ActiveRecord::Migration[5.2]
+  def change
+    add_column      :katello_root_repositories, :http_proxy_id, :integer
+    add_foreign_key :katello_root_repositories, :http_proxies
+  end
+end

data/db/migrate/20190702182118_add_metadata_process_after_to_katello_event.rb

@@ -0,0 +1,6 @@
+class AddMetadataProcessAfterToKatelloEvent < ActiveRecord::Migration[5.2]
+  def change
+    add_column :katello_events, :metadata, :text
+    add_column :katello_events, :process_after, :datetime
+  end
+end

data/db/migrate/20190708195809_remove_all_manifest_downloaded.rb

@@ -0,0 +1,11 @@
+class RemoveAllManifestDownloaded < ActiveRecord::Migration[5.2]
+  def up
+    remove_column :katello_docker_manifests, :downloaded
+    remove_column :katello_docker_manifest_lists, :downloaded
+  end
+
+  def down
+    add_column :katello_docker_manifests, :downloaded, :boolean
+    add_column :katello_docker_manifest_lists, :downloaded, :boolean
+  end
+end

data/db/migrate/20190723171639_update_content_view_filters_repositories_join_table.rb

@@ -0,0 +1,11 @@
+class UpdateContentViewFiltersRepositoriesJoinTable < ActiveRecord::Migration[5.2]
+  def up
+    rename_table :katello_content_view_filters_repositories, :katello_repository_content_view_filters
+    add_column :katello_repository_content_view_filters, :id, :primary_key
+  end
+
+  def down
+    rename_table :katello_repository_content_view_filters, :katello_content_view_filters_repositories
+    remove_column :katello_content_view_filters_repositories, :id
+  end
+end

data/db/seeds.d/115-http_proxy.rb

@@ -0,0 +1,25 @@
+if (SETTINGS[:katello][:cdn_proxy] && SETTINGS[:katello][:cdn_proxy][:host])
+  config = SETTINGS[:katello][:cdn_proxy]
+  uri = URI(config[:host])
+  uri.user = nil
+  uri.password = nil
+  uri.port = config[:port] if config[:port]
+
+  name = uri.host
+  if (http_proxy = ::HttpProxy.where(name: name).first)
+    http_proxy.update_attributes!(url: uri.to_s,
+                                  username: config[:user],
+                                  password: config[:password])
+  else
+    ::HttpProxy.create!(name: name,
+                        url: uri.to_s,
+                        username: config[:user],
+                        password: config[:password])
+  end
+
+  if Setting[:content_default_http_proxy] != name
+    Setting[:content_default_http_proxy] = name
+  end
+else
+  Setting[:content_default_http_proxy] = ''
+end

data/engines/bastion/app/views/bastion/layouts/assets.html.erb

@@ -23,6 +23,7 @@
     angular.module('Bastion').value('repositoryTypes', angular.fromJson('<%= Katello::RepositoryTypeManager.repository_types.values.to_json.html_safe %>'));
     angular.module('Bastion').value('deleteHostOnUnregister', angular.fromJson('<%= Setting[:unregister_delete_host] %>'));
     angular.module('Bastion').value('contentDisconnected', angular.fromJson('<%= Setting[:content_disconnected] %>'));
+    angular.module('Bastion').value('globalContentProxy', angular.fromJson('<%= Setting[:content_default_http_proxy].empty? ? nil.to_json : Setting[:content_default_http_proxy].to_json.html_safe %>'));
     angular.module('Bastion').value('entriesPerPage', "<%= Setting[:entries_per_page] %>");
     angular.module('Bastion').value('contentViewSolveDependencies', "<%= Setting[:content_view_solve_dependencies] %>");
     angular.module('Bastion').constant('BastionConfig', angular.fromJson('<%= Bastion.config.to_json.html_safe %>'));

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-details-info.controller.js

@@ -112,6 +112,21 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyDetailsInfoCo
             $scope.save($scope.activationKey);
         };
 
+        $scope.clearRole = function () {
+            $scope.activationKey['purpose_role'] = '';
+            $scope.save($scope.activationKey);
+        };
+
+        $scope.clearUsage = function () {
+            $scope.activationKey['purpose_usage'] = '';
+            $scope.save($scope.activationKey);
+        };
+
+        $scope.clearAddOns = function () {
+            $scope.activationKey['purpose_addons'] = [];
+            $scope.save($scope.activationKey);
+        };
+
         $scope.contentViews = function () {
             var deferred = $q.defer();
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-details.controller.js

@@ -18,6 +18,15 @@
 angular.module('Bastion.activation-keys').controller('ActivationKeyDetailsController',
     ['$scope', '$state', '$q', 'translate', 'ActivationKey', 'Organization', 'CurrentOrganization', 'Notification', 'ApiErrorHandler',
     function ($scope, $state, $q, translate, ActivationKey, Organization, CurrentOrganization, Notification, ApiErrorHandler) {
+        $scope.defaultRoles = ['Red Hat Enterprise Linux Server', 'Red Hat Enterprise Linux Workstation', 'Red Hat Enterprise Linux Compute Node'];
+        $scope.defaultUsages = ['Production', 'Development/Test', 'Disaster Recovery'];
+
+        $scope.purposeAddonsCount = 0;
+
+        $scope.organization = Organization.get({id: CurrentOrganization}, function(org) {
+            $scope.purposeAddonsCount += org.system_purposes.addons.length;
+        });
+
         $scope.panel = {
             error: false,
             loading: true
@@ -62,13 +71,69 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyDetailsContro
         };
 
         $scope.serviceLevels = function () {
-            var deferred = $q.defer();
+            return $scope.organization.$promise.then(function(org) {
+                return org.service_levels;
+            });
+        };
 
-            Organization.get({id: CurrentOrganization}, function (organization) {
-                deferred.resolve(organization['service_levels']);
+        $scope.purposeUsages = function () {
+            return $scope.organization.$promise.then(function(org) {
+                var usages = org.system_purposes.usage;
+                var usage = $scope.activationKey.purpose_usage;
+                if (usage && !_.includes(usages, usage)) {
+                    usages.push(usage);
+                }
+                return _.union(usages, $scope.defaultUsages);
             });
+        };
 
-            return deferred.promise;
+        $scope.purposeRoles = function () {
+            return $scope.organization.$promise.then(function(org) {
+                var roles = org.system_purposes.roles;
+                var role = $scope.activationKey.purpose_role;
+                if (role && !_.includes(roles, role)) {
+                    roles.push(role);
+                }
+                return _.union(roles, $scope.defaultRoles);
+            });
+        };
+
+
+        $scope.savePurposeAddons = function (key) {
+
+            if ($scope.purposeAddonsList) {
+                key['purpose_addons'] = _.chain($scope.purposeAddonsList).filter(function(addOn) {
+                    return addOn.selected;
+                }).map(function(addOn) {
+                    return addOn.name;
+                }).value();
+            }
+
+            return $scope.save(key);
+        };
+
+
+        $scope.purposeAddons = function () {
+            var purposeAddons;
+            var addOns;
+
+            return $scope.organization.$promise.then(function(org) {
+                $scope.purposeAddonsList = [];
+                addOns = org.system_purposes.addons;
+
+                purposeAddons = $scope.activationKey.purpose_addons;
+                angular.forEach(purposeAddons, function(addOn) {
+                    if (addOn && !_.includes(addOns, addOn)) {
+                        addOns.push(addOn);
+                    }
+                });
+
+                angular.forEach(addOns, function (addOn) {
+                    $scope.purposeAddonsList.push({"name": addOn, "selected": purposeAddons.indexOf(addOn) > -1});
+                });
+
+                return $scope.purposeAddonsList;
+            });
         };
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-info.html

@@ -54,6 +54,10 @@
         </div>
       </dd>
 
+
+      <div class="divider"></div>
+      <h4 translate>System Purpose</h4>
+
       <dt translate>Service Level</dt>
       <dd bst-edit-select="activationKey.service_level"
           readonly="denied('edit_activation_keys', activationKey)"
@@ -64,6 +68,41 @@
           on-delete="clearServiceLevel()"
           on-save="save(activationKey)">
       </dd>
+
+      <dt translate>Usage Type</dt>
+      <dd bst-edit-select="activationKey.purpose_usage"
+          readonly="denied('edit_activation_keys', activationKey)"
+          selector="activationKey.purpose_usage"
+          options="purposeUsages()"
+          options-format="option for option in options"
+          deletable="true"
+          on-delete="clearUsage()"
+          on-save="save(activationKey)">
+      </dd>
+
+
+      <dt translate>Role</dt>
+      <dd bst-edit-select="activationKey.purpose_role"
+          readonly="denied('edit_activation_keys', activationKey)"
+          selector="activationKey.purpose_role"
+          options="purposeRoles()"
+          options-format="option for option in options"
+          deletable="true"
+          on-delete="clearRole()"
+          on-save="save(activationKey)">
+      </dd>
+
+      <dt translate>Add ons</dt>
+      <dd bst-edit-multiselect="activationKey.purpose_addons"
+          readonly="denied('edit_activation_keys', activationKey) || purposeAddonsCount === 0"
+          options="purposeAddons()"
+          formatter="arrayToString"
+          deletable="true"
+          on-delete="clearAddOns()"
+          selector="activationKey.purpose_addons"
+          on-save="savePurposeAddons(activationKey)">
+      </dd>
+
     </dl>
   </div>