katello 4.14.1 → 4.15.0.rc2

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

@@ -11,7 +11,7 @@ if @content_source.present?
     {
       :name => @content_source.name,
       :id => @content_source_id,
-      :environment_is_associated => env.content_source_associated?(@content_source)
+      :environment_is_associated => env.content_source_associated?(@content_source),
     }
   end
 end
@@ -31,7 +31,7 @@ end
 node :counts do |env|
   counts = {
     :content_hosts => env.hosts.authorized("view_hosts").count,
-    :content_views => env.content_views.non_default.count
+    :content_views => env.content_views.non_default.count,
   }
   if env.library?
     repos = env.repositories.in_default_view
@@ -54,7 +54,7 @@ node :permissions do |env|
     :view_lifecycle_environments => env.readable?,
     :edit_lifecycle_environments => env.editable?,
     :destroy_lifecycle_environments => env.deletable?,
-    :promote_or_remove_content_views_to_environments => env.promotable_or_removable?
+    :promote_or_remove_content_views_to_environments => env.promotable_or_removable?,
   }
 end
 
@@ -62,7 +62,7 @@ node :content_views do |env|
   env.content_views.non_default.map do |cv|
     {
       :name => cv.name,
-      :id => cv.id
+      :id => cv.id,
     }
   end
 end

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

@@ -32,6 +32,6 @@ node :permissions do |gpg_key|
   {
     :view_gpg_keys => gpg_key.readable?,
     :edit_gpg_keys => gpg_key.editable?,
-    :destroy_gpg_keys => gpg_key.deletable?
+    :destroy_gpg_keys => gpg_key.deletable?,
   }
 end

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

@@ -9,7 +9,7 @@ extends "katello/api/v2/common/timestamps"
 node :permissions do |host_collection|
   {
     :deletable => host_collection.deletable?,
-    :editable => host_collection.editable?
+    :editable => host_collection.editable?,
 
   }
 end

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

@@ -20,7 +20,7 @@ if @facet
       {
         :id => content_view.id,
         :name => content_view.name,
-        :composite => content_view.composite?
+        :composite => content_view.composite?,
       }
     end
   end
@@ -29,7 +29,7 @@ if @facet
     if lifecycle_environment.present?
       {
         :id => lifecycle_environment.id,
-        :name => lifecycle_environment.name
+        :name => lifecycle_environment.name,
       }
     end
   end

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

@@ -13,8 +13,8 @@ node :repository do |package_group|
       :name => repo.name,
       :product => {
         :id => repo.product.id,
-        :name => repo.product.name
-      }
+        :name => repo.product.name,
+      },
     }
   end
 end

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

@@ -54,7 +54,7 @@ node :sync_status do |product|
     :display_size => local_sync_status[:display_size],
     :size => local_sync_status[:size],
     :is_running => local_sync_status[:is_running],
-    :error_details => local_sync_status[:error_details]
+    :error_details => local_sync_status[:error_details],
   }
 end
 
@@ -63,7 +63,7 @@ node :permissions do |product|
     :view_products => product.readable?,
     :edit_products => product.editable?,
     :destroy_products => product.deletable?,
-    :sync_products => product.syncable?
+    :sync_products => product.syncable?,
   }
 end
 

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

@@ -71,7 +71,7 @@ end
 node :permissions do |repo|
   {
     :deletable => repo.deletable?,
-    :deletable_across_cv => Setting[:delete_repo_across_cv]
+    :deletable_across_cv => Setting[:delete_repo_across_cv],
   }
 end
 

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

@@ -11,7 +11,7 @@ glue :content do
       vendor: content.vendor,
       type: content.content_type,
       gpgUrl: content.gpg_url,
-      contentUrl: content.content_url
+      contentUrl: content.content_url,
     }
   end
 

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

@@ -23,6 +23,6 @@ attributes :upstream_pool_id
 node :hypervisor, :if => lambda { |sub| sub && sub.respond_to?(:hypervisor) && sub.hypervisor } do |subscription|
   {
     id: subscription.hypervisor.id,
-    name: subscription.hypervisor.name
+    name: subscription.hypervisor.name,
   }
 end

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

@@ -27,12 +27,12 @@ node :activation_keys do |subscription|
       service_level: key.service_level,
       environment: {
         id: key.environment.try(:id),
-        name: key.environment.try(:name)
+        name: key.environment.try(:name),
       },
       content_view: {
         id: key.content_view.try(:id),
-        name: key.content_view.try(:name)
-      }
+        name: key.content_view.try(:name),
+      },
     }
   end
 end

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

@@ -25,6 +25,6 @@ node :permissions do |sync_plan|
   {
     :view_sync_plans => sync_plan.readable?,
     :edit_sync_plans => sync_plan.editable?,
-    :destroy_sync_plans => sync_plan.deletable?
+    :destroy_sync_plans => sync_plan.deletable?,
   }
 end

data/config/initializers/inflections.rb

@@ -1,4 +1,12 @@
 # Be sure to restart your server when you modify this file.
+Rails.autoloaders.each do |autoloader|
+  autoloader.inflector.inflect(
+    'kt_environment' => 'KTEnvironment',
+    'cdn' => 'CDN',
+    'cveak_migrator' => 'CVEAKMigrator',
+    'cvecf_migrator' => 'CVECFMigrator'
+  )
+end
 
 # Add new inflection rules using the following format
 # (all these examples are active by default):
@@ -9,4 +17,7 @@ ActiveSupport::Inflector.inflections do |inflect|
   #   inflect.uncountable %w(fish sheep)
 
   inflect.singular 'bases', 'base'
+
+  inflect.acronym 'SCA' # Simple Content Access
+  inflect.acronym 'CV' # Content view
 end

data/config/katello.yaml.example

@@ -17,22 +17,16 @@
     :oauth_key: katello
     :oauth_secret: katello
 
-    # refers to the candlepin-ca.crt location that is needed
-    # to connect to candlepin over https.This is not necessary
-    # if the candlepin server is running on the same machine as katello
-    # but required if the server is on a different machine.
-    # In the different machine case the katello host needs to have a
-    # copy of /etc/candlepin/certs/candlepin-ca.crt copied from
-    # the candlepin host and the location of the copied file needs to be
-    # specified here..
+    # Optional CA file to user to verify HTTPS connections to Candlepin. If not
+    # specified, Foreman's ssl_ca_file setting is used.
     :ca_cert_file:
     # :bulk_load_size: 1000
   # Setup your pulp environment here
   :pulp:
     :sync_threads: 4
     # refers to the apache certificate
-    # (typically /etc/pki/tls/certs/localhost.crt) location that is needed
-    # to connect to pulp over https.
+    # Optional CA file to user to verify HTTPS connections to Candlepin. If not
+    # specified, Foreman's ssl_ca_file setting is used.
     :ca_cert_file:
     :default_login: admin
     :sync_KBlimit:

data/config/routes/api/registry.rb

@@ -1,5 +1,3 @@
-require 'katello/api/mapper_extensions'
-
 class ActionDispatch::Routing::Mapper
   include Katello::Routing::MapperExtensions
 end

data/config/routes/api/rhsm.rb

@@ -1,6 +1,3 @@
-require 'katello/api/constraints/activation_key_constraint'
-require 'katello/api/mapper_extensions'
-
 class ActionDispatch::Routing::Mapper
   include Katello::Routing::MapperExtensions
 end
@@ -11,7 +8,7 @@ Katello::Engine.routes.draw do
 
     scope :path => :rhsm, :module => :rhsm, :as => :rhsm do
       # subscription-manager support
-      scope :constraints => Katello::RegisterWithActivationKeyConstraint.new do
+      scope :constraints => Katello::Api::Constraints::RegisterWithActivationKeyConstraint.new do
         match '/consumers' => 'candlepin_proxies#consumer_activate', :via => :post
       end
       match '/consumers' => 'candlepin_proxies#consumer_create', :via => :post

data/config/routes/api/v2.rb

@@ -1,6 +1,3 @@
-require 'katello/api/constraints/activation_key_constraint'
-require 'katello/api/mapper_extensions'
-
 class ActionDispatch::Routing::Mapper
   include Katello::Routing::MapperExtensions
 end
@@ -75,6 +72,8 @@ Katello::Engine.routes.draw do
         match '/content_views/:composite_content_view_id/content_view_components/remove' => 'content_view_components#remove_components', :via => :put
         match '/content_views/:composite_content_view_id/content_view_components/:id' => 'content_view_components#update', :via => :put
 
+        api_resources :content_view_environments, :only => [:index]
+
         api_resources :content_views do
           get :auto_complete_search, :on => :collection
           member do

data/db/migrate/20140716211853_repo_rename_feed_to_url.rb

@@ -1,4 +1,4 @@
-class RepoRenameFeedToUrl < ActiveRecord::Migration[4.2]
+class RepoRenameFeedToURL < ActiveRecord::Migration[4.2]
   def up
     rename_column :katello_repositories, :feed, :url
   end

data/db/migrate/20141003210742_add_docker_container_registry_url_to_providers.rb

@@ -1,4 +1,4 @@
-class AddDockerContainerRegistryUrlToProviders < ActiveRecord::Migration[4.2]
+class AddDockerContainerRegistryURLToProviders < ActiveRecord::Migration[4.2]
   def up
     add_column :katello_providers, :docker_registry_url, :string, :limit => 255
   end

data/db/migrate/20150224083608_remove_docker_registry_url.rb

@@ -1,4 +1,4 @@
-class RemoveDockerRegistryUrl < ActiveRecord::Migration[4.2]
+class RemoveDockerRegistryURL < ActiveRecord::Migration[4.2]
   def up
     remove_column :katello_providers, :docker_registry_url
   end

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|