katello 4.14.1 → 4.15.0.rc1

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

@@ -1,18 +1,53 @@
 extends 'katello/api/v2/common/org_reference'
 extends 'katello/api/v2/common/timestamps'
 
-attributes :id, :name, :description, :unlimited_hosts, :auto_attach
+attributes :id, :name, :description, :unlimited_hosts, :auto_attach, :content_view_environment_labels
 
-attributes :content_view_id
+node :multi_content_view_environment do |ak|
+  ak.multi_content_view_environment?
+end
 
-child :content_view => :content_view do
-  attributes :id, :name
+child :content_view_environments => :content_view_environments do
+  node :content_view do |cve|
+    {
+      id: cve.content_view&.id,
+      name: cve.content_view&.name,
+      composite: cve.content_view&.composite,
+      content_view_version: cve.content_view_version&.version,
+      content_view_version_id: cve.content_view_version&.id,
+      content_view_version_latest: cve.content_view_version&.latest?,
+      content_view_default: cve.content_view&.default?,
+      content_view_environment_id: cve.id,
+    }
+  end
+  node :lifecycle_environment do |cve|
+    {
+      id: cve.lifecycle_environment&.id,
+      name: cve.lifecycle_environment&.name,
+      lifecycle_environment_library: cve.lifecycle_environment&.library?,
+    }
+  end
+  node :label do |cve|
+    cve.label
+  end
+end
+
+# single cv/lce for backward compatibility
+node :content_view_id do |ak|
+  ak.single_content_view&.id
+end
+
+node :content_view do |ak|
+  ak.single_content_view&.slice(:id, :name)
+end
+
+node :environment_id do |ak|
+  ak.single_lifecycle_environment&.id
 end
 
-child :environment => :environment do
-  attributes :name, :id
+node :environment do |ak|
+  ak.single_lifecycle_environment&.slice(:id, :name)
 end
-attributes :environment_id
 
 attributes :usage_count, :user_id, :max_hosts, :system_template_id, :release_version, :purpose_usage, :purpose_role
 
@@ -24,7 +59,7 @@ node :permissions do |activation_key|
   {
     :view_activation_keys => activation_key.readable?,
     :edit_activation_keys => activation_key.editable?,
-    :destroy_activation_keys => activation_key.deletable?
+    :destroy_activation_keys => activation_key.deletable?,
   }
 end
 

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

@@ -33,7 +33,7 @@ if ::Foreman::Cast.to_bool(params.fetch(:include_permissions, false))
     {
       :view_alternate_content_sources => alternate_content_source.readable?,
       :edit_alternate_content_sources => alternate_content_source.editable?,
-      :destroy_alternate_content_sources => alternate_content_source.deletable?
+      :destroy_alternate_content_sources => alternate_content_source.deletable?,
     }
   end
 end

data/app/views/katello/api/v2/capsule_content/sync_status.json.rabl

@@ -45,7 +45,7 @@ child @lifecycle_environments => :lifecycle_environments do
       :id => last_env_sync_task&.id,
       :started_at => last_env_sync_task&.started_at,
       :result => last_env_sync_task&.result,
-      :last_sync_words => last_env_sync_task.try(:started_at) ? time_ago_in_words(Time.parse(last_env_sync_task.started_at.to_s)) : nil
+      :last_sync_words => last_env_sync_task.try(:started_at) ? time_ago_in_words(Time.parse(last_env_sync_task.started_at.to_s)) : nil,
     }
     attributes
   end
@@ -53,7 +53,7 @@ child @lifecycle_environments => :lifecycle_environments do
   if @capsule.has_feature?(SmartProxy::PULP_NODE_FEATURE) || @capsule.has_feature?(SmartProxy::PULP3_FEATURE)
     node :counts do |env|
       {
-        :content_views => env.content_views.non_default.count
+        :content_views => env.content_views.non_default.count,
       }
     end
 
@@ -71,7 +71,7 @@ child @lifecycle_environments => :lifecycle_environments do
           :default => content_view.default,
           :up_to_date => @capsule.repos_pending_sync(env, content_view).empty?,
           :counts => {
-            :repositories => ::Katello::ContentViewVersion.in_environment(env).find_by(:content_view => content_view)&.archived_repos&.count
+            :repositories => ::Katello::ContentViewVersion.in_environment(env).find_by(:content_view => content_view)&.archived_repos&.count,
           },
           :repositories => ::Katello::ContentViewVersion.in_environment(env)&.find_by(:content_view => content_view)&.archived_repos&.map do |repo|
                              {
@@ -79,9 +79,9 @@ child @lifecycle_environments => :lifecycle_environments do
                                :name => repo.name,
                                :library_id => repo.library_instance_id,
                                :product_id => repo.product_id,
-                               :content_type => repo.content_type
+                               :content_type => repo.content_type,
                              }
-                           end
+                           end,
         }
         attributes
       end

data/app/views/katello/api/v2/common/_metadata.json.rabl

@@ -10,6 +10,6 @@ node(:search)   { params[:search] }
 node(:sort) do
   {
     :by => params[:sort_by],
-    :order => params[:sort_order]
+    :order => params[:sort_order],
   }
 end

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

@@ -116,6 +116,6 @@ node :permissions do |content_credential|
   {
     :view_content_credenials => content_credential.readable?,
     :edit_content_credenials => content_credential.editable?,
-    :destroy_content_credenials => content_credential.deletable?
+    :destroy_content_credenials => content_credential.deletable?,
   }
 end

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

@@ -17,21 +17,27 @@ child :content_view_environments => :content_view_environments do
       content_view_version: cve.content_view_version&.version,
       content_view_version_id: cve.content_view_version&.id,
       content_view_version_latest: cve.content_view_version&.latest?,
-      content_view_default: cve.content_view&.default?
+      content_view_default: cve.content_view&.default?,
     }
   end
   node :lifecycle_environment do |cve|
     {
       id: cve.lifecycle_environment&.id,
       name: cve.lifecycle_environment&.name,
-      lifecycle_environment_library: cve.lifecycle_environment&.library?
+      lifecycle_environment_library: cve.lifecycle_environment&.library?,
     }
   end
-  node :candlepin_name do |cve|
-    cve.candlepin_name
+  node :label do |cve|
+    cve.label
   end
 end
 
+attributes :content_view_environment_labels
+
+node :multi_content_view_environment do |content_facet|
+  content_facet.multi_content_view_environment?
+end
+
 # single cv/lce for backward compatibility
 node :content_view do |content_facet|
   content_view = content_facet.single_content_view
@@ -39,7 +45,7 @@ node :content_view do |content_facet|
     {
       :id => content_view.id,
       :name => content_view.name,
-      :composite => content_view.composite?
+      :composite => content_view.composite?,
     }
   end
 end
@@ -49,7 +55,7 @@ node :lifecycle_environment do |content_facet|
   if lifecycle_environment.present?
     {
       :id => lifecycle_environment.id,
-      :name => lifecycle_environment.name
+      :name => lifecycle_environment.name,
     }
   end
 end
@@ -61,3 +67,6 @@ end
 child :kickstart_repository => :kickstart_repository do
   attributes :id, :name
 end
+
+attributes :bootc_booted_image, :bootc_booted_digest, :bootc_available_image, :bootc_available_digest,
+           :bootc_staged_image, :bootc_staged_digest, :bootc_rollback_image, :bootc_rollback_digest

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

@@ -8,7 +8,7 @@ child :content_facet => :content_facet_attributes do
       {
         :content_view_version => version.version,
         :content_view_version_id => version.id,
-        :content_view_version_latest => version.latest?
+        :content_view_version_latest => version.latest?,
       }
     end
   end

data/app/views/katello/api/v2/content_view_environments/index.json.rabl

@@ -0,0 +1,7 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+
+child @collection[:results] => :results do
+  extends "katello/api/v2/content_view_environments/show"
+end

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

@@ -0,0 +1,33 @@
+object @resource
+extends 'katello/api/v2/common/identifier'
+
+extends 'katello/api/v2/common/timestamps'
+attributes :default_environment? => :default
+
+child :organization => :organization do
+  attributes :name, :label, :id
+end
+
+node :content_view do |cve|
+  cve.content_view&.slice(:id, :name, :label, :default)
+end
+
+node :lifecycle_environment do |cve|
+  cve.environment&.slice(:id, :name, :label, :library)
+end
+
+node :environment do |cve|
+  cve.environment&.slice(:id, :name, :label, :library)
+end
+
+child :activation_keys => :activation_keys do
+  attributes :id, :name, :label
+end
+
+node :activation_keys_count do |cve|
+  cve.activation_keys.count
+end
+
+node :hosts_count do |cve|
+  cve.hosts.count
+end

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

@@ -20,7 +20,7 @@ if @resource&.try(:module_stream)
     {
       :module_stream_id => rule.module_stream.id,
       :module_stream_name => rule.module_stream.name,
-      :module_stream_stream => rule.module_stream.stream
+      :module_stream_stream => rule.module_stream.stream,
     }
   end
 end

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

@@ -20,7 +20,7 @@ child :content_view => :content_view do
         :package => repo.rpms.count,
         :package_group => repo.package_groups.count,
         :erratum => repo.errata.count,
-        :module_stream => repo.module_streams.count
+        :module_stream => repo.module_streams.count,
       }
     end
   end

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

@@ -42,7 +42,7 @@ end
 
 node :permissions do |cvv|
   {
-    :deletable => cvv.removable?
+    :deletable => cvv.removable?,
   }
 end
 
@@ -61,7 +61,7 @@ child :environments => :environments do
       :readable => env.readable?,
       :promotable_or_removable => env.promotable_or_removable?,
       :all_hosts_editable => version.all_hosts_editable?(env),
-      :all_keys_editable => Katello::ActivationKey.all_editable?(version.content_view_id, env.id)
+      :all_keys_editable => Katello::ActivationKey.all_editable?(version.content_view_id, env.id),
     }
   end
 
@@ -70,7 +70,7 @@ child :environments => :environments do
   end
 
   node :activation_key_count do |env|
-    Katello::ActivationKey.where(:environment_id => env.id).where(:content_view_id => version.content_view_id).count
+    Katello::ActivationKey.with_content_views(version.content_view).with_environments(env).count
   end
 end
 

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

@@ -45,9 +45,9 @@ node :environments do |cv|
       id: env.id,
       label: env.label,
       name: env.name,
-      activation_keys: cv&.activation_keys&.in_environment(env)&.ids,
+      activation_keys: cv&.activation_keys&.in_environments([env])&.ids,
       hosts: cv&.hosts&.in_environments([env])&.ids,
-      permissions: {readable: env.readable?}
+      permissions: {readable: env.readable?},
     }
   end
 end
@@ -82,7 +82,7 @@ if params.key?(:include_permissions)
       :edit_content_views => cv.editable?,
       :destroy_content_views => cv.deletable?,
       :publish_content_views => cv.publishable?,
-      :promote_or_remove_content_views => cv.promotable_or_removable?
+      :promote_or_remove_content_views => cv.promotable_or_removable?,
     }
   end
 end

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

@@ -16,7 +16,7 @@ child :duplicate_repositories_to_publish => :duplicate_repositories_to_publish d
     @resource.components_with_repo(repo).map do |component|
       {
         :content_view_name => component.content_view.name,
-        :content_view_version => component.version
+        :content_view_version => component.version,
       }
     end
   end

data/app/views/katello/api/v2/debs/backend.json.rabl

@@ -0,0 +1,7 @@
+attributes :depends
+attributes :pre_depends
+attributes :recommends
+attributes :suggests
+attributes :enhances
+attributes :breaks
+attributes :conflicts

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

@@ -11,6 +11,10 @@ attributes :nav
 attributes :nva
 attributes :pulp_id
 attributes :pulp_id => :uuid
+attributes :section
+attributes :maintainer
+attributes :homepage
+attributes :installed_size
 
 node(:hosts_available_count) { |m| m.hosts_available(params[:organization_id]).count }
 node(:hosts_applicable_count) { |m| m.hosts_applicable(params[:organization_id]).count }

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

@@ -1,3 +1,5 @@
 object @resource
 
 extends "katello/api/v2/debs/base"
+extends "katello/api/v2/debs/backend",
+  :object => SmartProxy.pulp_primary!.content_service("deb").new(@resource.pulp_id)

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

@@ -1,6 +1,7 @@
 object @resource
 
 attributes :id, :schema_version, :digest, :manifest_type
+attributes :annotations, :labels, :is_bootable, :is_flatpak
 
 child :docker_tags => :tags do
   attributes :associated_meta_tag_identifier => :id

data/app/views/katello/api/v2/docker_tags/_base.json.rabl

@@ -24,7 +24,7 @@ if @organization
       attributes = {
         :id => repo.id,
         :name => repo.name,
-        :full_path => repo.full_path
+        :full_path => repo.full_path,
       }
       attributes
     end
@@ -34,7 +34,7 @@ if @organization
     product = first_repo&.product
     attributes = {
       :id => product&.id,
-      :name => product&.name
+      :name => product&.name,
     }
     attributes
   end

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