Dependency proxy moved to core

Move the dependency proxy feature from premium to core.

Dependency proxy moved to core
Move the dependency proxy feature from premium to core.
e3b2bd52 · Steve Abrams · Robert Speicher · 80d5fccc · e3b2bd52 · e3b2bd52
--- a/ee/app/assets/javascripts/dependency_proxy.js
+++ b/ee/app/assets/javascripts/dependency_proxy.js
--- a/ee/app/assets/javascripts/pages/groups/dependency_proxies/index.js
+++ b/ee/app/assets/javascripts/pages/groups/dependency_proxies/index.js
 import $ from 'jquery';
-import initDependencyProxy from 'ee/dependency_proxy';
+import initDependencyProxy from '~/dependency_proxy';

 document.addEventListener('DOMContentLoaded', () => {
  initDependencyProxy();

--- a/ee/app/controllers/concerns/dependency_proxy_access.rb
+++ b/ee/app/controllers/concerns/dependency_proxy_access.rb
--- a/ee/app/controllers/groups/dependency_proxies_controller.rb
+++ b/ee/app/controllers/groups/dependency_proxies_controller.rb
--- a/ee/app/controllers/groups/dependency_proxy_for_containers_controller.rb
+++ b/ee/app/controllers/groups/dependency_proxy_for_containers_controller.rb
--- a/app/helpers/groups_helper.rb
+++ b/app/helpers/groups_helper.rb
@@ -170,6 +170,10 @@ def group_packages_nav?
      group_container_registry_nav?
  end

+  def group_dependency_proxy_nav?
+    @group.dependency_proxy_feature_available?
+  end
+
  def group_packages_list_nav?
    @group.packages_feature_enabled?
  end

--- a/ee/app/models/dependency_proxy.rb
+++ b/ee/app/models/dependency_proxy.rb
--- a/ee/app/models/dependency_proxy/blob.rb
+++ b/ee/app/models/dependency_proxy/blob.rb
--- a/ee/app/models/dependency_proxy/group_setting.rb
+++ b/ee/app/models/dependency_proxy/group_setting.rb
--- a/ee/app/models/dependency_proxy/registry.rb
+++ b/ee/app/models/dependency_proxy/registry.rb
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -71,6 +71,9 @@ class Group < Namespace
  has_many :group_deploy_tokens
  has_many :deploy_tokens, through: :group_deploy_tokens

+  has_one :dependency_proxy_setting, class_name: 'DependencyProxy::GroupSetting'
+  has_many :dependency_proxy_blobs, class_name: 'DependencyProxy::Blob'
+
  accepts_nested_attributes_for :variables, allow_destroy: true

  validate :visibility_level_allowed_by_projects
@@ -203,6 +206,10 @@ def packages_feature_enabled?
    ::Gitlab.config.packages.enabled
  end

+  def dependency_proxy_feature_available?
+    ::Gitlab.config.dependency_proxy.enabled
+  end
+
  def notification_email_for(user)
    # Finds the closest notification_setting with a `notification_email`
    notification_settings = notification_settings_for(user, hierarchy_order: :asc)

--- a/app/policies/group_policy.rb
+++ b/app/policies/group_policy.rb
@@ -46,6 +46,10 @@ class GroupPolicy < BasePolicy
    group_projects_for(user: @user, group: @subject, only_owned: false).any? { |p| p.design_management_enabled? }
  end

+  condition(:dependency_proxy_available) do
+    @subject.dependency_proxy_feature_available?
+  end
+
  desc "Deploy token with read_package_registry scope"
  condition(:read_package_registry_deploy_token) do
    @user.is_a?(DeployToken) && @user.groups.include?(@subject) && @user.read_package_registry
@@ -193,6 +197,12 @@ class GroupPolicy < BasePolicy
    enable :read_group
  end

+  rule { can?(:read_group) & dependency_proxy_available }
+    .enable :read_dependency_proxy
+
+  rule { developer & dependency_proxy_available }
+    .enable :admin_dependency_proxy
+
  rule { resource_access_token_available & can?(:admin_group) }.policy do
    enable :admin_resource_access_tokens
  end

--- a/ee/app/services/dependency_proxy/base_service.rb
+++ b/ee/app/services/dependency_proxy/base_service.rb
--- a/ee/app/services/dependency_proxy/download_blob_service.rb
+++ b/ee/app/services/dependency_proxy/download_blob_service.rb
--- a/ee/app/services/dependency_proxy/find_or_create_blob_service.rb
+++ b/ee/app/services/dependency_proxy/find_or_create_blob_service.rb
--- a/ee/app/services/dependency_proxy/pull_manifest_service.rb
+++ b/ee/app/services/dependency_proxy/pull_manifest_service.rb
--- a/ee/app/services/dependency_proxy/request_token_service.rb
+++ b/ee/app/services/dependency_proxy/request_token_service.rb
--- a/ee/app/uploaders/dependency_proxy/file_uploader.rb
+++ b/ee/app/uploaders/dependency_proxy/file_uploader.rb
--- a/ee/app/views/groups/dependency_proxies/_url.html.haml
+++ b/ee/app/views/groups/dependency_proxies/_url.html.haml
--- a/ee/app/views/groups/dependency_proxies/show.html.haml
+++ b/ee/app/views/groups/dependency_proxies/show.html.haml