Remove out-of-scope changes for multi-level images

4 files changed, 0 insertions, 78 deletions

diff --git a/lib/api/api.rb b/lib/api/api.rb
index 7c7bfada7d0..1bf20f76ad6 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -104,7 +104,6 @@ module API
     mount ::API::Namespaces
     mount ::API::Notes
     mount ::API::NotificationSettings
-    mount ::API::RegistryEvents
     mount ::API::Pipelines
     mount ::API::ProjectHooks
     mount ::API::Projects
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 3c173b544aa..bd22b82476b 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -111,16 +111,6 @@ module API
       end
     end
 
-    def authenticate_container_registry_access_token!
-      token = request.headers['X-Registry-Token']
-      unless token.present? && ActiveSupport::SecurityUtils.variable_size_secure_compare(
-        token,
-        current_application_settings.container_registry_access_token
-      )
-        unauthorized!
-      end
-    end
-
     def authenticated_as_admin!
       authenticate!
       forbidden! unless current_user.is_admin?
diff --git a/lib/api/registry_events.rb b/lib/api/registry_events.rb
deleted file mode 100644
index 8c53e0fcfc0..00000000000
--- a/lib/api/registry_events.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-module API
-  # RegistryEvents API
-  class RegistryEvents < Grape::API
-    before { authenticate_container_registry_access_token! }
-
-    content_type :json, 'application/vnd.docker.distribution.events.v1+json'
-
-    params do
-      requires :events, type: Array, desc: 'The ID of a project' do
-        requires :id, type: String, desc: 'The ID of the event'
-        requires :timestamp, type: String, desc: 'Timestamp of the event'
-        requires :action, type: String, desc: 'Action performed by event'
-        requires :target, type: Hash, desc: 'Target of the event' do
-          optional :mediaType, type: String, desc: 'Media type of the target'
-          optional :size, type: Integer, desc: 'Size in bytes of the target'
-          requires :digest, type: String, desc: 'Digest of the target'
-          requires :repository, type: String, desc: 'Repository of target'
-          optional :url, type: String, desc: 'Url of the target'
-          optional :tag, type: String, desc: 'Tag of the target'
-        end
-        requires :request, type: Hash, desc: 'Request of the event' do
-          requires :id, type: String, desc: 'The ID of the request'
-          optional :addr, type: String, desc: 'IP Address of the request client'
-          optional :host, type: String, desc: 'Hostname of the registry instance'
-          requires :method, type: String, desc: 'Request method'
-          requires :useragent, type: String, desc: 'UserAgent header of the request'
-        end
-        requires :actor, type: Hash, desc: 'Actor that initiated the event' do
-          optional :name, type: String, desc: 'Actor name'
-        end
-        requires :source, type: Hash, desc: 'Source of the event' do
-          optional :addr, type: String, desc: 'Hostname of source registry node'
-          optional :instanceID, type: String, desc: 'Source registry node instanceID'
-        end
-      end
-    end
-    resource :registry_events do
-      post do
-        params['events'].each do |event|
-          repository = event['target']['repository']
-
-          if event['action'] == 'push' && !!event['target']['tag']
-            namespace, container_image_name = ContainerImage::split_namespace(repository)
-            project = Project::find_by_full_path(namespace)
-
-            if project
-              container_image = project.container_images.find_or_create_by(name: container_image_name, path: container_image_name)
-
-              unless container_image.valid?
-                render_api_error!({ error: "Failed to create container image!" }, 400)
-              end
-            else
-              not_found!('Project')
-            end
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/lib/container_registry/ROADMAP.md b/lib/container_registry/ROADMAP.md
deleted file mode 100644
index e0a20776404..00000000000
--- a/lib/container_registry/ROADMAP.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## Road map
-
-### Initial thoughts
-
-- Determine if image names will be persisted or fetched from API
-- If persisted, how to update the stored names upon modification
-- If fetched, how to fetch only images of a given project