katello 3.6.0.1.rc2 → 3.7.0.rc1

data/db/migrate/20161014133811_move_content_view_version_description_to_histories.rb

@@ -25,7 +25,8 @@ class MoveContentViewVersionDescriptionToHistories < ActiveRecord::Migration[4.2
       publish_history ||= CVHistory.create!(action: CVHistory.actions[:publish],
                                             katello_content_view_version_id: version.id,
                                             status: 'successful',
-                                            user: ''
+                                            user: '',
+                                            created_at: version.created_at
                                            )
 
       publish_history.update_attributes!(notes: version[:description])

data/db/migrate/20161214151548_move_content_source_id_to_content_facets.rb

@@ -6,8 +6,8 @@ class MoveContentSourceIdToContentFacets < ActiveRecord::Migration[4.2]
 
     Host.find_each do |host|
       content_facet = host.content_facet
-      if content_facet && host.content_source_id
-        content_facet.content_source_id = host.content_source_id
+      if content_facet && (content_source_id = host.read_attribute(:content_source_id))
+        content_facet.content_source_id = content_source_id
         content_facet.save!
       end
     end

data/db/migrate/20171110082124_add_ssl_certs_to_products_and_repos.rb

@@ -0,0 +1,42 @@
+class AddSslCertsToProductsAndRepos < ActiveRecord::Migration[4.2]
+  def up
+    add_column :katello_products, :ssl_ca_cert_id, :integer, :null => true
+    add_index :katello_products, :ssl_ca_cert_id
+    add_foreign_key :katello_products, :katello_gpg_keys, :name => "katello_products_ssl_ca_cert_id_fk", :column => :ssl_ca_cert_id, :primary_key => :id
+
+    add_column :katello_products, :ssl_client_cert_id, :integer, :null => true
+    add_index :katello_products, :ssl_client_cert_id
+    add_foreign_key :katello_products, :katello_gpg_keys, :name => "katello_products_ssl_client_cert_id_fk", :column => :ssl_client_cert_id, :primary_key => :id
+
+    add_column :katello_products, :ssl_client_key_id, :integer, :null => true
+    add_index :katello_products, :ssl_client_key_id
+    add_foreign_key :katello_products, :katello_gpg_keys, :name => "katello_products_ssl_client_key_id_fk", :column => :ssl_client_key_id, :primary_key => :id
+
+    add_column :katello_repositories, :ssl_ca_cert_id, :integer, :null => true
+    add_index :katello_repositories, :ssl_ca_cert_id
+    add_foreign_key :katello_repositories, :katello_gpg_keys, :name => "katello_repositories_ssl_ca_cert_id_fk", :column => :ssl_ca_cert_id, :primary_key => :id
+
+    add_column :katello_repositories, :ssl_client_cert_id, :integer, :null => true
+    add_index :katello_repositories, :ssl_client_cert_id
+    add_foreign_key :katello_repositories, :katello_gpg_keys, :name => "katello_repositories_ssl_client_cert_id_fk", :column => :ssl_client_cert_id, :primary_key => :id
+
+    add_column :katello_repositories, :ssl_client_key_id, :integer, :null => true
+    add_index :katello_repositories, :ssl_client_key_id
+    add_foreign_key :katello_repositories, :katello_gpg_keys, :name => "katello_repositories_ssl_client_key_id_fk", :column => :ssl_client_key_id, :primary_key => :id
+
+    add_column :katello_gpg_keys, :content_type, :string, :null => false, :default => "gpg_key", :limit => 255
+    Katello::GpgKey.update_all(:content_type => "gpg_key")
+  end
+
+  def down
+    remove_column :katello_products, :ssl_ca_cert_id
+    remove_column :katello_products, :ssl_client_cert_id
+    remove_column :katello_products, :ssl_client_key_id
+
+    remove_column :katello_repositories, :ssl_ca_cert_id
+    remove_column :katello_repositories, :ssl_client_cert_id
+    remove_column :katello_repositories, :ssl_client_key_id
+
+    remove_column :katello_gpg_keys, :content_type
+  end
+end

data/db/migrate/20171214050230_add_auto_publish_to_content_views.rb

@@ -0,0 +1,5 @@
+class AddAutoPublishToContentViews < ActiveRecord::Migration[5.1]
+  def change
+    add_column :katello_content_views, :auto_publish, :boolean, :null => false, :default => false
+  end
+end

data/db/migrate/20180117202932_sub_facet_add_installed_products.rb

@@ -0,0 +1,20 @@
+class SubFacetAddInstalledProducts < ActiveRecord::Migration[5.1]
+  def change
+    create_table :katello_installed_products do |t|
+      t.string :name
+      t.string :cp_product_id
+      t.string :arch
+      t.string :version
+    end
+
+    create_table :katello_subscription_facet_installed_products do |t|
+      t.references :installed_product, :index => {:name => :katello_sub_facet_installed_products_ipid}
+      t.references :subscription_facet, :index => {:name => :katello_sub_facet_installed_products_sfid}
+    end
+
+    add_foreign_key "katello_subscription_facet_installed_products", "katello_subscription_facets",
+                        :name => "katello_sub_facet_installed_product_facet_id", :column => "subscription_facet_id"
+    add_foreign_key "katello_subscription_facet_installed_products", "katello_installed_products",
+                        :name => "katello_sub_facet_installed_product_product_id", :column => "installed_product_id"
+  end
+end

data/db/migrate/20180119152210_add_compliance_reasons.rb

@@ -0,0 +1,11 @@
+class AddComplianceReasons < ActiveRecord::Migration[5.1]
+  def change
+    create_table :katello_compliance_reasons do |t|
+      t.string :reason
+      t.references :subscription_facet
+    end
+
+    add_foreign_key "katello_compliance_reasons", "katello_subscription_facets",
+                        :name => "katello_compliance_reasons_facet_id", :column => "subscription_facet_id"
+  end
+end

data/db/migrate/20180207232901_add_triggered_by_to_content_view_history.rb

@@ -0,0 +1,7 @@
+class AddTriggeredByToContentViewHistory < ActiveRecord::Migration[5.1]
+  def change
+    add_column :katello_content_view_histories, :triggered_by_id, :integer, :null => true
+    add_foreign_key "katello_content_view_histories", "katello_content_view_versions",
+                :name => "katello_cv_history_versions_triggered_by_fk", :column => "triggered_by_id"
+  end
+end

data/db/migrate/20180218191449_add_manifest_refreshed_at_to_organization.rb

@@ -0,0 +1,9 @@
+class AddManifestRefreshedAtToOrganization < ActiveRecord::Migration[5.1]
+  def up
+    add_column(:taxonomies, :manifest_refreshed_at, :datetime)
+  end
+
+  def down
+    remove_column(:taxonomies, :manifest_refreshed_at)
+  end
+end

data/db/migrate/20180227094827_use_uuid_for_task_id.rb

@@ -0,0 +1,26 @@
+class UseUuidForTaskId < ActiveRecord::Migration[5.0]
+  # PostgreSQL has a special column type for storing UUIDs.
+  # Using this type instead of generic string should lead to having
+  #  smaller DB and possibly better overall performance.
+  def up
+    if on_postgresql?
+      change_table :katello_content_view_histories do |t|
+        t.change :task_id, :uuid, :using => 'task_id::uuid'
+      end
+    end
+  end
+
+  def down
+    if on_postgresql?
+      change_table :katello_content_view_histories do |t|
+        t.change :task_id, :string, :null => true, :limit => 255
+      end
+    end
+  end
+
+  private
+
+  def on_postgresql?
+    ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
+  end
+end

data/db/migrate/20180323175122_add_registry_name_pattern_to_environment.rb

@@ -0,0 +1,11 @@
+class AddRegistryNamePatternToEnvironment < ActiveRecord::Migration[5.1]
+  def up
+    add_column(:katello_environments, :registry_name_pattern, :string, limit: 255, null: true)
+    change_column(:katello_repositories, :container_repository_name, :string, unique: true)
+  end
+
+  def down
+    remove_column(:katello_environments, :registry_name_pattern)
+    change_column(:katello_repositories, :container_repository_name, :string, unique: false)
+  end
+end

data/db/migrate/20180326145716_subscription_cp_id_change.rb

@@ -0,0 +1,10 @@
+class SubscriptionCpIdChange < ActiveRecord::Migration[5.1]
+  def up
+    remove_column :katello_subscriptions, :cp_id
+    rename_column :katello_subscriptions, :product_id, :cp_id
+  end
+
+  def down
+    fail ActiveRecord::IrreversibleMigration
+  end
+end

data/db/migrate/20180326150339_move_stacking_id.rb

@@ -0,0 +1,25 @@
+class MoveStackingId < ActiveRecord::Migration[5.1]
+  class StackSubscription < ApplicationRecord
+    self.table_name = 'katello_subscriptions'
+    has_many :pools, :class_name => "StackPool", :inverse_of => :subscription, :dependent => :destroy, :foreign_key => 'subscription_id'
+  end
+
+  class StackPool < ApplicationRecord
+    self.table_name = 'katello_pools'
+    belongs_to :subscription, :inverse_of => :pools, :class_name => "StackSubscription"
+  end
+
+  def up
+    add_column :katello_pools, :stacking_id, :string
+
+    StackSubscription.find_each do |sub|
+      sub.pools.update_all(:stacking_id => sub.stacking_id)
+    end
+
+    remove_column :katello_subscriptions, :stacking_id
+  end
+
+  def down
+    fail ActiveRecord::IrreversibleMigration
+  end
+end

data/db/migrate/20180326190408_move_subscription_products.rb

@@ -0,0 +1,75 @@
+class MoveSubscriptionProducts < ActiveRecord::Migration[5.1]
+  class FakeSubscription < ApplicationRecord
+    self.table_name = 'katello_subscriptions'
+    has_many :pools, :class_name => "FakePool", :inverse_of => :subscription, :foreign_key => 'subscription_id'
+    has_many :subscription_products, :class_name => "FakeSubscriptionProduct", :inverse_of => :subscription, :foreign_key => 'subscription_id'
+  end
+
+  class FakeSubscriptionProduct < ApplicationRecord
+    self.table_name = 'katello_subscription_products'
+    belongs_to :subscription, :inverse_of => :subscription_products, :class_name => 'FakeSubscription'
+  end
+
+  class FakePool < ApplicationRecord
+    self.table_name = 'katello_pools'
+    belongs_to :subscription, :inverse_of => :pools, :class_name => "FakeSubscription"
+    has_many :pool_products, :class_name => "FakePoolProducts", :inverse_of => :pool, :foreign_key => 'pool_id'
+  end
+
+  class FakePoolProducts < ApplicationRecord
+    self.table_name = 'katello_pool_products'
+    belongs_to :pool, :inverse_of => :pool_products, :class_name => 'FakePool'
+  end
+
+  def up
+    create_table "katello_pool_products" do |t|
+      t.references :pool
+      t.references :product
+      t.timestamps
+    end
+    add_index "katello_pool_products", [:pool_id, :product_id], :unique => true,
+              :name => "index_katello_pool_products_on_subs_id_prod_id"
+
+    add_foreign_key "katello_pool_products", "katello_pools",
+                    :name => "katello_pool_products_pool_id_fk", :column => "pool_id"
+    add_foreign_key "katello_pool_products", "katello_products",
+                    :name => "katello_pool_products_product_id_fk", :column => "product_id"
+
+    FakeSubscription.find_each do |sub|
+      sub.subscription_products.each do |sub_product|
+        sub.pool_ids.each do |pool_id|
+          FakePoolProducts.create!(:pool_id => pool_id, :product_id => sub_product.product_id)
+        end
+      end
+    end
+
+    drop_table "katello_subscription_products"
+  end
+
+  def down
+    create_table "katello_subscription_products" do |t|
+      t.references :subscription
+      t.references :product
+      t.timestamps
+    end
+    add_index "katello_subscription_products", [:subscription_id, :product_id], :unique => true,
+              :name => "index_katello_subscriptions_products_on_subs_id_prod_id"
+
+    add_foreign_key "katello_subscription_products", "katello_subscriptions",
+                    :name => "katello_subscription_products_subscription_id_fk", :column => "subscription_id"
+    add_foreign_key "katello_subscription_products", "katello_products",
+                    :name => "katello_subscription_products_product_id_fk", :column => "product_id"
+
+    FakeSubscription.find_each do |sub|
+      pool = sub.pools.first
+      if pool
+        product_ids = pool.pool_products.pluck(:product_id)
+        product_ids.each do |product_id|
+          FakeSubscriptionProduct.create!(:product_id => product_id, :subscription_id => sub.id)
+        end
+      end
+    end
+
+    drop_table "katello_pool_products"
+  end
+end

data/db/migrate/20180402160223_clean_up_force_post_sync_action_setting.rb

@@ -0,0 +1,5 @@
+class CleanUpForcePostSyncActionSetting < ActiveRecord::Migration[5.1]
+  def change
+    Setting.where(:name => 'force_post_sync_actions', :category => 'Setting::Content').delete_all
+  end
+end

data/db/migrate/20180410140909_add_organization_id_to_pool.rb

@@ -0,0 +1,15 @@
+class AddOrganizationIdToPool < ActiveRecord::Migration[5.1]
+  def up
+    add_column :katello_pools, :organization_id, :integer
+    add_foreign_key 'katello_pools', 'taxonomies',
+                :name => 'katello_pools_organization_id', :column => 'organization_id'
+
+    Katello::Pool.find_each do |pool|
+      pool.update_attributes(:organization_id => pool.subscription.organization_id) if pool.subscription
+    end
+  end
+
+  def down
+    remove_column :katello_pools, :organization_id
+  end
+end

data/db/migrate/20180413153126_content_facet_applicable_rpms_index.rb

@@ -0,0 +1,5 @@
+class ContentFacetApplicableRpmsIndex < ActiveRecord::Migration[5.1]
+  def change
+    add_index :katello_content_facet_applicable_rpms, :content_facet_id, :name => "index_k_content_facet_applicable_rpms_on_content_facet_id"
+  end
+end

data/db/migrate/20180417031215_add_ignorable_content_to_repository.rb

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

data/db/migrate/20180521200848_drop_repo_rpms_timestamp_not_null.rb

@@ -0,0 +1,18 @@
+class DropRepoRpmsTimestampNotNull < ActiveRecord::Migration[5.1]
+  def change
+    tables = [:katello_repository_docker_manifest_lists,
+              :katello_repository_docker_manifests,
+              :katello_repository_errata,
+              :katello_repository_files,
+              :katello_repository_ostree_branches,
+              :katello_repository_package_groups,
+              :katello_repository_puppet_modules,
+              :katello_repository_rpms,
+              :katello_repository_srpms]
+
+    tables.each do |table|
+      change_column table, :created_at, :datetime, :null => true
+      change_column table, :updated_at, :datetime, :null => true
+    end
+  end
+end

data/db/seeds.d/109-katello-notification-blueprints.rb

@@ -12,6 +12,48 @@ blueprints = [
         title: N_('Details')
       ]
     }
+  },
+  {
+    group: N_('Subscriptions'),
+    name: 'subs_expire_soon',
+    message: N_('%{expiring_subs} subscriptions in %{subject} are going to expire in less than %{days} days. Please renew them before they expire to guarantee your hosts will continue receiving content.'),
+    level: 'warning'
+  },
+  {
+    group: N_('Subscriptions'),
+    name: 'manifest_import_success',
+    message: N_('Manifest in \'%{subject}\' imported.'),
+    level: 'info'
+  },
+  {
+    group: N_('Subscriptions'),
+    name: 'manifest_import_error',
+    message: N_('Importing manifest into \'%{subject}\' failed.'),
+    level: 'error'
+  },
+  {
+    group: N_('Subscriptions'),
+    name: 'manifest_refresh_success',
+    message: N_('Manifest in \'%{subject}\' refreshed.'),
+    level: 'info'
+  },
+  {
+    group: N_('Subscriptions'),
+    name: 'manifest_refresh_error',
+    message: N_('Manifest in \'%{subject}\' failed to refresh.'),
+    level: 'error'
+  },
+  {
+    group: N_('Subscriptions'),
+    name: 'manifest_delete_success',
+    message: N_('Manifest in \'%{subject}\' deleted.'),
+    level: 'info'
+  },
+  {
+    group: N_('Subscriptions'),
+    name: 'manifest_delete_error',
+    message: N_('Deleting manifest in \'%{subject}\' failed.'),
+    level: 'error'
   }
 ]
 

data/db/seeds.d/110-content-view-autopublish.rb

@@ -0,0 +1,15 @@
+# seeds UI notification blueprints that are supported by Content View.
+[
+  {
+    group: N_('Content View'),
+    name: 'content_view_auto_publish_error',
+    message: N_('Composite Content View \'%{subject}\' failed auto-publish'),
+    level: 'error',
+    actions:
+    {
+      links:
+      [
+      ]
+    }
+  }
+].each { |blueprint| UINotifications::Seed.new(blueprint).configure }

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

@@ -1,7 +1,9 @@
 if Katello.with_remote_execution?
   User.as_anonymous_admin do
     JobTemplate.without_auditing do
-      Dir[File.join("#{Katello::Engine.root}/app/views/foreman/job_templates/**/*.erb")].each do |template|
+      template_files = Dir[File.join("#{Katello::Engine.root}/app/views/foreman/job_templates/**/*.erb")]
+      template_files.reject! { |file| file.end_with?('_ansible_default.erb') } unless Katello.with_ansible?
+      template_files.each do |template|
         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!')

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

@@ -36,7 +36,7 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyAddSubscripti
         $scope.isAdding = false;
         $scope.contentNutupane.setSearchKey('subscriptionSearch');
         $scope.contentNutupane.masterOnly = true;
-
+        $scope.contextAdd = true;
         $scope.groupedSubscriptions = {};
         $scope.$watch('table.rows', function (rows) {
             $scope.groupedSubscriptions = SubscriptionsHelper.groupByProductName(rows);

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

@@ -30,10 +30,17 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyDetailsInfoCo
         });
 
         $scope.$watch('activationKey.environment', function (environment) {
-            if (environment && $scope.originalEnvironment) {
-                if (environment.id !== $scope.originalEnvironment.id) {
-                    $scope.editContentView = true;
+            if ($scope.originalEnvironment) {
+                if (environment) {
+                    if (environment.id !== $scope.originalEnvironment.id) {
+                        $scope.editContentView = true;
+                        $scope.disableEnvironmentSelection = true;
+                    }
+                } else {
                     $scope.disableEnvironmentSelection = true;
+                    $scope.editContentView = false;
+                    $scope.activationKey["environment_id"] = null;
+                    $scope.resetContentView($scope.activationKey);
                 }
             } else if (environment) {
                 $scope.editEnvironment = true;
@@ -57,10 +64,34 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyDetailsInfoCo
             $scope.editEnvironment = false;
             $scope.save(activationKey).then(function (actKey) {
                 $scope.originalEnvironment = actKey.environment;
+                $scope.resetEnvironmentPathSelector(activationKey);
             });
             $scope.disableEnvironmentSelection = false;
         };
 
+        $scope.resetEnvironmentPathSelector = function (activationKey) {
+            // reset "selected" in the environment widget.
+            _.each($scope.environments, function (environmentPath) {
+                _.each(environmentPath, function (individualEnv) {
+                    if (activationKey["environment_id"] !== individualEnv.id) {
+                        delete individualEnv.selected;
+                    } else {
+                        individualEnv.selected = true;
+                    }
+                });
+            });
+        };
+
+        $scope.resetEnvironment = function (activationKey) {
+            delete activationKey.environment;
+        };
+
+        $scope.resetContentView = function (activationKey) {
+            activationKey["content_view_id"] = null;
+            activationKey["content_view"] = null;
+            $scope.saveContentView(activationKey);
+        };
+
         $scope.releaseVersions = function () {
             var deferred = $q.defer();