katello 4.14.1 → 4.15.0.rc1

data/db/migrate/20160808002834_add_files.rb

@@ -12,7 +12,7 @@ class AddFiles < ActiveRecord::Migration[4.2]
     add_index :katello_files, [
       :id,
       :uuid,
-      :name
+      :name,
     ],
     :name => 'katello_files_fields_index'
 

data/db/migrate/20161014133811_move_content_view_version_description_to_histories.rb

@@ -15,7 +15,7 @@ class MoveContentViewVersionDescriptionToHistories < ActiveRecord::Migration[4.2
       publish: 1,
       promotion: 2,
       removal: 3,
-      export: 4
+      export: 4,
     }
   end
 

data/db/migrate/20200818192230_update_system_purpose_status.rb

@@ -5,7 +5,7 @@ class UpdateSystemPurposeStatus < ActiveRecord::Migration[6.0]
       "Katello::PurposeAddonsStatus",
       "Katello::PurposeRoleStatus",
       "Katello::PurposeSlaStatus",
-      "Katello::PurposeUsageStatus"
+      "Katello::PurposeUsageStatus",
     ]
 
     # load both sets of host statuses and *then* update them to make sure we update the correct statuses

data/db/migrate/20201012172713_remove_gpg_key_perms.rb

@@ -4,7 +4,7 @@ class RemoveGpgKeyPerms < ActiveRecord::Migration[6.0]
       Permission.find_by(name: :view_gpg_keys) => Permission.find_by(name: :view_content_credentials),
       Permission.find_by(name: :edit_gpg_keys) => Permission.find_by(name: :edit_content_credentials),
       Permission.find_by(name: :destroy_gpg_keys) => Permission.find_by(name: :destroy_content_credentials),
-      Permission.find_by(name: :create_gpg_keys) => Permission.find_by(name: :create_content_credentials)
+      Permission.find_by(name: :create_gpg_keys) => Permission.find_by(name: :create_content_credentials),
     }
   end
 

data/db/migrate/20210322142311_add_auth_url_token_to_root_repositories.rb

@@ -1,4 +1,4 @@
-class AddAuthUrlTokenToRootRepositories < ActiveRecord::Migration[6.0]
+class AddAuthURLTokenToRootRepositories < ActiveRecord::Migration[6.0]
   def change
     add_column :katello_root_repositories, :ansible_collection_auth_url, :text
     add_column :katello_root_repositories, :ansible_collection_auth_token, :text

data/db/migrate/20211220185935_clean_duplicate_content_units.rb

@@ -86,14 +86,14 @@ class CleanDuplicateContentUnits < ActiveRecord::Migration[6.0]
     handle_duplicate(Katello::DockerManifestList, 'docker_manifest_list_id', [:pulp_id],
                      associated_models: {
                        Katello::DockerManifestListManifest => :docker_manifest_id,
-                       Katello::RepositoryDockerManifestList => :repository_id
+                       Katello::RepositoryDockerManifestList => :repository_id,
                      })
     add_index :katello_docker_manifest_lists, :pulp_id, :unique => true
 
     handle_duplicate(Katello::DockerManifest, 'docker_manifest_id', [:pulp_id],
                      associated_models: {
                        Katello::DockerManifestListManifest => :docker_manifest_list_id,
-                       Katello::RepositoryDockerManifest => :repository_id
+                       Katello::RepositoryDockerManifest => :repository_id,
                      })
     add_index :katello_docker_manifests, :pulp_id, :unique => true
   end

data/db/migrate/20230717150442_change_change_content_source_job_template_name.rb

@@ -1,6 +1,6 @@
 class ChangeChangeContentSourceJobTemplateName < ActiveRecord::Migration[6.1]
   TEMPLATE_NAMES = {
-    "Change content source" => "Configure host for new content source"
+    "Change content source" => "Configure host for new content source",
   }.freeze
 
   def up

data/db/migrate/20240207191223_remove_entitlement_mode_host_statuses.rb

@@ -11,7 +11,7 @@ class RemoveEntitlementModeHostStatuses < ActiveRecord::Migration[6.1]
       "Katello::PurposeAddonsStatus",
       "Katello::PurposeRoleStatus",
       "Katello::PurposeSlaStatus",
-      "Katello::PurposeUsageStatus"
+      "Katello::PurposeUsageStatus",
     ]
 
     ::HostStatus::Status.where(type: obsolete_statuses).delete_all

data/db/migrate/20240508100434_add_content_id_to_katello_repository.rb

@@ -0,0 +1,5 @@
+class AddContentIdToKatelloRepository < ActiveRecord::Migration[6.1]
+  def change
+    add_column :katello_repositories, :content_id, :string
+  end
+end

data/db/migrate/20240730163043_add_content_view_environment_activation_key.rb

@@ -0,0 +1,87 @@
+class AddContentViewEnvironmentActivationKey < ActiveRecord::Migration[6.1]
+  class FakeActivationKey < ApplicationRecord
+    self.table_name = 'katello_activation_keys'
+  end
+
+  def up
+    create_table :katello_content_view_environment_activation_keys do |t|
+      t.references :content_view_environment, :null => false, :index => false, :foreign_key => { :to_table => 'katello_content_view_environments' }
+      t.references :activation_key, :null => false, :index => false, :foreign_key => { :to_table => 'katello_activation_keys' }
+    end
+    ::Katello::Util::CVEAKMigrator.new.execute!
+    FakeActivationKey.all.each do |activation_key|
+      next if activation_key.environment_id.blank? && activation_key.content_view_id.blank?
+
+      cve_id = ::Katello::KTEnvironment.find(activation_key.environment_id)
+          .content_view_environments
+          .find_by(content_view_id: activation_key.content_view_id)
+          &.id
+      unless cve_id.present? && ::Katello::ContentViewEnvironmentActivationKey.create(
+        activation_key_id: activation_key.id,
+        content_view_environment_id: cve_id
+      )
+        Rails.logger.warn "Failed to create ContentViewEnvironmentActivationKey for activation_key #{activation_key.id}"
+      end
+    end
+
+    remove_column :katello_activation_keys, :content_view_id
+    remove_column :katello_activation_keys, :environment_id
+  end
+
+  def down
+    add_column :katello_activation_keys, :content_view_id, :integer, :index => true
+    add_column :katello_activation_keys, :environment_id, :integer, :index => true
+
+    add_foreign_key "katello_activation_keys", "katello_content_views",
+                    :name => "katello_activation_keys_content_view_id", :column => "content_view_id"
+
+    add_foreign_key "katello_activation_keys", "katello_environments",
+                    :name => "katello_activation_keys_environment_id", :column => "environment_id"
+
+    ::Katello::ActivationKey.reset_column_information
+
+    ::Katello::ContentViewEnvironmentActivationKey.unscoped.all.each do |cveak|
+      activation_key = cveak.activation_key
+      cve = cveak.content_view_environment
+      default_org = cve.environment&.organization
+      default_cv_id = default_org&.default_content_view&.id
+      default_lce_id = default_org&.library&.id
+      cv_id = cveak.content_view_environment.content_view_id || default_cv_id
+      lce_id = cveak.content_view_environment.environment_id || default_lce_id
+      say "Updating activation_key #{activation_key.id} with cv_id #{cv_id} and lce_id #{lce_id}"
+      activation_key.content_view_id = cv_id
+      activation_key.environment_id = lce_id
+      activation_key.save(validate: false)
+    end
+
+    ensure_no_null_cv_lce
+    change_column :katello_activation_keys, :content_view_id, :integer, :null => false
+    change_column :katello_activation_keys, :environment_id, :integer, :null => false
+
+    drop_table :katello_content_view_environment_activation_keys
+  end
+
+  def ensure_no_null_cv_lce
+    # The following is to try to prevent PG::NotNullViolation: ERROR:  column "content_view_id" contains null values
+    # since we add null constraints to the columns in the next step
+    activation_keys_without_cv = ::Katello::ActivationKey.where(content_view_id: nil)
+    if activation_keys_without_cv.any?
+      say "Found #{activation_keys_without_cv.count} activation_keys with nil content_view_id"
+      activation_keys_without_cv.each do |activation_key|
+        say "reassigning bad activation_key #{activation_key.id} to default content view"
+        activation_key.content_view_id = activation_key&.organization&.default_content_view&.id
+        activation_key.save(validate: false)
+      end
+    end
+
+    activation_keys_without_lce = ::Katello::ActivationKey.where(environment_id: nil)
+    if activation_keys_without_lce.any?
+      say "Found #{activation_keys_without_lce.count} activation_keys with nil environment_id"
+      activation_keys_without_lce.each do |activation_key|
+        say "reassigning bad activation_key #{activation_key.id} to default lifecycle environment"
+        activation_key.environment_id = activation_key&.organization&.library&.id
+        activation_key.save(validate: false)
+      end
+    end
+  end
+end

data/db/migrate/20240806130902_add_more_deb_fields.rb

@@ -0,0 +1,15 @@
+class AddMoreDebFields < ActiveRecord::Migration[6.1]
+  def up
+    add_column :katello_debs, :section, :string, :limit => 255
+    add_column :katello_debs, :maintainer, :string, :limit => 255
+    add_column :katello_debs, :homepage, :string, :limit => 255
+    add_column :katello_debs, :installed_size, :string, :limit => 255
+  end
+
+  def down
+    remove_column :katello_debs, :section
+    remove_column :katello_debs, :maintainer
+    remove_column :katello_debs, :homepage
+    remove_column :katello_debs, :installed_size
+  end
+end

data/db/migrate/20240903194428_add_priority_to_content_view_environment_activation_key.rb

@@ -0,0 +1,5 @@
+class AddPriorityToContentViewEnvironmentActivationKey < ActiveRecord::Migration[6.1]
+  def change
+    add_column :katello_content_view_environment_activation_keys, :priority, :integer, default: 0, null: false
+  end
+end

data/db/migrate/20241007200316_add_fields_to_katello_docker_manifest_list.rb

@@ -0,0 +1,8 @@
+class AddFieldsToKatelloDockerManifestList < ActiveRecord::Migration[6.1]
+  def change
+    add_column :katello_docker_manifest_lists, :annotations, :jsonb, default: {}
+    add_column :katello_docker_manifest_lists, :labels, :jsonb, default: {}
+    add_column :katello_docker_manifest_lists, :is_bootable, :boolean, default: false
+    add_column :katello_docker_manifest_lists, :is_flatpak, :boolean, default: false
+  end
+end

data/db/migrate/20241007212705_add_bootc_facts_to_content_facet.rb

@@ -0,0 +1,27 @@
+class AddBootcFactsToContentFacet < ActiveRecord::Migration[6.1]
+  def change
+    add_column :katello_content_facets, :bootc_booted_image, :string
+    add_column :katello_content_facets, :bootc_booted_digest, :string
+
+    add_column :katello_content_facets, :bootc_available_image, :string
+    add_column :katello_content_facets, :bootc_available_digest, :string
+
+    add_column :katello_content_facets, :bootc_staged_image, :string
+    add_column :katello_content_facets, :bootc_staged_digest, :string
+
+    add_column :katello_content_facets, :bootc_rollback_image, :string
+    add_column :katello_content_facets, :bootc_rollback_digest, :string
+
+    add_index :katello_content_facets, :bootc_booted_image
+    add_index :katello_content_facets, :bootc_booted_digest
+
+    add_index :katello_content_facets, :bootc_available_image
+    add_index :katello_content_facets, :bootc_available_digest
+
+    add_index :katello_content_facets, :bootc_staged_image
+    add_index :katello_content_facets, :bootc_staged_digest
+
+    add_index :katello_content_facets, :bootc_rollback_image
+    add_index :katello_content_facets, :bootc_rollback_digest
+  end
+end

data/db/migrate/20241025151105_remove_pulp3_migrated_hrefs_from_content_tables.rb

@@ -0,0 +1,10 @@
+class RemovePulp3MigratedHrefsFromContentTables < ActiveRecord::Migration[6.1]
+  def change
+    content_models = [Katello::Rpm, Katello::ModuleStream, Katello::Erratum, Katello::PackageGroup, Katello::YumMetadataFile,
+                      Katello::Srpm, Katello::FileUnit, Katello::DockerManifestList, Katello::DockerManifest, Katello::DockerTag]
+
+    content_models.each do |model|
+      remove_column model.table_name, :migrated_pulp3_href, :string
+    end
+  end
+end

data/db/migrate/20241030181402_create_katello_flatpak_tables.rb

@@ -0,0 +1,41 @@
+class CreateKatelloFlatpakTables < ActiveRecord::Migration[6.1]
+  #rubocop:disable Metrics/MethodLength
+  def change
+    create_table :katello_flatpak_remotes do |t|
+      t.string :name, null: false
+      t.string :url, null: false
+      t.integer :organization_id, null: false
+      t.text :description
+      t.boolean :seeded, default: false, null: false
+      t.string :username
+      t.text :token
+      t.timestamps
+    end
+
+    add_foreign_key :katello_flatpak_remotes, :taxonomies, name: 'katello_flatpak_remotes_organization_id', column: :organization_id
+
+    create_table :katello_flatpak_remote_repositories do |t|
+      t.string :name, null: false
+      t.string :label, null: false
+      t.integer :flatpak_remote_id, null: false
+      t.timestamps
+    end
+
+    create_table :katello_flatpak_remote_repository_manifests do |t|
+      t.integer :flatpak_remote_repository_id, null: false
+      t.string :digest, null: false
+      t.string :tags, array: true, default: []
+      t.string :name, null: false
+      t.boolean :application, default: true, null: false
+      t.text :runtime
+      t.string :flatpak_ref, null: false
+      t.timestamps
+    end
+
+    add_index :katello_flatpak_remote_repository_manifests, :flatpak_ref, name: 'index_remote_repository_manifests_on_flatpak_ref'
+    add_index :katello_flatpak_remote_repository_manifests, [:flatpak_remote_repository_id, :digest], unique: true, name: 'index_remote_repository_manifests_on_repo_id_and_digest'
+    add_foreign_key :katello_flatpak_remote_repository_manifests, :katello_flatpak_remote_repositories, column: :flatpak_remote_repository_id
+    add_foreign_key :katello_flatpak_remote_repositories, :katello_flatpak_remotes, column: :flatpak_remote_id
+  end
+  #rubocop:enable Metrics/MethodLength
+end

data/db/seeds.d/106-mail_notifications.rb

@@ -20,21 +20,21 @@ User.as(::User.anonymous_api_admin.login) do
      :description => N_('A summary of available and applicable errata for your hosts'),
      :mailer => 'Katello::ErrataMailer',
      :method => 'host_errata',
-     :subscription_type => 'report'
+     :subscription_type => 'report',
     },
 
     {:name => :sync_errata,
      :description => N_('A summary of new errata after a repository is synchronized'),
      :mailer => 'Katello::ErrataMailer',
      :method => 'sync_errata',
-     :subscription_type => 'alert'
+     :subscription_type => 'alert',
     },
 
     {:name => :promote_errata,
      :description => N_('A post-promotion summary of hosts with installable errata'),
      :mailer => 'Katello::ErrataMailer',
      :method => 'promote_errata',
-     :subscription_type => 'alert'
+     :subscription_type => 'alert',
     },
 
     {:name => :subscriptions_expiring_soon,
@@ -42,36 +42,36 @@ User.as(::User.anonymous_api_admin.login) do
      :mailer => 'Katello::SubscriptionMailer',
      :method => 'subscription_expiry',
      :subscription_type => 'report',
-     :queryable => true
+     :queryable => true,
     },
 
     {:name => :repository_sync_failure,
      :description => N_('A notification about failed repository sync'),
      :mailer => 'Katello::TaskMailer',
      :method => 'repo_sync_failure',
-     :subscription_type => 'alert'
+     :subscription_type => 'alert',
     },
 
     {:name => :content_view_publish_failure,
      :description => N_('A notification about failed content view publish'),
      :mailer => 'Katello::TaskMailer',
      :method => 'cv_publish_failure',
-     :subscription_type => 'alert'
+     :subscription_type => 'alert',
     },
 
     {:name => :content_view_promote_failure,
      :description => N_('A notification about failed content view promotion'),
      :mailer => 'Katello::TaskMailer',
      :method => 'cv_promote_failure',
-     :subscription_type => 'alert'
+     :subscription_type => 'alert',
     },
 
     {:name => :proxy_sync_failure,
      :description => N_('A notification about failed proxy sync'),
      :mailer => 'Katello::TaskMailer',
      :method => 'proxy_sync_failure',
-     :subscription_type => 'alert'
-    }
+     :subscription_type => 'alert',
+    },
   ]
 
   notifications.each do |notification|

data/db/seeds.d/108-subcription-bookmarks.rb

@@ -9,7 +9,7 @@ User.as_anonymous_admin do
     bookmarks = [
       {:name => "list hypervisors", :query => 'hypervisor = true', :controller => "hosts"},
       {:name => "future", :query => 'starts > Today', :controller => "katello_subscriptions"},
-      {:name => "expiring soon", :query => 'expires 30 days from now', :controller => "katello_subscriptions"}
+      {:name => "expiring soon", :query => 'expires 30 days from now', :controller => "katello_subscriptions"},
     ]
 
     bookmarks.each do |input|

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

@@ -3,7 +3,7 @@ blueprints = [
     group: N_('Hosts'),
     name: 'host_lifecycle_expire_soon',
     message: N_('%{release}: %{number_of_hosts} hosts are approaching end of %{lifecycle} on %{end_date}. Please upgrade them before support expires. Check Report Host - Statuses for detail.'),
-    level: 'warning'
+    level: 'warning',
   },
   {
     group: N_('Proxies'),
@@ -15,87 +15,87 @@ blueprints = [
       links:
       [
         path_method: :smart_proxy_path,
-        title: N_('Details')
-      ]
-    }
+        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'
+    level: 'warning',
   },
   {
     group: N_('Subscriptions'),
     name: 'manifest_expire_soon_warning',
     message: N_('Manifest in organization %{subject} has an identity certificate that will expire in %{days_remaining} days, on %{manifest_expire_date}. To extend the expiration date, please refresh your manifest.'),
-    level: 'info'
+    level: 'info',
   },
   {
     group: N_('Subscriptions'),
     name: 'manifest_expired_warning',
     message: N_('The manifest imported within Organization %{subject} is no longer valid. Please import a new manifest.'),
-    level: 'warning'
+    level: 'warning',
   },
   {
     group: N_('Subscriptions'),
     name: 'manifest_import_success',
     message: N_('Manifest in \'%{subject}\' imported.'),
-    level: 'info'
+    level: 'info',
   },
   {
     group: N_('Subscriptions'),
     name: 'manifest_import_error',
     message: N_('Importing manifest into \'%{subject}\' failed.'),
-    level: 'error'
+    level: 'error',
   },
   {
     group: N_('Subscriptions'),
     name: 'manifest_refresh_success',
     message: N_('Manifest in \'%{subject}\' refreshed.'),
-    level: 'info'
+    level: 'info',
   },
   {
     group: N_('Subscriptions'),
     name: 'manifest_refresh_error',
     message: N_('Manifest in \'%{subject}\' failed to refresh.'),
-    level: 'error'
+    level: 'error',
   },
   {
     group: N_('Subscriptions'),
     name: 'manifest_delete_success',
     message: N_('Manifest in \'%{subject}\' deleted.'),
-    level: 'info'
+    level: 'info',
   },
   {
     group: N_('Subscriptions'),
     name: 'manifest_delete_error',
     message: N_('Deleting manifest in \'%{subject}\' failed.'),
-    level: 'error'
+    level: 'error',
   },
   {
     group: N_('Subscriptions'),
     name: 'sca_enable_success',
     message: N_('Simple Content Access has been enabled for \'%{subject}\'.'),
-    level: 'info'
+    level: 'info',
   },
   {
     group: N_('Subscriptions'),
     name: 'sca_enable_error',
     message: N_('Enabling Simple Content Access failed for \'%{subject}\'.'),
-    level: 'error'
+    level: 'error',
   },
   {
     group: N_('Subscriptions'),
     name: 'sca_disable_success',
     message: N_('Simple Content Access has been disabled for \'%{subject}\'.'),
-    level: 'info'
+    level: 'info',
   },
   {
     group: N_('Subscriptions'),
     name: 'sca_disable_error',
     message: N_('Disabling Simple Content Access failed for \'%{subject}\'.'),
-    level: 'error'
+    level: 'error',
   },
   {
     group: N_('System Status'),
@@ -105,10 +105,10 @@ blueprints = [
     actions: {
       links: [
         path_method: :about_index_path,
-        title: N_('About page')
-      ]
-    }
-  }
+        title: N_('About page'),
+      ],
+    },
+  },
 ]
 
 blueprints.each { |blueprint| UINotifications::Seed.new(blueprint).configure }

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

@@ -9,8 +9,8 @@
     {
       links:
       [
-      ]
-    }
+      ],
+    },
   },
   {
     group: N_('Content View'),
@@ -21,8 +21,8 @@
     {
       links:
       [
-      ]
-    }
+      ],
+    },
 
-  }
+  },
 ].each { |blueprint| UINotifications::Seed.new(blueprint).configure }

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

@@ -7,7 +7,7 @@
 User.as_anonymous_admin do
   Bookmark.without_auditing do
     bookmarks = [
-      {:name => "Without a Tag", :query => 'not has tag', :controller => "katello_docker_manifests"}
+      {:name => "Without a Tag", :query => 'not has tag', :controller => "katello_docker_manifests"},
     ]
 
     bookmarks.each do |input|

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

@@ -10,6 +10,6 @@ UpgradeTask.define_tasks(:katello) do
     {:name => 'katello:upgrades:4.4:publish_import_cvvs'},
     {:name => 'katello:upgrades:4.8:fix_incorrect_providers'},
     {:name => 'katello:upgrades:4.8:regenerate_imported_repository_metadata'},
-    {:name => 'katello:upgrades:4.12:update_content_access_modes'}
+    {:name => 'katello:upgrades:4.12:update_content_access_modes'},
   ]
 end

data/engines/bastion/lib/bastion/engine.rb

@@ -23,7 +23,7 @@ module Bastion
 
       SETTINGS[:bastion][:assets][:precompile] = [
         'bastion/bastion.css',
-        'bastion/bastion.js'
+        'bastion/bastion.js',
       ]
 
       locale_files = Dir.glob("#{Bastion::Engine.root}/vendor/assets/javascripts/#{Bastion.localization_path("*")}")

data/engines/bastion/lib/bastion.rb

@@ -20,7 +20,7 @@ module Bastion
     url_root = ENV['RAILS_RELATIVE_URL_ROOT']
     base_config = {
       'markTranslated' => SETTINGS[:mark_translated] || false,
-      'relativeUrlRoot' => url_root ? url_root + '/' : '/'
+      'relativeUrlRoot' => url_root ? url_root + '/' : '/',
     }
 
     Bastion.plugins.each do |_name, plugin|

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

@@ -38,6 +38,14 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyRepositorySet
 
         $scope.repositoryType = {};
 
+        $scope.repositoryStatuses = {
+            enabled: translate("Enabled"),
+            disabled: translate("Disabled"),
+            overridden: translate("Overridden")
+        };
+
+        $scope.repositoryStatus = {};
+
         $scope.contentAccessModes = {
             contentAccessModeAll: true,
             contentAccessModeEnv: true
@@ -51,6 +59,14 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyRepositorySet
             $scope.nutupane.refresh();
         };
 
+        $scope.selectRepositoryStatus = function () {
+            delete $scope.nutupane.table.params.status;
+            if (!_.isEmpty($scope.repositoryStatus.value)) {
+                $scope.nutupane.table.params.status = $scope.repositoryStatus.value;
+            }
+            $scope.nutupane.refresh();
+        };
+
         $scope.toggleFilters = function () {
             $scope.nutupane.table.params['content_access_mode_env'] = $scope.contentAccessModes.contentAccessModeEnv;
             $scope.nutupane.table.params['content_access_mode_all'] = true;