diff options
Diffstat (limited to 'app/controllers/groups/dependency_proxy_for_containers_controller.rb')
-rw-r--r-- | app/controllers/groups/dependency_proxy_for_containers_controller.rb | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/app/controllers/groups/dependency_proxy_for_containers_controller.rb b/app/controllers/groups/dependency_proxy_for_containers_controller.rb index 171314b5f26..00839583ecc 100644 --- a/app/controllers/groups/dependency_proxy_for_containers_controller.rb +++ b/app/controllers/groups/dependency_proxy_for_containers_controller.rb @@ -33,17 +33,15 @@ class Groups::DependencyProxyForContainersController < ::Groups::DependencyProxy end def blob - return blob_via_workhorse if Feature.enabled?(:dependency_proxy_workhorse, group, default_enabled: :yaml) - - result = DependencyProxy::FindOrCreateBlobService - .new(group, image, token, params[:sha]).execute + blob = @group.dependency_proxy_blobs.find_by_file_name(blob_file_name) - if result[:status] == :success - event_name = tracking_event_name(object_type: :blob, from_cache: result[:from_cache]) + if blob.present? + event_name = tracking_event_name(object_type: :blob, from_cache: true) track_package_event(event_name, :dependency_proxy, namespace: group, user: auth_user) - send_upload(result[:blob].file) + + send_upload(blob.file) else - head result[:http_status] + send_dependency(token_header, DependencyProxy::Registry.blob_url(image, params[:sha]), blob_file_name) end end @@ -99,19 +97,6 @@ class Groups::DependencyProxyForContainersController < ::Groups::DependencyProxy private - def blob_via_workhorse - blob = @group.dependency_proxy_blobs.find_by_file_name(blob_file_name) - - if blob.present? - event_name = tracking_event_name(object_type: :blob, from_cache: true) - track_package_event(event_name, :dependency_proxy, namespace: group, user: auth_user) - - send_upload(blob.file) - else - send_dependency(token_header, DependencyProxy::Registry.blob_url(image, params[:sha]), blob_file_name) - end - end - def send_manifest(manifest, from_cache:) response.headers[DependencyProxy::Manifest::DIGEST_HEADER] = manifest.digest response.headers['Content-Length'] = manifest.size @@ -160,8 +145,7 @@ class Groups::DependencyProxyForContainersController < ::Groups::DependencyProxy end def dependency_proxy - @dependency_proxy ||= - group.dependency_proxy_setting || group.create_dependency_proxy_setting + @dependency_proxy ||= group.dependency_proxy_setting end def ensure_group |