uffizzi_core 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0339ca44a1964075ce650d5e830911c67b91242cdfb8c899a7a21a0277a81025'
-  data.tar.gz: 20cb6887c0fb29b7335faef953a67f31645c96b2ee4b7817bcd32d095401a107
+  metadata.gz: 6eee58a81e1cc3ebb107400567a7639a31656fba4e059b4f2d5a27233693b421
+  data.tar.gz: 2c9955231622ac80c6309d5307ae9c3b2d799f00500976b5344ab56590e7c02a
 SHA512:
-  metadata.gz: b2901c9c5a66c41344a9fff26031e516bbe7f983d084ee9aad6365ecbc1b7a8509f031d3bfb7beeb7436fcf50c1ce32d6631197f9860cffd18dbc541103d5327
-  data.tar.gz: 8dc9721c025a2e9f434922295cfd287f0c1e83c1a4ea1574f6afe681b2fb5ea2e4e3fe83a62df37156cf7aaaa0089270a0deb47ed4e59939b93dbbe71329f5ce
+  metadata.gz: 8d5723f5f07e1504ab7e922c2a6d2e0fa68b57dd613e1bfb8771825f6c3a2ff4df61b7f6948c4517d5ebe7b38c070f640e1c41f50b5ef1aeb5c055d14c07bac6
+  data.tar.gz: 9395fd8c776b31d6483e3a239459cd3d37905a8e2eee213625f05678b8964bc0253f3cb185ed31106d63416f93f1b3dbadc867323de59118685c37711b9f1944

data/app/clients/uffizzi_core/docker_registry_client.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 class UffizziCore::DockerRegistryClient
-  def initialize(credentials)
-    @registry_url = credentials.registry_url
-    @connection = build_connection(@registry_url, credentials.username, credentials.password)
+  def initialize(registry_url:, username: nil, password: nil)
+    @registry_url = registry_url
+    @connection = build_connection(@registry_url, username, password)
   end
 
   def authenticated?
@@ -11,13 +11,22 @@ class UffizziCore::DockerRegistryClient
     response.status == 200
   end
 
+  def manifests(image:, tag:, namespace: nil)
+    full_image = [namespace, image].compact.join('/')
+    url = "/v2/#{full_image}/manifests/#{tag}"
+    response = @connection.get(url)
+
+    RequestResult.new(status: response.status, result: response.body)
+  end
+
   private
 
   def build_connection(registry_url, username, password)
     Faraday.new(registry_url) do |conn|
-      conn.request(:basic_auth, username, password)
+      conn.request(:basic_auth, username, password) if username.present? && password.present?
       conn.request(:json)
       conn.response(:json)
+      conn.response(:follow_redirects)
       conn.adapter(Faraday.default_adapter)
     end
   end

data/app/serializers/uffizzi_core/controller/deploy_containers/container_serializer.rb

@@ -32,9 +32,7 @@ class UffizziCore::Controller::DeployContainers::ContainerSerializer < UffizziCo
       UffizziCore::Repo::GithubContainerRegistry.name,
       UffizziCore::Repo::DockerRegistry.name
 
-      credential = UffizziCore::RepoService.credential(repo)
-      registry_host = URI.parse(credential.registry_url).host
-      "#{registry_host}/#{object.image}"
+      build_registry_image(repo)
     else
       object.image
     end
@@ -65,4 +63,15 @@ class UffizziCore::Controller::DeployContainers::ContainerSerializer < UffizziCo
 
     object.healthcheck.merge('test' => new_command)
   end
+
+  private
+
+  def build_registry_image(repo)
+    credential = UffizziCore::RepoService.credential(repo)
+    return object.image if credential.blank?
+
+    registry_host = URI.parse(credential.registry_url).host
+
+    "#{registry_host}/#{object.image}"
+  end
 end

data/app/services/uffizzi_core/compose_file/builders/container_builder_service.rb

@@ -31,7 +31,7 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
     {
       tag: tag(image_data, repo_attributes),
       port: port(container_name, ingress_data),
-      image: image(container_data, image_data, build_data),
+      image: image(container_data, image_data, build_data, credentials),
       public: is_ingress,
       entrypoint: entrypoint(container_data),
       command: command(container_data),
@@ -96,20 +96,23 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
     ingress[:port]
   end
 
-  def image(container_data, image_data, build_data)
+  def image(container_data, image_data, build_data, credentials)
     if image_data.present?
-      image_name(container_data, image_data)
+      image_name(container_data, image_data, credentials)
     else
       "#{build_data[:account_name]}/#{build_data[:repository_name]}"
     end
   end
 
-  def image_name(container_data, image_data)
+  def image_name(container_data, image_data, credentials)
     if image_data[:registry_url].present? &&
         !UffizziCore::ComposeFile::ContainerService.google?(container_data) &&
         !UffizziCore::ComposeFile::ContainerService.github_container_registry?(container_data) &&
         !UffizziCore::ComposeFile::ContainerService.docker_registry?(container_data)
       image_data[:name]
+    elsif UffizziCore::ComposeFile::ContainerService.docker_registry?(container_data) &&
+        credential_by_scope(credentials, :docker_registry).nil?
+      [image_data[:registry_url], image_data[:namespace], image_data[:name]].compact.join('/')
     else
       "#{image_data[:namespace]}/#{image_data[:name]}"
     end
@@ -205,7 +208,7 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
   end
 
   def build_docker_repo_attributes(image_data, credentials, scope, repo_type)
-    credential = credentials.send(scope).first
+    credential = credential_by_scope(credentials, scope)
     if UffizziCore::ComposeFile::ContainerService.image_available?(credential, image_data, scope)
       return docker_builder(repo_type).build_attributes(image_data)
     end
@@ -234,4 +237,8 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
   def variables_builder
     @variables_builder ||= UffizziCore::ComposeFile::Builders::VariablesBuilderService.new(project)
   end
+
+  def credential_by_scope(credentials, scope)
+    credentials.send(scope).first
+  end
 end

data/app/services/uffizzi_core/compose_file/container_service.rb

@@ -29,9 +29,11 @@ class UffizziCore::ComposeFile::ContainerService
 
     def docker_registry?(container)
       registry_url = container.dig(:image, :registry_url)
+      return false if registry_url.nil?
+
       registry_domain_regexp = /(\w+\.\w{2,})(?::\d+)?\z/
       registry_domain = registry_url.match(registry_domain_regexp)&.to_a&.last
-      return false if registry_url.nil? || registry_domain.nil?
+      return false if registry_domain.nil?
 
       ['amazonaws.com', 'azurecr.io', 'gcr.io', 'ghcr.io'].exclude?(registry_domain)
     end
@@ -60,13 +62,13 @@ class UffizziCore::ComposeFile::ContainerService
         detect_credential(container, credentials, :docker_hub)
       elsif UffizziCore::ComposeFile::ContainerService.google?(container)
         detect_credential(container, credentials, :google)
+      else
+        detect_credential(container, credentials, :docker_registry)
       end
     end
 
     def detect_credential(container, credentials, type)
-      credential = credentials.detect do |item|
-        item.send("#{type}?")
-      end
+      credential = credentials.detect { |item| item.send("#{type}?") }
 
       return credential if image_available?(credential, container[:image], type)
 
@@ -77,6 +79,8 @@ class UffizziCore::ComposeFile::ContainerService
       case type
       when :docker_hub
         UffizziCore::DockerHubService.image_available?(credential, image_data)
+      when :docker_registry
+        UffizziCore::DockerRegistryService.image_available?(credential, image_data)
       else
         # TODO check image availability in other registry types
         credential.present?

data/app/services/uffizzi_core/docker_registry/credential_service.rb

@@ -9,7 +9,13 @@ class UffizziCore::DockerRegistry::CredentialService
     private
 
     def client(credential)
-      UffizziCore::DockerRegistryClient.new(credential)
+      params = {
+        registry_url: credential.registry_url,
+        username: credential.username,
+        password: credential.password,
+      }
+
+      UffizziCore::DockerRegistryClient.new(params)
     end
   end
 end

data/app/services/uffizzi_core/docker_registry_service.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class UffizziCore::DockerRegistryService
+  class << self
+    def image_available?(credential, image_data)
+      client_params = build_client_params(credential, image_data)
+      client = UffizziCore::DockerRegistryClient.new(**client_params)
+      response = client.manifests(namespace: image_data[:namespace], image: image_data[:name], tag: image_data[:tag])
+
+      response.status < 400
+    end
+
+    private
+
+    def build_client_params(credential, image_data)
+      registry_url = credential&.registry_url || image_data[:registry_url]
+      new_registry_url = registry_url.start_with?('https://', 'http://') ? registry_url : "https://#{registry_url}"
+
+      {
+        registry_url: new_registry_url,
+        username: credential&.username,
+        password: credential&.password,
+      }
+    end
+  end
+end

data/lib/uffizzi_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UffizziCore
-  VERSION = '1.0.3'
+  VERSION = '1.1.0'
 end

data/lib/uffizzi_core.rb

@@ -25,6 +25,7 @@ require 'rswag/api'
 require 'rswag/ui'
 require 'sidekiq'
 require 'virtus'
+require 'faraday/follow_redirects'
 
 module UffizziCore
   mattr_accessor :dependencies, default: {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-14 00:00:00.000000000 Z
+date: 2022-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -193,6 +193,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday-follow_redirects
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -937,6 +951,7 @@ files:
 - app/services/uffizzi_core/docker_hub/credential_service.rb
 - app/services/uffizzi_core/docker_hub_service.rb
 - app/services/uffizzi_core/docker_registry/credential_service.rb
+- app/services/uffizzi_core/docker_registry_service.rb
 - app/services/uffizzi_core/github_container_registry/credential_service.rb
 - app/services/uffizzi_core/google/credential_service.rb
 - app/services/uffizzi_core/google_service.rb