katello 3.7.1.1 → 3.8.0.rc1

data/config/routes.rb

@@ -23,5 +23,4 @@ Katello::Engine.routes.draw do
 
   match '/xui' => 'react#index', :via => [:get]
   match '/xui/*page' => 'react#index', :via => [:get]
-  match '/organization_select' => 'react#index', :via => [:get]
 end

data/config/routes/api/registry.rb

@@ -0,0 +1,29 @@
+require 'katello/api/mapper_extensions'
+
+class ActionDispatch::Routing::Mapper
+  include Katello::Routing::MapperExtensions
+end
+
+Katello::Engine.routes.draw do
+  scope :module => :api do
+    scope :module => :registry, :constraints => { :tag => /[0-9a-zA-Z\-_.:]*/, :digest => /[0-9a-zA-Z:]*/ } do
+      match '/v2/token' => 'registry_proxies#token', :via => :get
+      match '/v2/token' => 'registry_proxies#token', :via => :post
+      match '/v2/*repository/manifests/:tag' => 'registry_proxies#pull_manifest', :via => :get
+      match '/v2/*repository/manifests/:tag' => 'registry_proxies#push_manifest', :via => :put
+      match '/v2/*repository/blobs/:digest' => 'registry_proxies#pull_blob', :via => :get
+      match '/v2/*repository/blobs/:digest' => 'registry_proxies#check_blob', :via => :head
+      match '/v2/*repository/blobs/uploads' => 'registry_proxies#start_upload_blob', :via => :post
+      match '/v2/*repository/blobs/uploads/:uuid' => 'registry_proxies#chunk_upload_blob', :via => :post
+      match '/v2/*repository/blobs/uploads/:uuid' => 'registry_proxies#finish_upload_blob', :via => :put
+      match '/v2/*repository/blobs/uploads/:uuid' => 'registry_proxies#upload_blob', :via => :patch
+      match '/v2/*repository/blobs/uploads/:uuid' => 'registry_proxies#status_upload_blob', :via => :get
+      match '/v2/*repository/blobs/uploads/:uuid' => 'registry_proxies#cancel_upload_blob', :via => :delete
+      match '/v2/_catalog' => 'registry_proxies#catalog', :via => :get
+      match '/v2/*repository/tags/list' => 'registry_proxies#tags_list', :via => :get
+      match '/v2' => 'registry_proxies#ping', :via => :get
+      match '/v1/_ping' => 'registry_proxies#v1_ping', :via => :get
+      match '/v1/search' => 'registry_proxies#v1_search', :via => :get
+    end
+  end
+end

data/config/routes/api/v2.rb

@@ -109,7 +109,7 @@ Katello::Engine.routes.draw do
           end
         end
 
-        api_resources :content_view_versions, :except => [:create, :update] do
+        api_resources :content_view_versions, :except => [:create] do
           member do
             post :promote
             post :export

data/db/migrate/20180612163403_add_foreign_key_to_hypervisor_id.rb

@@ -1,8 +1,5 @@
 class AddForeignKeyToHypervisorId < ActiveRecord::Migration[5.1]
   def up
-    # Update all pools that have a hypervisor reference that's not a host before we add the FK
-    ::Katello::Pool.where.not(hypervisor_id: nil).where.not(hypervisor_id: Host::Managed.all).update_all(hypervisor_id: nil)
-
     add_foreign_key(:katello_pools, :hosts,
                     :name => 'katello_pools_hypervisor_fk', :column => 'hypervisor_id')
   end

data/db/migrate/20180614184822_add_unauthenticated_pull.rb

@@ -0,0 +1,9 @@
+class AddUnauthenticatedPull < ActiveRecord::Migration[5.1]
+  def up
+    add_column :katello_environments, :registry_unauthenticated_pull, :boolean, :default => false
+  end
+
+  def down
+    remove_column :katello_environments, :registry_unauthenticated_pull
+  end
+end

data/db/migrate/20180618195941_add_description_to_repository.rb

@@ -0,0 +1,5 @@
+class AddDescriptionToRepository < ActiveRecord::Migration[5.1]
+  def change
+    add_column :katello_repositories, :description, :text, :null => true
+  end
+end

data/db/seeds.d/75-job_templates.rb

@@ -7,13 +7,10 @@ if Katello.with_remote_execution?
         sync = !Rails.env.test? && Setting[:remote_execution_sync_templates]
         # import! was renamed to import_raw! around 1.3.1
         if JobTemplate.respond_to?('import_raw!')
-          template = JobTemplate.import_raw!(File.read(template), :default => true, :locked => true, :update => sync)
+          JobTemplate.import_raw!(File.read(template), :default => true, :locked => true, :update => sync)
         else
-          template = JobTemplate.import!(File.read(template), :default => true, :locked => true, :update => sync)
+          JobTemplate.import!(File.read(template), :default => true, :locked => true, :update => sync)
         end
-
-        template.organizations << Organization.unscoped.all if template && template.organizations.empty?
-        template.locations << Location.unscoped.all if template && template.locations.empty?
       end
     end
   end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-repository-sets-modal.controller.js

@@ -28,15 +28,14 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkRepositorySe
         nutupaneParams = {
             'organization_id': CurrentOrganization,
             'offset': 0,
+            'sort_by': 'name',
+            'sort_order': 'ASC',
             'paged': true
         };
 
-        nutupane = new Nutupane(RepositorySet, nutupaneParams,
-          'queryPaged', {disableAutoLoad: true});
+        nutupane = new Nutupane(RepositorySet, nutupaneParams, 'queryPaged');
         $scope.controllerName = 'katello_repository_sets';
         nutupane.masterOnly = true;
-        nutupane.setSearchKey('repoSetsSearch');
-        nutupane.load();
 
         $scope.table = nutupane.table;
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-subscriptions-modal.controller.js

@@ -44,14 +44,11 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkSubscription
                 });
             };
 
-
-            $scope.contentNutupane = new Nutupane(Subscription, params,
-              'queryPaged', {disableAutoLoad: true});
+            $scope.contentNutupane = new Nutupane(Subscription, params);
             $scope.controllerName = 'katello_subscriptions';
             $scope.table = $scope.contentNutupane.table;
             $scope.contentNutupane.setSearchKey('subscriptionSearch');
             $scope.contentNutupane.masterOnly = true;
-            $scope.contentNutupane.load();
             $scope.groupedSubscriptions = {};
 
             $scope.$watch('table.rows', function (rows) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-subscriptions-modal.html

@@ -65,7 +65,7 @@
                class="table table-striped table-bordered">
           <thead>
           <tr bst-table-head row-select>
-            <th bst-table-column="quantity" sortable class="align-center"><span translate>Quantity</span></th>
+            <th bst-table-column="quantity" sortable class="align-center"><span translate>Quantity (To Add)</span></th>
             <th bst-table-column="attached" sortable><span translate>Attached</span></th>
             <th bst-table-column="type"><span translate>Type</span></th>
             <th bst-table-column="startDate" sortable><span translate>Starts</span></th>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-register.controller.js

@@ -30,7 +30,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostRegisterControlle
             $scope.noCapsulesFound = _.isEmpty(data.results);
             $scope.selectedCapsule = _.isEmpty(defaultCapsule) ? data.results[0] : defaultCapsule[0];
         });
-
+        $scope.hideSwitcher = true;
 
         $scope.hostname = function (url) {
             if (url) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages-installed.controller.js

@@ -18,7 +18,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostPackagesInstalled
         var packagesNutupane;
 
         $scope.removeSelectedPackages = function () {
-            var selected = _.map($scope.table.getSelected(), 'name');
+            var selected = $scope.table.getSelected();
 
             if (!$scope.working) {
                 $scope.working = true;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-add-subscriptions.controller.js

@@ -39,7 +39,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostAddSubscriptionsC
             $scope.groupedSubscriptions = SubscriptionsHelper.groupByProductName(rows);
         });
 
-        $scope.getAmountSelectorValues = SubscriptionsHelper.getAmountSelectorValues;
+        $scope.amountSelectorValues = SubscriptionsHelper.getAmountSelectorValues;
         $scope.showMatchHost = false;
         $scope.showMatchInstalled = false;
         $scope.showNoOverlap = false;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/content-views.routes.js

@@ -63,6 +63,7 @@ angular.module('Bastion.content-views').config(['$stateProvider', function ($sta
     .state('content-view.version.details', {
         url: '',
         permission: 'view_content_views',
+        controller: 'ContentViewVersionController',
         templateUrl: 'content-views/versions/views/content-view-version-details.html',
         ncyBreadcrumb: {
             label: '{{ version.name }}',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/content-view-version.controller.js

@@ -1,15 +1,22 @@
-(function () {
-    'use strict';
-
-    /**
-     * @ngdoc controller
-     * @name  Bastion.content-views.versions.controller:ContentViewVersion
-     *
-     * @description
-     *   Handles fetching of a content view version based on the route ID and putting it
-     *   on the scope.
-     */
-    function ContentViewVersionController($scope, ContentViewVersion) {
+/**
+ * @ngdoc controller
+ * @name  Bastion.content-views.versions.controller:ContentViewVersion
+ *
+ * @requires $scope
+ * @requires $state
+ * @requires $q
+ * @requires translate
+ * @requires ContentViewVersion
+ * @requires Notification
+ *
+ * @description
+ *   Handles fetching of a content view version based on the route ID and putting it
+ *   on the scope.
+ */
+
+angular.module('Bastion.content-views.versions').controller('ContentViewVersionController',
+    ['$scope', '$state', '$q', 'translate', 'ContentViewVersion', 'Notification',
+    function ($scope, $state, $q, translate, ContentViewVersion, Notification) {
 
         $scope.version = ContentViewVersion.get({id: $scope.$stateParams.versionId});
 
@@ -34,12 +41,19 @@
             return found;
         };
 
-    }
+        $scope.save = function (version) {
+            var deferred = $q.defer();
 
-    angular
-        .module('Bastion.content-views.versions')
-        .controller('ContentViewVersionController', ContentViewVersionController);
+            version.$update(function (response) {
+                deferred.resolve(response);
+                Notification.setSuccessMessage(translate('Content View version updated'));
 
-    ContentViewVersionController.$inject = ['$scope', 'ContentViewVersion'];
+            }, function (response) {
+                deferred.reject(response);
+                Notification.setErrorMessage(response.data.displayMessage);
+            });
 
-})();
+            return deferred.promise;
+        };
+    }]
+);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-details.html

@@ -1,7 +1,7 @@
 <div class="details">
   <div class="detail">
     <span class="info-label" translate>Description</span>
-    <span class="info-value" bst-edit-textarea="version.description" readonly="true"></span>
+    <span class="info-value" bst-edit-textarea="version.description" on-save="save(version)"></span>
   </div>
 
   <div class="detail">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-docker.html

@@ -5,6 +5,7 @@
         <th bst-table-column translate>Name</th>
         <th bst-table-column translate>Product</th>
         <th bst-table-column translate>Repository</th>
+        <th bst-table-column translate>Container Image Name</th>
         <th bst-table-column translate>Tags</th>
       </tr>
     </thead>
@@ -14,6 +15,7 @@
         <td bst-table-cell>{{ repository.name }}</td>
         <td bst-table-cell>{{ repository.product.name }}</td>
         <td bst-table-cell>{{ repository.relative_path }}</td>
+        <td bst-table-cell>{{ repository.container_repository_name }}</td>
         <td bst-table-cell class="number-cell">{{ repository.content_counts.docker_tag || 0}}</td>
       </tr>
     </tbody>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-details.html

@@ -1,30 +1,39 @@
 <span page-title ng-model="environment">{{ 'Lifecycle Environment:' | translate }} {{ environment.name }}</span>
 
-<div data-extend-template="layouts/two-column-details.html">
-  <div data-block="left-column">
-    <h4 translate>Basic Information</h4>
+<div data-block="left-column">
+  <h4 translate>Basic Information</h4>
 
-    <dl class="dl-horizontal dl-horizontal-left">
-      <dt translate>Name</dt>
-      <dd bst-edit-text="environment.name"
-          on-save="save(environment)"
-          readonly="denied('edit_lifecycle_environments', environment) || environment.library">
-      </dd>
+  <dl class="dl-horizontal dl-horizontal-left">
+    <dt translate>Name</dt>
+    <dd bst-edit-text="environment.name"
+        on-save="save(environment)"
+        readonly="denied('edit_lifecycle_environments', environment) || environment.library">
+    </dd>
 
-      <dt translate>Label</dt>
-      <dd>{{ environment.label }}</dd>
+    <dt translate>Label</dt>
+    <dd>{{ environment.label }}</dd>
 
-      <dt translate>Registry Name Pattern</dt>
-      <dd bst-edit-textarea="environment.registry_name_pattern"
-          on-save="save(environment)"
-          readonly="denied('edit_lifecycle_environments', environment)">
-      </dd>
+    <dt translate>Description</dt>
+    <dd bst-edit-textarea="environment.description"
+        on-save="save(environment)"
+        readonly="denied('edit_lifecycle_environments', environment) || environment.library">
+    </dd>
+  </dl>
+
+  <h4 translate>Container Image Registry</h4>
+
+  <dl class="dl-horizontal dl-horizontal-left">
+    <dt translate>Unauthenticated Pull</dt>
+    <dd bst-edit-checkbox="environment.registry_unauthenticated_pull"
+        formatter="booleanToYesNo"
+        on-save="save(environment)"
+        readonly="denied('edit_lifecycle_environments', environment)">
+    </dd>
+    <dt translate>Registry Name Pattern</dt>
+    <dd bst-edit-textarea="environment.registry_name_pattern"
+        on-save="save(environment)"
+        readonly="denied('edit_lifecycle_environments', environment)">
+    </dd>
+  </dl>
 
-      <dt translate>Description</dt>
-      <dd bst-edit-textarea="environment.description"
-          on-save="save(environment)"
-          readonly="denied('edit_lifecycle_environments', environment) || environment.library">
-      </dd>
-    </dl>
-  </div>
 </div>

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

@@ -14,6 +14,12 @@
       <dt translate>Label</dt>
       <dd>{{ repository.label }}</dd>
 
+      <dt translate>Description</dt>
+      <dd bst-edit-text="repository.description"
+	  on-save="save(repository)"
+	  readonly="product.redhat || denied('edit_products', product)">
+      </dd>
+
       <dt translate>Backend Identifier</dt>
       <dd>{{ repository.backend_identifier }}</dd>
 

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

@@ -22,6 +22,14 @@
                type="text"
                required/>
       </div>
+
+      <div bst-form-group label="{{ 'Description' | translate }}">
+        <input id="description"
+	       name="description"
+	       ng-model="repository.description"
+	       type="text"/>
+      </div>
+
       <div bst-form-group label="{{ 'Type' | translate }}">
         <select required
                 id="content_type"

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

@@ -32,7 +32,7 @@ angular.module('Bastion.products').controller('DiscoveryController',
             {id: "yum", name: "Yum Repositories"},
             {id: "docker", name: "Container Images"}
         ];
-
+        $scope.hideSwitcher = true;
         if (!$scope.table) {
             $scope.table = {
                 rows: [],

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/views/discovery-create.html

@@ -44,7 +44,7 @@
 
     <div bst-form-group ng-show="createRepoChoices.newProduct === 'true' && contentCredentials.length !== 0"
          label="{{ 'GPG Key' | translate }}">
-      <select class="form-control" ng-model="createRepoChoices.product.gpg_key_id"
+      <select class="form-control" ng-model="createRepoChoices.product.content_credential_id"
               ng-options="content_credential.id as content_credential.name for content_credential in contentCredentials"/>
     </div>
 

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

@@ -38,8 +38,3 @@
 .bottom-padded-content {
   padding-bottom: 10%;
 }
-
-.modal-body .uib-time input {
-  width: 100%;
-  padding-right: 6px;
-}

data/lib/katello/engine.rb

@@ -103,6 +103,7 @@ module Katello
     initializer "katello.paths", :before => :sooner_routes_load do |app|
       app.routes_reloader.paths << "#{Katello::Engine.root}/config/routes/api/v2.rb"
       app.routes_reloader.paths << "#{Katello::Engine.root}/config/routes/api/rhsm.rb"
+      app.routes_reloader.paths << "#{Katello::Engine.root}/config/routes/api/registry.rb"
       app.routes_reloader.paths.unshift("#{Katello::Engine.root}/config/routes/overrides.rb")
     end
 

data/lib/katello/permission_creator.rb

@@ -73,6 +73,7 @@ module Katello
                    'katello/api/v2/content_view_puppet_modules' => [:index, :show, :auto_complete_search],
                    'katello/api/v2/content_view_versions' => [:index, :show, :auto_complete_search],
                    'katello/api/v2/content_view_components' => [:index, :show],
+                   'katello/api/v2/packages' => [:index],
                    'katello/api/v2/package_groups' => [:index, :show, :auto_complete_search, :compare],
                    'katello/api/v2/errata' => [:index, :show, :auto_complete_search, :compare, :available_errata],
                    'katello/api/v2/puppet_modules' => [:index, :show, :auto_complete_search, :compare],
@@ -112,6 +113,7 @@ module Katello
       @plugin.permission :edit_content_views,
                          {
                            'katello/api/v2/content_views' => [:update],
+                           'katello/api/v2/content_view_versions' => [:update],
                            'katello/api/v2/content_view_filters' => [:create, :update, :destroy],
                            'katello/api/v2/content_view_filter_rules' => [:create, :update, :destroy],
                            'katello/api/v2/content_view_puppet_modules' => [:create, :update, :destroy],

data/lib/katello/permissions/registry_permissions.rb

@@ -0,0 +1,20 @@
+require 'katello/plugin.rb'
+
+Foreman::AccessControl.permission(:create_personal_access_tokens).actions.concat [
+  'katello/api/registry/registry_proxies/token',
+  'katello/api/registry/registry_proxies/v1_ping',
+  'katello/api/registry/registry_proxies/ping',
+  'katello/api/registry/registry_proxies/v1_search',
+  'katello/api/registry/registry_proxies/catalog',
+  'katello/api/registry/registry_proxies/tags_list',
+  'katello/api/registry/registry_proxies/pull_manifest',
+  'katello/api/registry/registry_proxies/push_manifest',
+  'katello/api/registry/registry_proxies/pull_blob',
+  'katello/api/registry/registry_proxies/check_blob',
+  'katello/api/registry/registry_proxies/start_upload_blob',
+  'katello/api/registry/registry_proxies/upload_blob',
+  'katello/api/registry/registry_proxies/chunk_upload_blob',
+  'katello/api/registry/registry_proxies/finish_upload_blob',
+  'katello/api/registry/registry_proxies/status_upload_blob',
+  'katello/api/registry/registry_proxies/cancel_upload_blob'
+]

data/lib/katello/plugin.rb

@@ -214,6 +214,7 @@ Foreman::Plugin.register :katello do
   logger :cp_proxy, :enabled => true
   logger :action, :enabled => true
   logger :manifest_import_logger, :enabled => true
+  logger :registry_proxy, :enabled => true
 
   widget 'errata_widget', :name => 'Latest Errata', :sizey => 1, :sizex => 6
   widget 'content_views_widget', :name => 'Content Views', :sizey => 1, :sizex => 6