katello 3.8.1 → 3.9.0.rc1

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

@@ -2,31 +2,52 @@ object @resource
 
 extends 'katello/api/v2/common/org_reference'
 extends 'katello/api/v2/common/timestamps'
-
-attributes :content_type
-attributes :docker_upstream_name
-attributes :mirror_on_sync, :verify_ssl_on_sync
-attributes :unprotected, :full_path, :checksum_type
-attributes :container_repository_name
-attributes :download_policy
-attributes :url,
-           :relative_path
 extends 'katello/api/v2/repositories/base'
 
-attributes :gpg_key_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
+glue(@resource.root) do
+  attributes :content_type
+  attributes :docker_upstream_name
+  attributes :docker_tags_whitelist
+  attributes :mirror_on_sync, :verify_ssl_on_sync
+  attributes :unprotected, :full_path, :checksum_type
+  attributes :container_repository_name
+  attributes :download_policy
+  attributes :url
+  attributes :gpg_key_id
+  attributes :ssl_ca_cert_id
+  attributes :ssl_client_cert_id
+  attributes :ssl_client_key_id
+
+  attributes :product_type
+  attributes :ostree_branch_names => :ostree_branches
+  attributes :upstream_username
+  attributes :ostree_upstream_sync_policy, :ostree_upstream_sync_depth
+  attributes :compute_ostree_upstream_sync_depth => :computed_ostree_upstream_sync_depth
+  attributes :deb_releases, :deb_components, :deb_architectures
+  attributes :ignore_global_proxy
+  attributes :ignorable_content
+  attributes :description
+
+  child :ssl_ca_cert do
+    attributes :id, :name
+  end
+
+  child :ssl_client_cert do
+    attributes :id, :name
+  end
+
+  child :ssl_client_key do
+    attributes :id, :name
+  end
+
+  child :gpg_key do
+    attributes :id, :name
+  end
+end
+
+attributes :relative_path
 attributes :promoted? => :promoted
-attributes :ostree_branch_names => :ostree_branches
-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
-attributes :description
+attributes :content_view_version_id, :library_instance_id
 
 if @resource.is_a?(Katello::Repository)
   if @resource.distribution_version || @resource.distribution_arch || @resource.distribution_family || @resource.distribution_variant
@@ -44,24 +65,12 @@ node :permissions do |repo|
   }
 end
 
-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}
+node :upstream_password_exists do |repo|
+  repo.root.upstream_password.present?
 end
 
-node :upstream_password_exists do |repo|
-  repo.upstream_password.present?
+node :upstream_auth_exists do |repo|
+  repo.upstream_username.present? && repo.upstream_password.present?
 end
 
 if @object && @object.library_instance_id.nil?

data/app/views/katello/api/v2/smart_proxies/download_policy.json.rabl

@@ -0,0 +1 @@
+attributes :download_policy

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

@@ -1,4 +1,4 @@
-attributes :id, :uuid, :last_checkin, :service_level, :release_version, :autoheal, :registered_at, :registered_through
+attributes :id, :uuid, :last_checkin, :service_level, :release_version, :autoheal, :registered_at, :registered_through, :purpose_role, :purpose_usage, :purpose_addons
 
 child :user => :user do
   attributes :id, :login

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

@@ -4,7 +4,8 @@ attributes :id, :organization_id
 attributes :name, :description
 attributes :interval, :next_sync
 attributes :created_at, :updated_at
-attributes :enabled
+attributes :enabled, :foreman_tasks_recurring_logic_id
+attributes :cron_expression
 
 child :products => :products do |_product|
   extends 'katello/api/v2/common/syncable'

data/app/views/katello/layouts/react.html.erb

@@ -9,6 +9,7 @@
 <% content_for(:content) do %>
     <%= notifications %>
     <div id="organization-id" data-id="<%= Organization.current.id if Organization.current %>" ></div>
+    <div id="user-id" data-id="<%= User.current.id if User.current %>" ></div>
     <div id="reactRoot"></div>
 <% end %>
 <%= render file: "layouts/base" %>

data/config/katello.yaml.example

@@ -17,8 +17,6 @@
 
   :puppet_repo_root: '/etc/puppet/environments/'
 
-  :post_sync_url: "http://localhost:3000/katello/api/v2/repositories/sync_complete?token=katello"
-
   :redhat_repository_url: https://cdn.redhat.com
 
   :consumer_cert_rpm: 'katello-ca-consumer-latest.noarch.rpm'
@@ -75,6 +73,7 @@
   :container_image_registry:
     :crane_url: https://localhost:5000
     :crane_ca_cert_file: /etc/pki/katello/certs/katello-server-ca.crt
+    :allow_push: false  # default false if omitted
 
 # Logging configuration can be changed by uncommenting the loggers
 # section and the logger configuration desired.

data/config/routes.rb

@@ -21,6 +21,11 @@ Katello::Engine.routes.draw do
   match '/subscriptions' => 'react#index', :via => [:get]
   match '/subscriptions/*page' => 'react#index', :via => [:get]
 
+  match '/module_streams' => 'react#index', :via => [:get]
+  match '/module_streams/*page' => 'react#index', :via => [:get]
+
+  match '/module_streams' => 'react#index', :via => [:get]
+
   match '/xui' => 'react#index', :via => [:get]
   match '/xui/*page' => 'react#index', :via => [:get]
   match '/organization_select' => 'react#index', :via => [:get]

data/config/routes/api/v2.rb

@@ -132,6 +132,7 @@ Katello::Engine.routes.draw do
         api_resources :debs, :only => [:index, :show] do
           collection do
             get :auto_complete_search
+            get :compare
           end
         end
 
@@ -145,6 +146,7 @@ Katello::Engine.routes.draw do
         api_resources :docker_manifest_lists, :only => [:index, :show] do
           collection do
             get :auto_complete_search
+            get :compare
           end
         end
 
@@ -185,6 +187,14 @@ Katello::Engine.routes.draw do
           get :auto_complete_search, :on => :collection
         end
 
+        api_resources :module_streams, :only => [:index, :show] do
+          collection do
+            get :auto_complete_search
+            get :auto_complete_name
+            get :compare
+          end
+        end
+
         api_resources :organizations, :only => [:index, :show, :update, :create, :destroy] do
           api_resources :activation_keys, :only => [:index]
           api_resources :content_views, :only => [:index, :create]
@@ -268,7 +278,6 @@ Katello::Engine.routes.draw do
 
         api_resources :repositories, :only => [:index, :create, :show, :destroy, :update] do
           collection do
-            post :sync_complete
             get :auto_complete_search
             get :repository_types
           end
@@ -280,6 +289,7 @@ Katello::Engine.routes.draw do
         api_resources :repository_sets, :only => [:index, :show] do
           get :auto_complete_search, :on => :collection
           member do
+            get :available_repositories
             put :enable
             put :disable
           end
@@ -344,6 +354,7 @@ Katello::Engine.routes.draw do
           api_resources :docker_manifest_lists, :only => [:index, :show]
           api_resources :docker_tags, :only => [:index, :show]
           api_resources :debs, :only => [:index, :show]
+          api_resources :module_streams, :only => [:index, :show]
 
           api_resources :ostree_branches, :only => [:index, :show]
 

data/config/routes/overrides.rb

@@ -77,6 +77,7 @@ Foreman::Application.routes.draw do
             match '/bulk/environment_content_view' => 'hosts_bulk_actions#environment_content_view', :via => :put
             match '/bulk/release_version' => 'hosts_bulk_actions#release_version', :via => :put
             match '/bulk/available_incremental_updates' => 'hosts_bulk_actions#available_incremental_updates', :via => :post
+            match '/bulk/module_streams' => 'hosts_bulk_actions#module_streams', :via => :post
             match '/subscriptions/' => 'host_subscriptions#create', :via => :post
           end
 

data/db/migrate/20150114225023_add_upstream_name_to_repository.rb

@@ -1,10 +1,15 @@
 class AddUpstreamNameToRepository < ActiveRecord::Migration[4.2]
+  class FakeRepository < ApplicationRecord
+    self.table_name = 'katello_repositories'
+    scope :docker_type, -> { where(:content_type => 'docker') }
+  end
+
   def up
     add_column :katello_repositories, :docker_upstream_name, :string, :limit => 255
-    Katello::Repository.docker_type.each do |repo|
+    FakeRepository.docker_type.each do |repo|
       next if repo.url.blank?
       update %(
-        update #{Katello::Repository.table_name}
+        update #{FakeRepository.table_name}
               set docker_upstream_name=#{ActiveRecord::Base.sanitize(repo.name)}
               where id=#{repo.id}
       ).gsub(/\s+/, " ").strip

data/db/migrate/20170208215148_add_docker_repo_name.rb

@@ -1,8 +1,17 @@
 class AddDockerRepoName < ActiveRecord::Migration[4.2]
+  class FakeRepository < ApplicationRecord
+    self.table_name = 'katello_repositories'
+    scope :docker_type, -> { where(:content_type => 'docker') }
+
+    def set_container_repository_name
+      self.container_repository_name = Katello::Repository.safe_render_container_name(self)
+    end
+  end
+
   def up
     add_column :katello_repositories, :container_repository_name, :string
 
-    Katello::Repository.docker_type.find_each do |repo|
+    FakeRepository.docker_type.find_each do |repo|
       repo.set_container_repository_name
       repo.save!
     end

data/db/migrate/20180326190408_move_subscription_products.rb

@@ -35,6 +35,7 @@ class MoveSubscriptionProducts < ActiveRecord::Migration[5.1]
     add_foreign_key "katello_pool_products", "katello_products",
                     :name => "katello_pool_products_product_id_fk", :column => "product_id"
 
+    FakeSubscription.reset_column_information
     FakeSubscription.find_each do |sub|
       sub.subscription_products.each do |sub_product|
         sub.pool_ids.each do |pool_id|
@@ -60,6 +61,7 @@ class MoveSubscriptionProducts < ActiveRecord::Migration[5.1]
     add_foreign_key "katello_subscription_products", "katello_products",
                     :name => "katello_subscription_products_product_id_fk", :column => "product_id"
 
+    FakeSubscription.reset_column_information
     FakeSubscription.find_each do |sub|
       pool = sub.pools.first
       if pool

data/db/migrate/20180622105300_add_docker_tags_whitelist_to_repository.rb

@@ -0,0 +1,9 @@
+class AddDockerTagsWhitelistToRepository < ActiveRecord::Migration[5.1]
+  def up
+    add_column :katello_repositories, :docker_tags_whitelist, :text
+  end
+
+  def down
+    remove_column :katello_repositories, :docker_tags_whitelist
+  end
+end

data/db/migrate/20180725083800_change_repository_password_length.rb

@@ -0,0 +1,5 @@
+class ChangeRepositoryPasswordLength < ActiveRecord::Migration[5.1]
+  def change
+    change_column :katello_repositories, :upstream_password, :string, limit: 1024
+  end
+end

data/db/migrate/20180806205420_add_index_to_content_view_version.rb

@@ -0,0 +1,5 @@
+class AddIndexToContentViewVersion < ActiveRecord::Migration[5.1]
+  def change
+    add_index :katello_content_view_versions, [:content_view_id, :major, :minor], :unique => true, :name => 'version_index'
+  end
+end

data/db/migrate/20180807145652_create_katello_module_streams.rb

@@ -0,0 +1,88 @@
+class CreateKatelloModuleStreams < ActiveRecord::Migration[5.1]
+  #rubocop:disable Metrics/MethodLength
+  def up
+    create_table :katello_module_streams do |t|
+      t.string :name
+      t.string :uuid, null: false
+      t.string :version
+      t.string :context
+      t.string :stream
+      t.string :arch
+
+      t.timestamps
+    end
+
+    create_table :katello_repository_module_streams do |t|
+      t.references :repository, null: false, index: { name: :katello_repository_module_stream_repo_id }
+      t.references :module_stream, null: false, index: { name: :katello_repository_module_stream_mod_id }
+
+      t.timestamps
+    end
+
+    create_table :katello_module_profiles do |t|
+      t.references :module_stream, null: false, index: { name: :katello_module_profile_mod_stream_idx }
+      t.string :name, null: false
+
+      t.timestamps
+    end
+
+    create_table :katello_module_profile_rpms do |t|
+      t.references :module_profile, null: false, index: { name: :katello_mod_profile_rpms_mod_profile_idx }
+      t.string :name, null: false
+
+      t.timestamps
+    end
+
+    create_table :katello_module_stream_artifacts do |t|
+      t.references :module_stream, null: false, index: { name: :katello_mod_stream_artifacts_mod_stream_idx }
+      t.string :name
+
+      t.timestamps
+    end
+
+    add_index :katello_repository_module_streams, [:repository_id, :module_stream_id],
+              unique: true, name: :katello_module_streams_repo_stream_uniq
+
+    add_index :katello_module_stream_artifacts, [:module_stream_id, :name],
+              unique: true, name: :katello_module_stream_artifacts_name_mod_stream_id_uniq
+
+    add_foreign_key :katello_repository_module_streams,
+                    :katello_repositories,
+                    column: :repository_id,
+                    name: :katello_repo_mod_stream_repo_id_fk
+
+    add_foreign_key :katello_repository_module_streams,
+                    :katello_module_streams,
+                    column: :module_stream_id,
+                    name: :katello_repo_mod_stream_mod_stream_id_fk
+
+    add_foreign_key :katello_module_profiles,
+                    :katello_module_streams,
+                    column: :module_stream_id,
+                    name: :katello_mod_profile_mod_stream_id_fk
+
+    add_foreign_key :katello_module_profile_rpms,
+                    :katello_module_profiles,
+                    column: :module_profile_id,
+                    name: :katello_mod_profile_rpm_mod_profile_id_fk
+
+    add_foreign_key :katello_module_stream_artifacts,
+                    :katello_module_streams,
+                    column: :module_stream_id,
+                    name: :katello_mod_stream_artifacts_mod_stream_id_fk
+  end
+
+  def down
+    remove_foreign_key :katello_repository_module_streams, name: :katello_repo_mod_stream_repo_id_fk
+    remove_foreign_key :katello_repository_module_streams, name: :katello_repo_mod_stream_mod_stream_id_fk
+    remove_foreign_key :katello_module_profiles, name: :katello_mod_profile_mod_stream_id_fk
+    remove_foreign_key :katello_module_profile_rpms, name: :katello_mod_profile_rpm_mod_profile_id_fk
+    remove_foreign_key :katello_module_stream_artifacts, name: :katello_mod_stream_artifacts_mod_stream_id_fk
+
+    drop_table :katello_module_streams
+    drop_table :katello_repository_module_streams
+    drop_table :katello_module_profiles
+    drop_table :katello_module_profile_rpms
+    drop_table :katello_module_stream_artifacts
+  end
+end

data/db/migrate/20180807164405_remove_repository_cp_label.rb

@@ -0,0 +1,5 @@
+class RemoveRepositoryCpLabel < ActiveRecord::Migration[5.1]
+  def change
+    remove_column :katello_repositories, :cp_label
+  end
+end

data/db/migrate/20180808013432_add_system_purpose_attrs.rb

@@ -0,0 +1,39 @@
+class AddSystemPurposeAttrs < ActiveRecord::Migration[5.1]
+  def change
+    create_table :katello_purpose_addons do |t|
+      t.string :name, null: false
+    end
+
+    create_table :katello_purpose_roles do |t|
+      t.string :name, null: false
+    end
+
+    create_table :katello_purpose_usages do |t|
+      t.string :name, null: false
+    end
+
+    create_table :katello_subscription_facet_purpose_addons do |t|
+      t.references :purpose_addon, index: { name: :katello_sub_facet_purpose_addons_paid }
+      t.references :subscription_facet, index: { name: :katello_sub_facet_purpose_addons_sfid }
+    end
+
+    create_table :katello_subscription_facet_purpose_roles do |t|
+      t.references :purpose_role, index: { name: :katello_sub_facet_purpose_roles_prid }
+      t.references :subscription_facet, index: { name: :katello_sub_facet_purpose_roles_sfid }
+    end
+
+    create_table :katello_subscription_facet_purpose_usages do |t|
+      t.references :purpose_usage, index: { name: :katello_sub_facet_purpose_usages_puid }
+      t.references :subscription_facet, index: { name: :katello_sub_facet_purpose_usages_sfid }
+    end
+
+    add_foreign_key :katello_subscription_facet_purpose_addons, :katello_subscription_facets, column: :subscription_facet_id, name: :katello_sub_facet_purpose_addon_facet_id
+    add_foreign_key :katello_subscription_facet_purpose_addons, :katello_purpose_addons, column: :purpose_addon_id, name: :katello_sub_facet_purpose_addon_purpose_addon_id
+
+    add_foreign_key :katello_subscription_facet_purpose_roles, :katello_subscription_facets, column: :subscription_facet_id, name: :katello_sub_facet_purpose_role_facet_id
+    add_foreign_key :katello_subscription_facet_purpose_roles, :katello_purpose_roles, column: :purpose_role_id, name: :katello_sub_facet_purpose_role_purpose_role_id
+
+    add_foreign_key :katello_subscription_facet_purpose_usages, :katello_subscription_facets, column: :subscription_facet_id, name: :katello_sub_facet_purpose_usage_facet_id
+    add_foreign_key :katello_subscription_facet_purpose_usages, :katello_purpose_usages, column: :purpose_usage_id, name: :katello_sub_facet_purpose_usage_purpose_usage_id
+  end
+end