uffizzi_core 2.1.23 → 2.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0006c772fa6daeaecbd5eab034433a8e66b5b6090b5af1f52dc93627ddbab788
-  data.tar.gz: 2df15f2b34462e716536e71bb55567cab5792dffbe7e6f797d0ceee8de5badca
+  metadata.gz: 891fe1a03e5dd0dbc635156b946213cbedef67a792537d706e7247ec241c8c7a
+  data.tar.gz: a81611e8aa150c0d6bf1ac9f3bdbd549aefdfcfc1434f3ebe68688488bd509b8
 SHA512:
-  metadata.gz: 9b4082dc0121834a765c085c7554ffc6aa789018d77d33d5390a5a422c313fe39460cc5fdeed9c26d3bfaffb56c4e744ec7110bdb30c8d3cbc2be6302a72e6b0
-  data.tar.gz: f4b51425b29c3fb7cf81b6964503e45acee38ab0d193a019261bd94d4bee2d8c564694795a49438c10a7029871cb0157e7cfcc624dcbed425f1c0db2aeb7a21e
+  metadata.gz: 7de4b67a8fc79849717ac31c2e74511d8c017dad1adc70cdc94dc83ab022290c819dfd7cf68fda8b411399ec7b39efd0f774e351daecd25845cc84f82879cf33
+  data.tar.gz: '028258a7a6c4550b9921642df1d38e8ef3e87e63b0f95fefbb866eaf46614df97b114f6bf51fdfa82ff0190ed2abcf910a4602ada23e6850a6ddedbfa1fdd603'

data/app/controllers/concerns/uffizzi_core/dependency_injection_concern.rb

@@ -1,6 +1,14 @@
 # frozen_string_literal: true
 
 module UffizziCore::DependencyInjectionConcern
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def include_module_if_exists(module_name)
+      include(Object.const_get(module_name)) if Object.const_defined?(module_name)
+    end
+  end
+
   def user_access_module
     return unless module_exists?(:rbac)
 

data/app/controllers/uffizzi_core/api/cli/v1/projects/deployments_controller.rb

@@ -51,6 +51,8 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentsController < UffizziCore::
   # @response [object<errors: object<title: string>>] 404 Not found
   # @response 401 Not authorized
   def create
+    return render_deployment_exists_error if deployments.with_metadata.with_labels(metadata_params).exists?
+
     compose_file, errors = find_or_create_compose_file
     return render_invalid_file if compose_file.invalid_file?
     return render_errors(errors) if errors.present?
@@ -193,6 +195,10 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentsController < UffizziCore::
   end
 
   def render_invalid_file
-    render json: { errors: { state: ['Invalid compose file'] } }, status: :unprocessable_entity
+    render json: { errors: { state: [I18n.t('compose.invalid_compose')] } }, status: :unprocessable_entity
+  end
+
+  def render_deployment_exists_error
+    render json: { errors: { state: [I18n.t('deployment.already_exists')] } }, status: :unprocessable_entity
   end
 end

data/app/repositories/uffizzi_core/deployment_repo.rb

@@ -12,7 +12,7 @@ module UffizziCore::DeploymentRepo
     scope :active_for_credential_id, ->(credential_id) {
       active.joins(project: :credentials).merge(UffizziCore::Project.active).where(credentials: { id: credential_id })
     }
-
+    scope :with_metadata, -> { where.not(metadata: {}) }
     scope :with_labels, ->(labels) {
       where("#{UffizziCore::Deployment.table_name}.metadata @> ?", labels.to_json)
     }

data/app/serializers/uffizzi_core/api/cli/v1/projects/deployment_serializer.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 class UffizziCore::Api::Cli::V1::Projects::DeploymentSerializer < UffizziCore::BaseSerializer
+  include UffizziCore::DependencyInjectionConcern
+  include_module_if_exists('UffizziCore::Api::Cli::V1::Projects::DeploymentSerializerModule')
+
   type :deployment
 
   attributes :id,

data/app/services/uffizzi_core/container_registry/docker_hub_service.rb

@@ -37,6 +37,9 @@ class UffizziCore::ContainerRegistry::DockerHubService
       token = docker_hub_client.get_token(image).result.token
       response = docker_hub_client.digest(image: image, tag: tag, token: token)
       response.headers['docker-content-digest']
+      # FIXME: can't get digest for private image: {"code":"UNAUTHORIZED","message":"authentication required"...}
+    rescue UffizziCore::ContainerRegistryError
+      'unknown'
     end
 
     def credential_correct?(credential)

data/config/locales/en.yml

@@ -14,6 +14,7 @@ en:
   compose:
     unsupported_file: Unsupported compose file
     invalid_file: 'Syntax error: %{err} at line %{line} column %{column}'
+    invalid_compose: Invalid compose file
     invalid_config_option: Invalid config option '%{value}' - only a-zA-Z0-9._- characters are allowed
     no_services: Service services has neither an image nor a build context specified. At least one must be provided.
     invalid_service_name: "Invalid service name '%{value}': a service name must consist of lower case alphanumeric characters, ''-'', and must start and end with an alphanumeric character"
@@ -80,6 +81,7 @@ en:
 
   deployment:
     invalid_state: Preview with ID deployment-%{id} %{state}
+    already_exists: An active deployment already exists
 
   session:
     unsupported_login_type: This type of login is not supported

data/lib/uffizzi_core/version.rb

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

metadata

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