uffizzi_core 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25654d45dce9f26feb5a3cca55a5891bb389216e749512b2900898bec4a8da0b
-  data.tar.gz: cb7784c03bcffb216adc343ae30e0ef0c51e3038791da4fe0229b86179cdc8e9
+  metadata.gz: 8dea69b2a59531600dfb66428f656f48199aca57b46090feb7908c4c2649d6a0
+  data.tar.gz: '0049394671ce7727844814ebe46a671a9a1d420063546d5d12faf1d61748f5bb'
 SHA512:
-  metadata.gz: c3b6ae9974961ae5d39e723264e6c72fa0f4dfa9f99085a6550a98af67afd6ddcbd92f98e7f815ff602bb7f6a3144d2f87ac9d61a58f228099b9dedd537ce6be
-  data.tar.gz: 572bcfcc9d1e3396d721a83a60c703db10c0b3848031e35b63aa26065b67ceb6fc11bb5278fd6b383e4686a5885758d45d69b0a3c3314cda4f6d93fc3a81d93b
+  metadata.gz: 278c7ce3923efa9d4db4476eb3ddad88c28b664af7fbf75a0c7547921d478ad6860fd7ea5987932bbcdcf1d01a418c55bac388a864e1f186468d3ec163f911cf
+  data.tar.gz: 83927e7d75d0e926cc1d42f16f31c9e086de1daedd33cb1315b60e118896f9d90b3ee102893ef7e9716e7e354c793610e609ae64aaf7be1657694fe166a62480

data/app/forms/uffizzi_core/api/cli/v1/deployment/create_form.rb

@@ -51,6 +51,7 @@ class UffizziCore::Api::Cli::V1::Deployment::CreateForm < UffizziCore::Deploymen
   validate :check_exists_ingress_container
   validate :check_max_memory_limit
   validate :check_max_memory_request
+  validate :check_secrets_exist_in_database
 
   def assign_dependences!(project, user)
     self.project = project
@@ -91,4 +92,17 @@ class UffizziCore::Api::Cli::V1::Deployment::CreateForm < UffizziCore::Deploymen
 
     errors.add(:containers, :max_memory_request_error, max: project.account.container_memory_limit)
   end
+
+  def check_secrets_exist_in_database
+    return if compose_file.nil?
+
+    existing_secrets = project.secrets.pluck('name')
+    compose_file.template.payload['containers_attributes']
+      .map { |container| container['secret_variables'].map { |secret| secret['name'] } }.flatten.uniq
+      .select { |secret| existing_secrets.exclude?(secret) }
+      .each do |secret|
+      error_message = I18n.t('compose.project_secret_not_found', secret: secret)
+      errors.add(:secret_variables, error_message)
+    end
+  end
 end

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

@@ -41,12 +41,7 @@ class UffizziCore::Controller::DeployContainers::ContainerSerializer < UffizziCo
   end
 
   def tag
-    case object.repo.type
-    when UffizziCore::Repo::Github.name
-      UffizziCore::RepoService.tag(object.repo)
-    else
-      object.tag
-    end
+    object.tag
   end
 
   def entrypoint

data/app/services/uffizzi_core/deployment_service.rb

@@ -20,11 +20,7 @@ class UffizziCore::DeploymentService
       deployment_form.creation_source = UffizziCore::Deployment.creation_source.compose_file_manual
       deployment_form.metadata = metadata || {}
 
-      if deployment_form.save
-        update_subdomain!(deployment_form)
-
-        UffizziCore::Deployment::CreateJob.perform_async(deployment_form.id)
-      end
+      run_deployment_creation_tasks(deployment_form) if deployment_form.save
 
       deployment_form
     end
@@ -91,27 +87,28 @@ class UffizziCore::DeploymentService
     end
 
     def build_subdomain(deployment)
-      if deployment.continuous_preview_payload.present?
-        continuous_preview_payload = deployment.continuous_preview_payload
+      return build_docker_continuous_preview_subdomain(deployment) if deployment&.continuous_preview_payload&.fetch('docker', nil).present?
 
-        return build_pull_request_subdomain(deployment) if continuous_preview_payload['pull_request'].present?
-        return build_docker_continuous_preview_subdomain(deployment) if continuous_preview_payload['docker'].present?
-      end
+      github_metadata = deployment.metadata.dig('labels', 'github')
+      return build_pull_request_subdomain(deployment) if
+        github_metadata&.dig('pull_request', 'number').present? && github_metadata&.dig('repository').present?
 
       build_default_subdomain(deployment)
     end
 
     def build_pull_request_subdomain(deployment)
-      project = deployment.project
-      continuous_preview_payload = deployment.continuous_preview_payload
-      pull_request_payload = continuous_preview_payload['pull_request']
-      repo_name = pull_request_payload['repository_full_name'].split('/').last
-      deployment_name = name(deployment)
-      subdomain = "pr#{pull_request_payload['id']}-#{deployment_name}-#{repo_name}-#{project.slug}"
-
+      github_payload = deployment.metadata.dig('labels', 'github')
+      repo_name = github_payload['repository'].split('/').last
+      pull_request_number = github_payload['pull_request']['number']
+      subdomain = "pr-#{pull_request_number}-#{name(deployment)}-#{repo_name}-#{deployment.project.slug}"
       format_subdomain(subdomain)
     end
 
+    def update_subdomain!(deployment)
+      deployment.subdomain = build_subdomain(deployment)
+      deployment.save!
+    end
+
     def build_docker_continuous_preview_subdomain(deployment)
       project = deployment.project
       continuous_preview_payload = deployment.continuous_preview_payload
@@ -204,12 +201,6 @@ class UffizziCore::DeploymentService
       "deployment-#{deployment.id}"
     end
 
-    def update_subdomain!(deployment)
-      deployment.subdomain = build_subdomain(deployment)
-
-      deployment.save!
-    end
-
     def pull_request_payload_present?(deployment)
       deployment.continuous_preview_payload.present? && deployment.continuous_preview_payload['pull_request'].present?
     end
@@ -222,6 +213,12 @@ class UffizziCore::DeploymentService
 
     private
 
+    def run_deployment_creation_tasks(deployment)
+      update_subdomain!(deployment)
+
+      UffizziCore::Deployment::CreateJob.perform_async(deployment.id)
+    end
+
     def deployment_process_status(deployment)
       containers = deployment.active_containers
       activity_items = containers.map { |container| container.activity_items.order_by_id.last }.compact

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-23 00:00:00.000000000 Z
+date: 2022-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -829,7 +829,6 @@ files:
 - app/models/uffizzi_core/repo/azure.rb
 - app/models/uffizzi_core/repo/docker_hub.rb
 - app/models/uffizzi_core/repo/docker_registry.rb
-- app/models/uffizzi_core/repo/github.rb
 - app/models/uffizzi_core/repo/github_container_registry.rb
 - app/models/uffizzi_core/repo/google.rb
 - app/models/uffizzi_core/role.rb

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

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