uffizzi_core 2.1.24 → 2.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de321ff2e21c9c9b909b4739eb07728d4399801c45d267c5608142d2634f519f
-  data.tar.gz: 4550ded63ea25d6a480c0e9a93964285746fae2d6582e73bb6829eb3a18e9163
+  metadata.gz: 72d1fe1b0397a4e5b6a0b95c5b9ad9374eb9c3dfef94c235e434b29daf44a8ed
+  data.tar.gz: cbb2423de1feebba8b114fbf2d76e38560426e6ca5006e0d14787571eb404e56
 SHA512:
-  metadata.gz: 3de13bddf08f86c9eb18e7d21b4ccd9ce074815a6716888357f3b93f99f4ed92da9be571296897240f7245e4f4709ff7fd183aab70a915072c15932cd00cae4e
-  data.tar.gz: 8634b6e9021ec0f1a5fa883957a91ddbaa4e367e3d2f0b97da4a108c4b935c552bfb944dd6156ef06fb075395904e3d6ed69b59ea15b7af7611daed24a8b39d5
+  metadata.gz: 80536080ab0b3f4e898d819cf1013e20db1cf4a1cdaa373463998cecac53648ecf4feb2f643de2a953f7afd921d0ffd4564b1989c05cdc5f5c1d640d33ecdbb1
+  data.tar.gz: 30339f6896549337c7c8c5a1cb59b21e2bbc28c3db3016c1b79ec091db83e2a6cf47704af8a91655628cba2a622a4194b8e5b640bdede3bd3df6c1f13a4013d6

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/lib/uffizzi_core/concerns/models/deployment.rb

@@ -27,7 +27,7 @@ module UffizziCore::Concerns::Models::Deployment
     validates :kind, presence: true
 
     enumerize :creation_source, in: [:manual, :demo, :continuous_preview, :compose_file_manual, :compose_file_continuous_preview,
-                                     :github_actions], predicates: true, scope: true, default: :manual
+                                     :github_actions, :gitlab_actions], predicates: true, scope: true, default: :manual
 
     accepts_nested_attributes_for :containers, allow_destroy: true
 

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/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.24'
+  VERSION = '2.1.26'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.1.24
+  version: 2.1.26
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-22 00:00:00.000000000 Z
+date: 2023-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -876,7 +876,6 @@ files:
 - app/models/uffizzi_core/credential/azure.rb
 - app/models/uffizzi_core/credential/docker_hub.rb
 - app/models/uffizzi_core/credential/docker_registry.rb
-- app/models/uffizzi_core/credential/github.rb
 - app/models/uffizzi_core/credential/github_container_registry.rb
 - app/models/uffizzi_core/credential/google.rb
 - app/models/uffizzi_core/database.rb

data/app/models/uffizzi_core/credential/github.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-class UffizziCore::Credential::Github < UffizziCore::Credential
-end