katello 3.8.1 → 3.9.0.rc1

data/db/migrate/20180814202747_add_recurring_logic_to_sync_plan.rb

@@ -0,0 +1,12 @@
+class AddRecurringLogicToSyncPlan < ActiveRecord::Migration[5.1]
+  def change
+    add_column :katello_sync_plans, :foreman_tasks_recurring_logic_id, :integer
+    add_foreign_key :katello_sync_plans, :foreman_tasks_recurring_logics, :name => "katello_sync_plan_foreman_tasks_recurring_logic_fk", :column => "foreman_tasks_recurring_logic_id"
+    Katello::SyncPlan.find_each do |sync_plan|
+      User.as_anonymous_admin do
+        sync_plan.associate_recurring_logic
+        sync_plan.save!
+      end
+    end
+  end
+end

data/db/migrate/20180816142044_add_description_to_katello_module_streams.rb

@@ -0,0 +1,6 @@
+class AddDescriptionToKatelloModuleStreams < ActiveRecord::Migration[5.1]
+  def change
+    add_column :katello_module_streams, :description, :text
+    add_column :katello_module_streams, :summary, :text
+  end
+end

data/db/migrate/20180821144248_add_cron_logic_to_sync_plans.rb

@@ -0,0 +1,5 @@
+class AddCronLogicToSyncPlans < ActiveRecord::Migration[5.1]
+  def change
+    add_column :katello_sync_plans, :cron_expression, :string
+  end
+end

data/db/migrate/20180828161400_remove_join_table_for_role_and_usage.rb

@@ -0,0 +1,20 @@
+class RemoveJoinTableForRoleAndUsage < ActiveRecord::Migration[5.1]
+  def change
+    remove_foreign_key :katello_subscription_facet_purpose_roles, :katello_subscription_facets
+    remove_foreign_key :katello_subscription_facet_purpose_roles, :katello_purpose_roles
+    remove_foreign_key :katello_subscription_facet_purpose_usages, :katello_subscription_facets
+    remove_foreign_key :katello_subscription_facet_purpose_usages, :katello_purpose_usages
+
+    drop_table :katello_subscription_facet_purpose_roles
+    drop_table :katello_subscription_facet_purpose_usages
+    drop_table :katello_subscription_facet_purpose_addons
+
+    drop_table :katello_purpose_roles
+    drop_table :katello_purpose_usages
+    drop_table :katello_purpose_addons
+
+    add_column :katello_subscription_facets, :purpose_usage, :text
+    add_column :katello_subscription_facets, :purpose_role, :text
+    add_column :katello_subscription_facets, :purpose_addons, :text
+  end
+end

data/db/migrate/20180917173645_add_source_repo_checksum_type_to_katello_repositories.rb

@@ -1,4 +1,4 @@
-class AddSourceRepoChecksumTypeToKatelloRepositories < ActiveRecord::Migration[5.1]
+class AddSourceRepoChecksumTypeToKatelloRepositories < ActiveRecord::Migration[5.2]
   def change
     add_column :katello_repositories, :source_repo_checksum_type, :string
   end

data/db/migrate/20180920123913_drop_repo_module_streams_timestamp_not_null.rb

@@ -0,0 +1,7 @@
+class DropRepoModuleStreamsTimestampNotNull < ActiveRecord::Migration[5.2]
+  def change
+    change_column :katello_repository_module_streams, :created_at, :datetime, :null => true
+    change_column :katello_repository_module_streams, :updated_at, :datetime, :null => true
+    change_column :katello_repository_module_streams, :repository_id, :integer, :null => true
+  end
+end

data/db/migrate/20180920171008_change_repository_password_to_text.rb

@@ -0,0 +1,17 @@
+class ChangeRepositoryPasswordToText < ActiveRecord::Migration[5.2]
+  def up
+    change_column :katello_repositories, :upstream_password, :text
+  end
+
+  def down
+    add_column :katello_repositories, :temp_upstream_password, :string, :limit => 1024
+
+    Katello::Repository.find_each do |repo|
+      next if repo.upstream_password.blank?
+      repo.update_column(:temp_upstream_password, repo.upstream_password.length > 1024 ? nil : repo.upstream_password)
+    end
+
+    remove_column :katello_repositories, :upstream_password
+    rename_column :katello_repositories, :temp_upstream_password, :upstream_password
+  end
+end

data/db/migrate/20180920214134_create_repository_root.rb

@@ -0,0 +1,142 @@
+class CreateRepositoryRoot < ActiveRecord::Migration[5.1]
+  MOVED_COLUMNS = %w(name created_at updated_at major minor gpg_key_id content_id arch label url unprotected
+                     content_type product_id docker_upstream_name mirror_on_sync download_policy
+                     verify_ssl_on_sync upstream_username upstream_password ostree_upstream_sync_policy ostree_upstream_sync_depth
+                     deb_releases deb_components deb_architectures ignore_global_proxy ssl_ca_cert_id
+                     ssl_client_cert_id ssl_client_key_id ignorable_content description docker_tags_whitelist).freeze
+
+  REPO_ASSOCIATIONS = %w(RepositoryErratum ContentViewRepository RepositoryRpm RepositorySrpm RepositoryFile RepositoryPuppetModule
+                         RepositoryDockerManifest RepositoryDockerManifestList DockerTag DockerMetaTag RepositoryOstreeBranch RepositoryDeb
+                         ContentFacetRepository RepositoryPackageGroup RepositoryModuleStream).freeze
+
+  REPO_ASSOCIATIONS.each do |association|
+    CreateRepositoryRoot.const_set("Fake#{association}",
+       Class.new(Katello::Model) do
+         self.table_name = "katello_#{association.underscore.pluralize}"
+         belongs_to :repository, :inverse_of => association.underscore.to_sym,
+                                 :class_name => "FakeRepository"
+       end
+                                  )
+  end
+
+  class FakeContentFacet < Katello::Model
+    self.table_name = 'katello_content_facets'
+    belongs_to :kickstart_repository, :class_name => "CreateRepositoryConfiguration::FakeRepository", :inverse_of => :kickstart_content_facets
+  end
+
+  class FakeHostgroup < Katello::Model
+    self.table_name = 'hostgroups'
+    belongs_to :kickstart_repository, :class_name => "CreateRepositoryConfiguration::FakeRepository", :inverse_of => :kickstart_hostgroups
+  end
+
+  class FakeRepository < Katello::Model
+    self.table_name = 'katello_repositories'
+
+    REPO_ASSOCIATIONS.each do |association|
+      has_many association.underscore.pluralize.to_sym, :class_name => "CreateRepositoryConfiguration::Fake#{association}", :dependent => :delete_all, :inverse_of => :repository
+    end
+
+    has_many :kickstart_content_facets, :class_name => "CreateRepositoryConfiguration::FakeContentFacet", :foreign_key => :kickstart_repository_id,
+                          :inverse_of => :kickstart_repository, :dependent => :nullify
+
+    has_many :kickstart_hostgroups, :class_name => "CreateRepositoryConfiguration::FakeHostgroup", :foreign_key => :kickstart_repository_id,
+             :inverse_of => :kickstart_repository, :dependent => :nullify
+  end
+
+  class FakeRootRepository < Katello::Model
+    self.table_name = 'katello_root_repositories'
+  end
+
+  def up
+    create_root_table
+
+    with_repository_root_id do
+      create_and_associate_roots
+      FakeRepository.where(:root_id => nil).destroy_all
+    end
+
+    update_repository_table
+  end
+
+  def create_and_associate_roots
+    FakeRepository.where(:library_instance_id => nil).each do |library_instance|
+      clones = FakeRepository.where(:library_instance_id => library_instance.id).to_a
+      root = create_root(library_instance)
+      (clones + [library_instance]).each do |repo|
+        repo.update_attributes!(:root_id => root.id)
+      end
+    end
+  end
+
+  def with_repository_root_id
+    add_column :katello_repositories, :root_id, :integer, :null => true
+    add_foreign_key "katello_repositories", "katello_root_repositories", :name => "katello_root_repositories_repo_id", :column => 'root_id'
+
+    yield
+
+    change_column :katello_repositories, :root_id, :integer, :null => false
+  end
+
+  def create_root(repo)
+    attributes = repo.attributes.slice(*MOVED_COLUMNS)
+    attributes[:checksum_type] = repo.checksum_type || repo.source_repo_checksum_type
+    FakeRootRepository.create!(attributes)
+  end
+
+  # rubocop:disable MethodLength
+  def create_root_table
+    create_table 'katello_root_repositories' do |t|
+      t.string 'name', limit: 255
+      t.datetime 'created_at', null: false
+      t.datetime 'updated_at', null: false
+      t.integer 'major'
+      t.string 'minor', limit: 255
+      t.integer 'gpg_key_id'
+      t.string 'content_id', limit: 255
+      t.string 'arch', limit: 255, default: 'noarch', null: false
+      t.string 'label', limit: 255, null: false
+      t.string 'url', limit: 1024
+      t.boolean 'unprotected', default: false, null: false
+      t.string 'content_type', limit: 255, default: 'yum', null: false
+      t.integer 'product_id'
+      t.string 'checksum_type', limit: 255
+      t.string 'pulp_scratchpad_checksum_type', limit: 255
+      t.string 'docker_upstream_name', limit: 255
+      t.boolean 'mirror_on_sync', default: true, null: false
+      t.string 'download_policy', limit: 255
+      t.boolean 'verify_ssl_on_sync', default: true, null: false
+      t.string 'upstream_username', limit: 255
+      t.string 'upstream_password', limit: 1024
+      t.string 'ostree_upstream_sync_policy', limit: 25
+      t.integer 'ostree_upstream_sync_depth'
+      t.string 'deb_releases', limit: 255
+      t.string 'deb_components', limit: 255
+      t.string 'deb_architectures', limit: 255
+      t.boolean 'ignore_global_proxy', default: false, null: false
+      t.integer 'ssl_ca_cert_id'
+      t.integer 'ssl_client_cert_id'
+      t.integer 'ssl_client_key_id'
+      t.text 'ignorable_content'
+      t.text 'docker_tags_whitelist'
+      t.text 'description'
+    end
+
+    add_foreign_key "katello_root_repositories", "katello_products", :name => "katello_root_repositories_product_id", :column => 'product_id'
+    add_foreign_key "katello_root_repositories", "katello_gpg_keys", :name => "katello_root_repositories_gpg_key_id", :column => 'gpg_key_id'
+    add_foreign_key "katello_root_repositories", "katello_gpg_keys", :name => "katello_root_repositories_ssl_ca_cert_id", :column => 'ssl_ca_cert_id'
+    add_foreign_key "katello_root_repositories", "katello_gpg_keys", :name => "katello_root_repositories_ssl_client_cert_id", :column => 'ssl_client_cert_id'
+    add_foreign_key "katello_root_repositories", "katello_gpg_keys", :name => "katello_root_repositories_ssl_client_key_id", :column => 'ssl_client_key_id'
+  end
+
+  def update_repository_table
+    rename_column :katello_repositories, :checksum_type, :saved_checksum_type
+    remove_column :katello_repositories, :source_repo_checksum_type
+    MOVED_COLUMNS.each do |column|
+      remove_column :katello_repositories, column
+    end
+  end
+
+  def down
+    fail ActiveRecord::IrreversibleMigration
+  end
+end

data/db/seeds.d/111-container-image-bookmarks.rb

@@ -0,0 +1,19 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+#
+# !!! PLEASE KEEP THIS SCRIPT IDEMPOTENT !!!
+#
+
+User.as_anonymous_admin do
+  Bookmark.without_auditing do
+    bookmarks = [
+      {:name => "Without a Tag", :query => 'not has tag', :controller => "katello_docker_manifests"}
+    ]
+
+    bookmarks.each do |input|
+      next if SeedHelper.audit_modified? Bookmark, input[:name], :controller => input[:controller]
+      b = Bookmark.find_or_create_by({ :public => true }.merge(input))
+      fail "Unable to create bookmark: #{format_errors b}" if b.nil? || b.errors.any?
+    end
+  end
+end

data/db/seeds.d/111-upgrade_tasks.rb

@@ -0,0 +1,9 @@
+UpgradeTask.define_tasks(:katello) do
+  [
+    {:name => 'katello:correct_repositories', :long_running => true, :skip_failure => true, :always_run => true},
+    {:name => 'katello:correct_puppet_environments', :long_running => true, :skip_failure => true, :always_run => true},
+    {:name => 'katello:clean_backend_objects', :long_running => true, :skip_failure => true, :always_run => true},
+    {:name => 'katello:upgrades:3.8:clear_checksum_type'},
+    {:name => 'katello:upgrades:3.9:migrate_sync_plans'}
+  ]
+end

data/db/seeds.d/150-module_job_templates.rb

@@ -0,0 +1,12 @@
+if Katello.with_remote_execution?
+  User.as_anonymous_admin do
+    JobTemplate.without_auditing do
+      module_template = JobTemplate.find_by(name: 'Module Action - SSH Default')
+      if module_template
+        module_template.sync_feature('katello_module_stream_action')
+        module_template.organizations << Organization.unscoped.all if module_template.organizations.empty?
+        module_template.locations << Location.unscoped.all if module_template.locations.empty?
+      end
+    end
+  end
+end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/bastion-katello-bootstrap.js

@@ -12,6 +12,7 @@ BASTION_MODULES.push(
     'Bastion.hosts',
     'Bastion.puppet-modules',
     'Bastion.ostree-branches',
+    'Bastion.module-streams',
     'Bastion.environments',
     'Bastion.content-credentials',
     'Bastion.hosts',

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

@@ -37,6 +37,9 @@
 //= require "bastion_katello/debs/debs.module.js"
 //= require_tree "./debs"
 
+//= require "bastion_katello/module-streams/module-streams.module.js"
+//= require_tree "./module-streams"
+
 //= require "bastion_katello/errata/errata.module"
 //= require_tree "./errata"
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/module-stream-actions.service.js

@@ -0,0 +1,26 @@
+(function () {
+    'use strict';
+
+    /**
+     * @ngdoc service
+     * @name  Bastion.common.service:ModuleStreamActions
+     *
+     * @description
+     *   Provides common list of actions for module streams
+     */
+
+    function ModuleStreamActions(translate) {
+        this.getActions = function() {
+            return [
+                { action: 'enable', description: translate("Enable")},
+                { action: 'disable', description: translate("Disable")},
+                { action: 'install', description: translate("Install")},
+                { action: 'update', description: translate("Update")},
+                { action: 'remove', description: translate("Remove")}
+            ];
+        };
+    }
+
+    angular.module('Bastion.common').service('ModuleStreamActions', ModuleStreamActions);
+    ModuleStreamActions.$inject = ['translate'];
+})();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/subscription-add-or-remove.html

@@ -34,7 +34,7 @@
        </td>
        <td bst-table-cell ng-hide="contextAdd">{{ subscription.quantity_consumed }}</td>
        <td bst-table-cell>
-         <a ui-sref="subscription.info({subscriptionId: subscription.id})">
+         <a ng-href="/subscriptions/{{ subscription.id }}">
            {{ subscription | subscriptionConsumedFilter }}
          </a>
        </td>

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

@@ -0,0 +1,60 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.content-hosts.controller:ContentHostsBulkModuleStreamsModalController
+ *
+ * @requires $scope
+ * @requires $window
+ * @requires $timeout
+ * @requires $uibModalInstance
+ * @requires HostBulkAction
+ * @requires Nutupane
+ * @requires BastionConfig
+ * @requires hostIds
+ * @requires ModuleStreamActions
+ *
+ * @description
+ *   Provides the functionality for the content host module streams list and actions.
+ */
+
+angular.module('Bastion.content-hosts').controller('ContentHostsBulkModuleStreamsModalController',
+    ['$scope', '$window', '$timeout', '$uibModalInstance', 'HostBulkAction', 'Nutupane', 'BastionConfig',
+     'hostIds', 'ModuleStreamActions',
+    function ($scope, $window, $timeout, $uibModalInstance, HostBulkAction, Nutupane,
+              BastionConfig, hostIds, ModuleStreamActions) {
+        $scope.cancel = function () {
+            $uibModalInstance.dismiss('cancel');
+        };
+
+        $scope.moduleStreamActions = ModuleStreamActions.getActions();
+
+        $scope.working = false;
+
+        $scope.moduleStreamsNutupane = new Nutupane(HostBulkAction, hostIds, 'moduleStreams');
+        $scope.controllerName = 'katello_module_streams';
+        $scope.moduleStreamsNutupane.masterOnly = true;
+        $scope.table = $scope.moduleStreamsNutupane.table;
+        $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
+        $scope.remoteExecutionByDefault = BastionConfig.remoteExecutionByDefault;
+
+        $scope.moduleStreamActionFormValues = {
+            authenticityToken: $window.AUTH_TOKEN.replace(/"/g, ''),
+            remoteAction: 'module_stream_action',
+            search: hostIds.included.search
+        };
+
+        if (hostIds.included.ids) {
+            $scope.moduleStreamActionFormValues.hostIds = hostIds.included.ids.join(',');
+        }
+
+        $scope.performViaRemoteExecution = function(moduleSpec, actionType) {
+            $scope.working = true;
+            $scope.moduleStreamActionFormValues.moduleSpec = moduleSpec;
+            $scope.moduleStreamActionFormValues.moduleStreamAction = actionType;
+
+            $timeout(function () {
+                angular.element('#moduleStreamActionForm').submit();
+            }, 0);
+        };
+    }
+  ]
+);

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

@@ -28,7 +28,8 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkRepositorySe
         nutupaneParams = {
             'organization_id': CurrentOrganization,
             'offset': 0,
-            'paged': true
+            'paged': true,
+            'enabled': true
         };
 
         nutupane = new Nutupane(RepositorySet, nutupaneParams,

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-host-bulk-module-streams-modal.html

@@ -0,0 +1,70 @@
+<div data-extend-template="components/views/bst-modal.html">
+  <h4 data-block="modal-header">Content Host Module Stream Management</h4>
+  <div data-block="modal-body">
+    <div bst-feature-flag="remote_actions">
+      <h3 translate ng-hide="selectedModuleStreamOption === 'available'">Available Module Streams</h3>
+    </div>
+
+    <form id="moduleStreamActionForm" method="post" action="/katello/remote_execution">
+      <input type="hidden" name="remote_action" ng-value="moduleStreamActionFormValues.remoteAction"/>
+      <input type="hidden" name="module_stream_action" ng-value="moduleStreamActionFormValues.moduleStreamAction"/>
+      <input type="hidden" name="module_spec" ng-value="moduleStreamActionFormValues.moduleSpec"/>
+      <input type="hidden" name="scoped_search" ng-value="errataActionFormValues.search"/>
+      <input type="hidden" name="host_ids" ng-value="moduleStreamActionFormValues.hostIds"/>
+      <input type="hidden" name="customize" ng-value="moduleStreamActionFormValues.customize"/>
+      <input type="hidden" name="authenticity_token" ng-value="moduleStreamActionFormValues.authenticityToken"/>
+    </form>
+
+    <div data-extend-template="layouts/partials/table.html">
+
+    <span data-block="no-rows-message" translate>
+      There are no Module Streams to display.
+    </span>
+
+    <span data-block="no-search-results-message" translate>
+      Your search returned zero Module Streams.
+    </span>
+    <div data-block="table">
+      <table class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
+        <thead>
+          <tr bst-table-head>
+            <th bst-table-column translate>Name</th>
+            <th bst-table-column translate>Stream</th>
+            <th bst-table-column translate>Actions</th>
+          </tr>
+        </thead>
+
+        <tbody>
+          <tr bst-table-row ng-repeat="module in table.rows">
+            <td bst-table-cell>
+              <a href="/module_streams?search=module_spec%3D{{ module.module_spec }}">
+              {{ module.name }}</a></td>
+            <td bst-table-cell>{{ module.stream }}</td>
+            <td bst-table-cell>
+              <div class="dropdown" ng-hide="!remoteExecutionPresent || denied('edit_content_hosts', contentHost)">
+                <button class="btn btn-default dropdown-toggle" ng-disabled="$scope.working" type="button" id="dropdownMenu1" data-toggle="dropdown"> Actions
+                  <span class="caret"></span>
+                </button>
+                <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu1">
+                  <li role="presentation">
+                    <label class="drop-down-check-box">
+                      <input id="customize" name="customize" ng-model="moduleStreamActionFormValues.customize" type="checkbox"/>
+                      <span translate>Customize</span>
+                    </label>
+                  </li>
+                  <li role="presentation" class="divider"></li>
+
+                  <li role="presentation" ng-repeat="action in moduleStreamActions"><a role="menuitem" tabindex="-1" ng-click="performViaRemoteExecution(module.module_spec, action.action)" href="#">{{ action.description}}</a></li>
+                </ul>
+              </div>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
+  </div>
+  <div data-block="modal-footer">
+    <button class="btn btn-default" ng-click="cancel()" translate>Cancel</button>
+  </div>
+</div>