uffizzi_core 2.1.26 → 2.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72d1fe1b0397a4e5b6a0b95c5b9ad9374eb9c3dfef94c235e434b29daf44a8ed
-  data.tar.gz: cbb2423de1feebba8b114fbf2d76e38560426e6ca5006e0d14787571eb404e56
+  metadata.gz: 5a8a1183efec864646047c9f61ae530737b409a1053d35a784064f85644debc5
+  data.tar.gz: 1e379b56a9dbbd9359d9465d804e7006674033b2ce1ca044b100e180b7950804
 SHA512:
-  metadata.gz: 80536080ab0b3f4e898d819cf1013e20db1cf4a1cdaa373463998cecac53648ecf4feb2f643de2a953f7afd921d0ffd4564b1989c05cdc5f5c1d640d33ecdbb1
-  data.tar.gz: 30339f6896549337c7c8c5a1cb59b21e2bbc28c3db3016c1b79ec091db83e2a6cf47704af8a91655628cba2a622a4194b8e5b640bdede3bd3df6c1f13a4013d6
+  metadata.gz: 7ac9e06c7d871c1ed0a3d6e91b6e15118cf99048828777a9aca540c871327234dc2b839db691da579476b33edccb56682c05ec98461e177e30a2bde65f4a1a8f
+  data.tar.gz: 80b8a0283c69a1f0a74d32d33301030d1b6f5794817b33d12523a6a91df7426c22af96168cea50a6576268a7df8806118c196115797ce646f0d4beee48115777

data/app/clients/uffizzi_core/docker_registry_client.rb

@@ -12,18 +12,18 @@ class UffizziCore::DockerRegistryClient
 
   def initialize(registry_url:, username: nil, password: nil)
     @registry_url = registry_url
-    @connection = build_connection(@registry_url, username, password)
+    @connection = build_connection(username, password)
   end
 
   def authenticated?
-    @connection.head('/v2/')
+    @connection.get("#{@registry_url}/v2/")
 
     true
   end
 
   def manifests(image:, tag:, namespace: nil)
     full_image = [namespace, image].compact.join('/')
-    url = "/v2/#{full_image}/manifests/#{tag}"
+    url = "#{@registry_url}/v2/#{full_image}/manifests/#{tag}"
     response = @connection.get(url)
 
     RequestResult.new(status: response.status, result: response.body)
@@ -31,9 +31,9 @@ class UffizziCore::DockerRegistryClient
 
   private
 
-  def build_connection(registry_url, username, password)
-    connection = Faraday.new(registry_url) do |faraday|
-      faraday.headers['Accept'] = ACCEPTED_TYPES
+  def build_connection(username, password)
+    # initializing Faraday with the registry_url will trim the trailing slash required for the /v2/ request
+    connection = Faraday.new do |faraday|
       faraday.request(:basic_auth, username, password) if username.present? && password.present?
       faraday.request(:json)
       faraday.response(:json)

data/app/forms/uffizzi_core/api/cli/v1/compose_file/check_credentials_form.rb

@@ -19,7 +19,7 @@ class UffizziCore::Api::Cli::V1::ComposeFile::CheckCredentialsForm
 
     containers = compose_data[:containers]
     containers.each do |container|
-      container_registry_service = UffizziCore::ContainerRegistryService.init_by_container(container)
+      container_registry_service = UffizziCore::ContainerRegistryService.init_by_container(container, credentials)
       @type = container_registry_service.type
       next if container_registry_service.image_available?(credentials)
 

data/app/lib/uffizzi_core/concerns/models/account.rb

@@ -24,25 +24,6 @@ module UffizziCore::Concerns::Models::Account
     has_many :deployments, through: :projects
     has_many :payments, dependent: :destroy
 
-    aasm(:state) do
-      state :active, initial: true
-      state :payment_issue
-      state :disabled
-      state :draft
-
-      event :activate do
-        transitions from: [:payment_issue, :disabled, :draft], to: :active
-      end
-
-      event :raise_payment_issue, before_success: :update_payment_issue_date do
-        transitions from: [:active, :disabled], to: :payment_issue
-      end
-
-      event :disable, after: :disable_projects do
-        transitions from: [:active, :payment_issue], to: :disabled
-      end
-    end
-
     aasm(:sso_state) do
       state :connection_not_configured, initial: true
       state :connection_disabled

data/app/models/uffizzi_core/account.rb

@@ -4,4 +4,23 @@ class UffizziCore::Account < UffizziCore::ApplicationRecord
   include UffizziCore::Concerns::Models::Account
 
   belongs_to :owner, class_name: UffizziCore::User.name, foreign_key: :owner_id
+
+  aasm(:state) do
+    state :active, initial: true
+    state :payment_issue
+    state :disabled
+    state :draft
+
+    event :activate do
+      transitions from: [:payment_issue, :disabled, :draft], to: :active
+    end
+
+    event :raise_payment_issue, before_success: :update_payment_issue_date do
+      transitions from: [:active, :disabled], to: :payment_issue
+    end
+
+    event :disable, after: :disable_projects do
+      transitions from: [:active, :payment_issue], to: :disabled
+    end
+  end
 end

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

@@ -59,7 +59,7 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
   private
 
   def container_registry(container_data)
-    @container_registry ||= UffizziCore::ContainerRegistryService.init_by_container(container_data)
+    @container_registry ||= UffizziCore::ContainerRegistryService.init_by_container(container_data, @credentials)
   end
 
   def repo_attributes(container_data, continuous_preview_global_data)

data/app/services/uffizzi_core/container_registry_service.rb

@@ -9,17 +9,23 @@ class UffizziCore::ContainerRegistryService
       new(type.to_sym)
     end
 
-    def init_by_container(container)
+    def init_by_container(container, credentials)
       registry_url = container.dig(:image, :registry_url)
 
       return new(:docker_hub, container) if registry_url.include?('docker.io')
       return new(:azure, container) if registry_url.include?('azurecr.io')
       return new(:google, container) if registry_url.include?('gcr.io')
-      return new(:amazon, container) if registry_url.include?('amazonaws.com')
+      return init_by_credentials(container, credentials) if registry_url.include?('amazonaws.com')
       return new(:github_container_registry, container) if registry_url.include?('ghcr.io')
       return new(:docker_registry, container) if docker_registry?(container)
     end
 
+    def init_by_credentials(container, credentials)
+      return new(:docker_registry, container) if credentials && credentials.docker_registry.where(username: 'AWS').exists?
+
+      new(:amazon, container)
+    end
+
     def docker_registry?(container)
       registry_url = container.dig(:image, :registry_url)
       return false if registry_url.nil?

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.1.26
+  version: 2.1.27
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-05 00:00:00.000000000 Z
+date: 2023-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm