uffizzi_core 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 169a9ec674c81b791babc5049b74c807a9150da4534980f6b6eb2188b3b12771
-  data.tar.gz: c3365c36312f14cf56a3d8c71b293939d667369b8a6df9da67925620127b514e
+  metadata.gz: 520b79e2bc010eab840b4a6c4d31fe236c7b1e1a04714a42319399d904208b09
+  data.tar.gz: 4cdf4a4e66308a13bcb9740ea3aafb63d1de49c128fef7fb4d59731045ac1877
 SHA512:
-  metadata.gz: f8af4f54965d0557094566deb6d3bea447ede3071891aa4bd7d00139b3795a9644fd6b8d71a346b8b6aeff113cc578bdde3f4f64e45d21bb31f5d59b531e15e9
-  data.tar.gz: aa2b7c6fce6745775164119324cd7298cd2382246764026c4aa4bf6ebba3f1c8c390eba3cd3a9bde9b512fb1ec3607da5fee8c376bcac79e953d9efaccd7d811
+  metadata.gz: 8e44e43bb064368f55ca82ad30eb989ee8503a65a2daad496f50608d983c39da93543ec8ea6cddeef7cbcf1367bd1916bc929fc7015b5fd0121d6eb987333f2e
+  data.tar.gz: 414e34bec819810a75c0fe13ca4652ab0a26d271f1bedd8d11d9e50f9ebbd918f83209205c5a0a5005f8db2c59889114268a961b8a4a93ea270c43e37b43f498

data/app/clients/uffizzi_core/docker_hub_client.rb

@@ -23,6 +23,15 @@ class UffizziCore::DockerHubClient
     nil
   end
 
+  def repository(namespace:, image:)
+    url = "#{BASE_URL}/v2/repositories/#{namespace}/#{image}"
+
+    response = connection.get(url) do |request|
+      request.headers['Authorization'] = "JWT #{jwt}"
+    end
+    RequestResult.new(status: response.status, result: response.body)
+  end
+
   def public_images(q:, page: 1, per_page: 25)
     url = "#{BASE_URL}/api/content/v1/products/search"
     params = { page_size: per_page, q: q, type: :image, page: page }

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

@@ -206,9 +206,11 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
 
   def build_docker_repo_attributes(image_data, credentials, scope, repo_type)
     credential = credentials.send(scope).first
-    raise UffizziCore::ComposeFile::BuildError, I18n.t('compose.invalid_credential', value: scope) if credential.nil?
+    if UffizziCore::ComposeFile::ContainerService.image_available?(credential, image_data, scope)
+      return docker_builder(repo_type).build_attributes(image_data)
+    end
 
-    docker_builder(repo_type).build_attributes(image_data)
+    raise UffizziCore::ComposeFile::BuildError, I18n.t('compose.unprocessable_image', value: scope)
   end
 
   def variables(variables_data, dependencies)

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

@@ -55,23 +55,32 @@ class UffizziCore::ComposeFile::ContainerService
 
     def credential_for_container(container, credentials)
       if UffizziCore::ComposeFile::ContainerService.azure?(container)
-        detect_credential(credentials, :azure)
+        detect_credential(container, credentials, :azure)
       elsif UffizziCore::ComposeFile::ContainerService.docker_hub?(container)
-        detect_credential(credentials, :docker_hub)
+        detect_credential(container, credentials, :docker_hub)
       elsif UffizziCore::ComposeFile::ContainerService.google?(container)
-        detect_credential(credentials, :google)
+        detect_credential(container, ecredentials, :google)
       end
     end
 
-    def detect_credential(credentials, type)
+    def detect_credential(container, credentials, type)
       credential = credentials.detect do |item|
         item.send("#{type}?")
       end
 
-      error_message = "Invalid credential: #{type}"
-      raise UffizziCore::ComposeFile::CredentialError.new(error_message) if credential.nil?
+      return credential if image_available?(credential, container[:image], type)
 
-      credential
+      raise UffizziCore::ComposeFile::CredentialError.new(I18n.t('compose.unprocessable_image', value: type))
+    end
+
+    def image_available?(credential, image_data, type)
+      case type
+      when :docker_hub
+        UffizziCore::DockerHubService.image_available?(credential, image_data)
+      else
+        # TODO check image availability in other registry types
+        credential.present?
+      end
     end
   end
 end

data/app/services/uffizzi_core/docker_hub_service.rb

@@ -11,6 +11,16 @@ class UffizziCore::DockerHubService
       accounts_response.nil? ? [] : accounts_response.namespaces
     end
 
+    def image_available?(credential, image_data)
+      namespace = image_data[:namespace]
+      repo_name = image_data[:name]
+      client = UffizziCore::DockerHubClient.new(credential)
+      response = client.repository(namespace: namespace, image: repo_name)
+      return false if not_found?(response)
+
+      true
+    end
+
     def user_client(credential)
       return @client if @client&.credential&.username == credential.username
 
@@ -36,5 +46,9 @@ class UffizziCore::DockerHubService
     def public_docker_hub_client
       @public_docker_hub_client ||= UffizziCore::DockerHubClient.new
     end
+
+    def not_found?(response)
+      response.status == 404
+    end
   end
 end

data/config/locales/en.yml

@@ -17,7 +17,7 @@ en:
     no_services: Service services has neither an image nor a build context specified. At least one must be provided.
     no_ingress: Service ingress has not been defined.
     invalid_image_value: Invalid image value '%{value}'
-    invalid_credential: Invalid credential '%{value}'
+    unprocessable_image: Invalid credential '%{value} or image does not exist'
     invalid_repo_type: Unsupported repo type
     repo_not_found: The specified repository doesn't exist '%{name}'
     ingress_port_not_specified: Ingress port not specified

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-07 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm