katello 3.6.0.1.rc2 → 3.7.0.rc1

data/app/views/foreman/job_templates/update_package_-_katello_ansible_default.erb

@@ -0,0 +1,16 @@
+<%#
+name: Update Package - Katello Ansible Default
+snippet: false
+model: JobTemplate
+job_category: Katello via Ansible
+description_format: Update package(s) %{package}
+template_inputs:
+- name: package
+  required: true
+  input_type: user
+  advanced: false
+provider_type: Ansible
+kind: job_template
+%>
+
+<%= render_template('Run Command - Ansible Default', :command => "yum update #{input('package')}") %>

data/app/views/foreman/smart_proxies/_content_tab.html.erb

@@ -9,7 +9,7 @@
       <th translate>Hosts</th>
       <th translate>Products</th>
       <th translate>Yum repos</th>
-      <th translate>Docker repos</th>
+      <th translate>Container Image repos</th>
       <th translate>Packages</th>
       <th translate>Errata</th>
       <th translate>Puppet modules</th>

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

@@ -0,0 +1,3 @@
+object false
+
+extends "katello/api/v2/common/index"

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

@@ -0,0 +1,101 @@
+object @resource
+
+extends 'katello/api/v2/common/identifier'
+extends 'katello/api/v2/common/org_reference'
+extends 'katello/api/v2/common/timestamps'
+
+attributes :name
+attributes :content_type
+attributes :content
+
+child :products => :gpg_key_products do
+  attributes :id, :cp_id, :name
+  node :repository_count do |product|
+    product.repositories.count
+  end
+  child :provider => :provider do
+    attribute :name
+    attribute :id
+  end
+end
+
+child :repositories => :gpg_key_repos do
+  attribute :id
+  attribute :name
+  attribute :content_type
+
+  child :product do |_product|
+    attributes :id, :cp_id, :name
+  end
+end
+
+child :ssl_ca_products => :ssl_ca_products do
+  attributes :id, :cp_id, :name
+  node :repository_count do |product|
+    product.repositories.count
+  end
+  child :provider => :provider do
+    attribute :name
+    attribute :id
+  end
+end
+
+child :ssl_ca_repos => :ssl_ca_repos do
+  attribute :id
+  attribute :name
+  attribute :content_type
+
+  child :product do |_product|
+    attributes :id, :cp_id, :name
+  end
+end
+
+child :ssl_client_products => :ssl_client_products do
+  attributes :id, :cp_id, :name
+  node :repository_count do |product|
+    product.repositories.count
+  end
+  child :provider => :provider do
+    attribute :name
+    attribute :id
+  end
+end
+
+child :ssl_client_repos => :ssl_client_repos do
+  attribute :id
+  attribute :name
+  attribute :content_type
+
+  child :product do |_product|
+    attributes :id, :cp_id, :name
+  end
+end
+
+child :ssl_key_products => :ssl_key_products do
+  attributes :id, :cp_id, :name
+  node :repository_count do |product|
+    product.repositories.count
+  end
+  child :provider => :provider do
+    attribute :name
+    attribute :id
+  end
+end
+
+child :ssl_key_repos => :ssl_key_repos do
+  attribute :id
+  attribute :name
+  attribute :content_type
+
+  child :product do |_product|
+    attributes :id, :cp_id, :name
+  end
+end
+
+node :permissions do |content_credential|
+  {
+    :view_content_credenials => content_credential.readable?,
+    :edit_content_credenials => content_credential.editable?,
+    :destroy_content_credenials => content_credential.deletable?
+  }
+end

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

@@ -1,6 +1,6 @@
 object @resource
 
-attributes :user, :status, :description
+attributes :user, :status, :description, :action
 
 child :environment => :environment do |_h|
   attributes :id, :name
@@ -18,6 +18,18 @@ node :version_id do |h|
   h.content_view_version.id
 end
 
+node :triggered_by do |h|
+  if h.triggered_by
+    h.triggered_by.name
+  end
+end
+
+node :triggered_by_id do |h|
+  if h.triggered_by
+    h.triggered_by.id
+  end
+end
+
 child :task => :task do
   extends 'foreman_tasks/api/tasks/show'
 end

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

@@ -7,6 +7,7 @@ attributes :default
 attributes :force_puppet_environment
 attributes :version_count
 attributes :latest_version
+attributes :auto_publish
 
 node :next_version do |content_view|
   content_view.next_version.to_f.to_s

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

@@ -4,6 +4,7 @@ extends 'katello/api/v2/common/identifier'
 extends 'katello/api/v2/common/org_reference'
 
 attributes :library
+attributes :registry_name_pattern
 
 node :prior do |env|
   if env.prior

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

@@ -9,6 +9,10 @@ child :cves => :cves do
   attributes :cve_id, :href
 end
 
+child :bugzillas => :bugs do
+  attributes :bug_id, :href
+end
+
 attributes :title => :name
 attributes :errata_type => :type
 

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

@@ -1,9 +1,9 @@
 attribute :enabled, :product_id
 
-glue :content do |_content|
-  attributes :name, :label, :vendor,
-             :cp_content_id => :id,
-             :content_type => :contentType,
-             :gpg_url => :gpgUrl,
-             :content_url => :contentUrl
+child :content do |_content|
+  attributes :name, :label, :vendor, :content_url, :gpg_url
+  attributes :cp_content_id => :id
+  attributes :content_type => :type
+  attributes :gpg_url => :gpgUrl
+  attributes :content_url => :contentUrl
 end

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

@@ -9,6 +9,9 @@ attributes :provider_id
 attributes :sync_plan_id
 attributes :sync_summary
 attributes :gpg_key_id
+attributes :ssl_ca_cert_id
+attributes :ssl_client_cert_id
+attributes :ssl_client_key_id
 
 child({:available_content => :available_content}, :if => params[:include_available_content]) do
   extends "katello/api/v2/products/product_content"

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

@@ -21,6 +21,18 @@ node(:gpg_key, :unless => lambda { |product| product.gpg_key.nil? }) do |product
   {:id => product.gpg_key.id, :name => product.gpg_key.name}
 end
 
+node(:ssl_ca_cert, :unless => lambda { |product| product.ssl_ca_cert.nil? }) do |product|
+  {:id => product.ssl_ca_cert.id, :name => product.ssl_ca_cert.name}
+end
+
+node(:ssl_client_cert, :unless => lambda { |product| product.ssl_client_cert.nil? }) do |product|
+  {:id => product.ssl_client_cert.id, :name => product.ssl_client_cert.name}
+end
+
+node(:ssl_client_key, :unless => lambda { |product| product.ssl_client_key.nil? }) do |product|
+  {:id => product.ssl_client_key.id, :name => product.ssl_client_key.name}
+end
+
 child :provider do
   attribute :name
 end

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

@@ -2,9 +2,10 @@ object @resource
 
 extends 'katello/api/v2/common/identifier'
 
-attributes :content_type, :url, :relative_path, :arch
+attributes :content_type, :url, :relative_path, :arch, :content_id
 attributes :pulp_id => :backend_identifier
 attributes :cp_label => :content_label
+attributes :major, :minor
 
 child :product do |_product|
   attributes :id, :cp_id, :name

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

@@ -12,9 +12,11 @@ attributes :url,
            :relative_path
 extends 'katello/api/v2/repositories/base'
 
-attributes :major, :minor
 attributes :gpg_key_id
-attributes :content_id, :content_view_version_id, :library_instance_id
+attributes :ssl_ca_cert_id
+attributes :ssl_client_cert_id
+attributes :ssl_client_key_id
+attributes :content_view_version_id, :library_instance_id
 attributes :product_type
 attributes :promoted? => :promoted
 attributes :ostree_branch_names => :ostree_branches
@@ -22,6 +24,7 @@ attributes :upstream_username
 attributes :ostree_upstream_sync_policy, :ostree_upstream_sync_depth, :compute_ostree_upstream_sync_depth => :computed_ostree_upstream_sync_depth
 attributes :deb_releases, :deb_components, :deb_architectures
 attributes :ignore_global_proxy
+attributes :ignorable_content
 
 if @resource.is_a?(Katello::Repository)
   if @resource.distribution_version || @resource.distribution_arch || @resource.distribution_family || @resource.distribution_variant
@@ -39,9 +42,20 @@ node :permissions do |repo|
   }
 end
 
-child :gpg_key do |_gpg|
-  attribute :name
-  attribute :id
+node(:gpg_key, :unless => lambda { |repository| repository.gpg_key.nil? }) do |repository|
+  {:id => repository.gpg_key.id, :name => repository.gpg_key.name}
+end
+
+node(:ssl_ca_cert, :unless => lambda { |repository| repository.ssl_ca_cert.nil? }) do |repository|
+  {:id => repository.ssl_ca_cert.id, :name => repository.ssl_ca_cert.name}
+end
+
+node(:ssl_client_cert, :unless => lambda { |repository| repository.ssl_client_cert.nil? }) do |repository|
+  {:id => repository.ssl_client_cert.id, :name => repository.ssl_client_cert.name}
+end
+
+node(:ssl_client_key, :unless => lambda { |repository| repository.ssl_client_key.nil? }) do |repository|
+  {:id => repository.ssl_client_key.id, :name => repository.ssl_client_key.name}
 end
 
 node :upstream_password_exists do |repo|

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

@@ -1,25 +1,21 @@
-child :subscription_facet => :subscription_facet_attributes do |facet|
+child :subscription_facet => :subscription_facet_attributes do |_facet|
   extends 'katello/api/v2/subscription_facet/base'
-  consumer = Katello::Candlepin::Consumer.new(facet.uuid, facet.host.organization.label)
 
-  node :compliance_reasons do
-    consumer.compliance_reasons
+  node :compliance_reasons do |sub_facet|
+    sub_facet.compliance_reasons.pluck(:reason)
   end
 
-  node :virtual_host do |_subscription_facet|
-    if (host = consumer.virtual_host)
-      {:name => host.name, :id => host.id}
-    end
+  child :hypervisor_host => :virtual_host do
+    attributes :id, :name
   end
 
-  node :virtual_guests do |_subscription_facet|
-    consumer.virtual_guests.map do |guest|
-      {:name => guest.name, :id => guest.id}
-    end
+  child :virtual_guests => :virtual_guests do
+    attributes :id, :name
   end
 
-  node :installed_products do
-    consumer.installed_products
+  child :installed_products => :installed_products do
+    attributes :name => :productName, :cp_product_id => :productId
+    attributes :arch, :version
   end
 
   child :activation_keys => :activation_keys do

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

@@ -16,8 +16,9 @@ attributes :name => :product_name
 attributes :unmapped_guest
 attributes :virt_only
 attributes :virt_who
+attributes :upstream? => :upstream
 
-node :hypervisor, :if => lambda { |sub| sub && sub.respond_to?(:hypervisor) && sub.hypervisor_id } do |subscription|
+node :hypervisor, :if => lambda { |sub| sub && sub.try(:hypervisor) && sub.hypervisor_id } do |subscription|
   {
     id: subscription.hypervisor.id,
     name: subscription.hypervisor.name

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

@@ -0,0 +1,18 @@
+object @resource ||= @object
+
+attributes :pool_id => :id
+attributes :pool_id
+attributes :status
+attributes :quantity
+attributes :available
+attributes :start_date
+attributes :end_date
+attributes :contract_number
+attributes :consumed
+attributes :product_name
+attributes :product_id
+attributes :subscription_id
+
+if params[:pool_ids]
+  attributes :local_pool_ids
+end

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

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

data/app/views/katello/sync_management/_products.html.erb

@@ -31,7 +31,7 @@
           <td colspan="<%= @show_org ? 6 : 5 %>">
             <%= (_("There are no products or repositories enabled. Try enabling via %{custom} or %{redhat}.") %
                  {:custom => link_to(_("Custom Content Repositories"), '/products', data: {no_turbolink: true}),
-                  :redhat => link_to(_("Red Hat Repositories"), redhat_provider_providers_path, data: {no_turbolink: true})
+                  :redhat => link_to(_("Red Hat Repositories"), '/redhat_repositories', data: {no_turbolink: true})
                  }).html_safe
              %>
           </td>

data/config/katello.yaml.example

@@ -1,4 +1,14 @@
 :katello:
+  #if this block is not define, all types are enabled
+  #types are defined in lib/katello/repository_types/*.rb
+  :content_types:
+    :yum: true
+    :file: true
+    :deb: true
+    :puppet: true
+    :docker: true
+    :ostree: true
+
   :use_cp: true # set to true/false if you want to override default
   :use_pulp: true # set to true/false if you want to override default
 

data/config/routes.rb

@@ -10,25 +10,14 @@ Katello::Engine.routes.draw do
       end
     end
 
-    resources :products, :only => [] do
-      member do
-        get :available_repositories
-        put :toggle_repository
-      end
-    end
-
-    resources :providers, :only => [] do
-      collection do
-        get :redhat_provider
-        get :redhat_provider_tab
-      end
-    end
-
     if Katello.with_remote_execution?
       match '/remote_execution' => 'remote_execution#create', :via => [:post]
     end
   end
 
+  get '/katello/providers/redhat_provider', to: redirect('/redhat_repositories')
+  match '/redhat_repositories' => 'react#index', :via => [:get]
+
   match '/xui' => 'react#index', :via => [:get]
   match '/xui/*page' => 'react#index', :via => [:get]
 end

data/config/routes/api/rhsm.rb

@@ -33,6 +33,7 @@ Katello::Engine.routes.draw do
       match '/consumers/:id/entitlements' => 'candlepin_proxies#get', :via => :get, :as => :proxy_consumer_entitlements_path
       match '/consumers/:id/entitlements' => 'candlepin_proxies#post', :via => :post, :as => :proxy_consumer_entitlements_post_path
       match '/consumers/:id/entitlements' => 'candlepin_proxies#delete', :via => :delete, :as => :proxy_consumer_entitlements_delete_path
+      match '/consumers/:id/entitlements/pool/:poolId' => 'candlepin_proxies#delete', :via => :delete, :as => :proxy_consumer_entitlements_pool_delete_path
       match '/consumers/:id/entitlements/dry-run' => 'candlepin_proxies#get', :via => :get, :as => :proxy_consumer_dryrun_path
       match '/consumers/:id/owner' => 'candlepin_proxies#get', :via => :get, :as => :proxy_consumer_owners_path
       match '/consumers/:consumer_id/certificates/:id' => 'candlepin_proxies#delete', :via => :delete, :as => :proxy_consumer_certificates_delete_path

data/config/routes/api/v2.rb

@@ -54,6 +54,14 @@ Katello::Engine.routes.draw do
           end
         end
 
+        api_resources :content_credentials, :only => [:index, :show, :create, :update, :destroy] do
+          member do
+            get :content
+            post :content, :action => :set_content
+          end
+          get :auto_complete_search, :on => :collection
+        end
+
         match '/content_views/:composite_content_view_id/content_view_components' => 'content_view_components#index', :via => :get
         match '/content_views/:composite_content_view_id/content_view_components/:id' => 'content_view_components#show', :via => :get
         match '/content_views/:composite_content_view_id/content_view_components/add' => 'content_view_components#add_components', :via => :put
@@ -243,6 +251,7 @@ Katello::Engine.routes.draw do
             get :auto_complete_search
           end
           api_resources :repository_sets, :only => [:index, :show] do
+            get :auto_complete_search, :on => :collection
             member do
               get :available_repositories
               put :enable
@@ -269,6 +278,7 @@ Katello::Engine.routes.draw do
         end
 
         api_resources :repository_sets, :only => [:index, :show] do
+          get :auto_complete_search, :on => :collection
           member do
             put :enable
             put :disable
@@ -307,6 +317,12 @@ Katello::Engine.routes.draw do
               put :refresh_manifest
             end
           end
+          api_resources :upstream_subscriptions, only: [:index, :create] do
+            collection do
+              delete :destroy
+              put :update
+            end
+          end
         end
 
         api_resources :host_collections