uffizzi_core 0.6.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5db1e654767dd515b19f3848fe63f6f0c194ac998f705bc78327b10ccf0cb401
-  data.tar.gz: 1743714525d2fd0e149bd16c4c7f6ec8a08c56d51cbec9df7ff559491c0712e5
+  metadata.gz: 8dea69b2a59531600dfb66428f656f48199aca57b46090feb7908c4c2649d6a0
+  data.tar.gz: '0049394671ce7727844814ebe46a671a9a1d420063546d5d12faf1d61748f5bb'
 SHA512:
-  metadata.gz: 1df17b138ba1bfca50b4b30d68012c80d2d38cf1a4ff0374d3a10ebd711eb6aa8e2aa0d62dc5652c9178ea83b7543981332d023a22e45aa409b3dbeed40c7314
-  data.tar.gz: 36da046695524c28f9f8d9c101d906ef32018f79f9240ce2ee10c71a7d12a7b19dbe7d182a0a867ce47d27119074a665dbb5cefd9259092325dbd1b5a323e7e2
+  metadata.gz: 278c7ce3923efa9d4db4476eb3ddad88c28b664af7fbf75a0c7547921d478ad6860fd7ea5987932bbcdcf1d01a418c55bac388a864e1f186468d3ec163f911cf
+  data.tar.gz: 83927e7d75d0e926cc1d42f16f31c9e086de1daedd33cb1315b60e118896f9d90b3ee102893ef7e9716e7e354c793610e609ae64aaf7be1657694fe166a62480

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

@@ -14,7 +14,10 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentsController < UffizziCore::
   # @response [Array<Deployment>] 200 OK
   # @response 401 Not authorized
   def index
-    respond_with deployments
+    search_labels = JSON.parse(q_param)
+    filtered_deployments = deployments.with_labels(search_labels)
+
+    respond_with filtered_deployments, each_serializer: UffizziCore::Api::Cli::V1::Projects::DeploymentsSerializer
   end
 
   # Get deployment information by id
@@ -51,7 +54,7 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentsController < UffizziCore::
     errors = check_credentials(compose_file)
     return render_errors(errors) if errors.present?
 
-    deployment = UffizziCore::DeploymentService.create_from_compose(compose_file, resource_project, current_user)
+    deployment = UffizziCore::DeploymentService.create_from_compose(compose_file, resource_project, current_user, metadata_params)
 
     respond_with deployment
   end
@@ -82,8 +85,9 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentsController < UffizziCore::
     errors = check_credentials(compose_file)
     return render_errors(errors) if errors.present?
 
-    deployment = UffizziCore::Deployment.find(params[:id])
-    updated_deployment = UffizziCore::DeploymentService.update_from_compose(compose_file, resource_project, current_user, deployment)
+    deployment = deployments.find(params[:id])
+    updated_deployment = UffizziCore::DeploymentService.update_from_compose(compose_file, resource_project, current_user, deployment,
+                                                                            metadata_params)
 
     respond_with updated_deployment
   end
@@ -171,6 +175,10 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentsController < UffizziCore::
     params.permit(dependencies: [:name, :path, :source, :content])
   end
 
+  def metadata_params
+    params[:metadata]
+  end
+
   def render_invalid_file
     render json: { errors: { state: ['Invalid compose file'] } }, status: :unprocessable_entity
   end

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

@@ -4,6 +4,7 @@ class UffizziCore::Api::Cli::V1::Deployment::CreateForm < UffizziCore::Deploymen
   include UffizziCore::ApplicationForm
 
   permit :creation_source,
+         :metadata,
          containers_attributes: [
            :image,
            :service_name,
@@ -50,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
@@ -90,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/forms/uffizzi_core/api/cli/v1/deployment/update_form.rb

@@ -3,46 +3,47 @@
 class UffizziCore::Api::Cli::V1::Deployment::UpdateForm < UffizziCore::Deployment
   include UffizziCore::ApplicationForm
 
-  permit containers_attributes: [
-    :image,
-    :service_name,
-    :tag,
-    :port,
-    :public,
-    :memory_limit,
-    :memory_request,
-    :entrypoint,
-    :command,
-    :receive_incoming_requests,
-    :continuously_deploy,
-    { variables: [:name, :value],
-      secret_variables: [:name, :value],
-      volumes: [:source, :target, :type, :read_only],
-      repo_attributes: [
-        :namespace,
-        :name,
-        :slug,
-        :type,
-        :description,
-        :is_private,
-        :repository_id,
-        :branch,
-        :kind,
-        :dockerfile_path,
-        :dockerfile_context_path,
-        :deploy_preview_when_pull_request_is_opened,
-        :delete_preview_when_pull_request_is_closed,
-        :deploy_preview_when_image_tag_is_created,
-        :delete_preview_when_image_tag_is_updated,
-        :share_to_github,
-        :delete_preview_after,
-        { args: [:name, :value] },
-      ],
-      container_config_files_attributes: [
-        :config_file_id,
-        :mount_path,
-      ] },
-  ]
+  permit :metadata,
+         containers_attributes: [
+           :image,
+           :service_name,
+           :tag,
+           :port,
+           :public,
+           :memory_limit,
+           :memory_request,
+           :entrypoint,
+           :command,
+           :receive_incoming_requests,
+           :continuously_deploy,
+           { variables: [:name, :value],
+             secret_variables: [:name, :value],
+             volumes: [:source, :target, :type, :read_only],
+             repo_attributes: [
+               :namespace,
+               :name,
+               :slug,
+               :type,
+               :description,
+               :is_private,
+               :repository_id,
+               :branch,
+               :kind,
+               :dockerfile_path,
+               :dockerfile_context_path,
+               :deploy_preview_when_pull_request_is_opened,
+               :delete_preview_when_pull_request_is_closed,
+               :deploy_preview_when_image_tag_is_created,
+               :delete_preview_when_image_tag_is_updated,
+               :share_to_github,
+               :delete_preview_after,
+               { args: [:name, :value] },
+             ],
+             container_config_files_attributes: [
+               :config_file_id,
+               :mount_path,
+             ] },
+         ]
 
   validate :check_all_containers_have_unique_ports
   validate :check_exists_ingress_container

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

@@ -45,7 +45,7 @@ module UffizziCore::Concerns::Models::Container
     validates :command, 'uffizzi_core/image_command_args': true, allow_nil: true
     validates :tag, presence: true
 
-    aasm :continuously_deploy, column: :continuously_deploy do
+    aasm :continuously_deploy, column: :continuously_deploy, namespace: :cd do
       state :disabled, initial: true
       state :enabled
     end

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

@@ -27,6 +27,10 @@ module UffizziCore::Concerns::Models::Credential
       event :unauthorize do
         transitions from: [:not_connected, :active], to: :unauthorized
       end
+
+      event :disconnect do
+        transitions from: [:active, :unauthorized], to: :not_connected
+      end
     end
 
     def github_container_registry?
@@ -59,7 +63,7 @@ module UffizziCore::Concerns::Models::Credential
       account.projects.find_each do |project|
         project.deployments.find_each do |deployment|
           containers = deployment.containers
-          attributes = { continuously_deploy: UffizziCore::Container::STATE_DISABLED }
+          attributes = { continuously_deploy: UffizziCore::Container::STATE_CD_DISABLED }
 
           containers.with_docker_hub_repo.update_all(attributes) if docker_hub?
         end

data/app/repositories/uffizzi_core/deployment_repo.rb

@@ -12,5 +12,9 @@ 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_labels, ->(labels) {
+      where("#{UffizziCore::Deployment.table_name}.metadata @> ?", labels.to_json)
+    }
   end
 end

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

@@ -16,16 +16,13 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentSerializer < UffizziCore::B
              :image_id,
              :ingress_container_ready,
              :ingress_container_state,
-             :creation_source
+             :creation_source,
+             :metadata
 
   has_many :containers
 
   belongs_to :deployed_by
 
-  def deployed_by
-    object.deployed_by
-  end
-
   def containers
     object.containers.active
   end

data/app/serializers/uffizzi_core/api/cli/v1/projects/deployments_serializer/user_serializer.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class UffizziCore::Api::Cli::V1::Projects::DeploymentsSerializer::UserSerializer < UffizziCore::BaseSerializer
+  type :user
+
+  attributes :email
+end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class UffizziCore::Api::Cli::V1::Projects::DeploymentsSerializer < UffizziCore::BaseSerializer
+  type :deployment
+
+  attributes :id,
+             :created_at,
+             :updated_at,
+             :state,
+             :preview_url,
+             :metadata
+
+  belongs_to :deployed_by
+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/container_service.rb

@@ -20,7 +20,7 @@ class UffizziCore::ContainerService
     end
 
     def continuously_deploy_enabled?(container)
-      container.aasm(:continuously_deploy).current_state == UffizziCore::Container::STATE_ENABLED
+      container.aasm(:continuously_deploy).current_state == UffizziCore::Container::STATE_CD_ENABLED
     end
 
     def valid_memory_limit?(container)

data/app/services/uffizzi_core/deployment_service.rb

@@ -12,38 +12,37 @@ class UffizziCore::DeploymentService
   }.freeze
 
   class << self
-    def create_from_compose(compose_file, project, user)
+    def create_from_compose(compose_file, project, user, metadata)
       deployment_attributes = ActionController::Parameters.new(compose_file.template.payload)
       deployment_form = UffizziCore::Api::Cli::V1::Deployment::CreateForm.new(deployment_attributes)
       deployment_form.assign_dependences!(project, user)
       deployment_form.compose_file = compose_file
       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
 
-    def update_from_compose(compose_file, project, user, deployment)
+    def update_from_compose(compose_file, project, user, deployment, metadata)
       deployment_attributes = ActionController::Parameters.new(compose_file.template.payload)
 
       deployment_form = UffizziCore::Api::Cli::V1::Deployment::UpdateForm.new(deployment_attributes)
       deployment_form.assign_dependences!(project, user)
       deployment_form.compose_file = compose_file
+      deployment_form.metadata = metadata || {}
 
       ActiveRecord::Base.transaction do
         deployment.containers.destroy_all
         deployment.compose_file.destroy! if deployment.compose_file&.kind&.temporary?
-
-        deployment.update!(
+        params = {
           containers: deployment_form.containers,
           compose_file_id: compose_file.id,
           creation_source: UffizziCore::Deployment.creation_source.compose_file_manual,
-        )
+          metadata: deployment_form.metadata,
+        }
+        deployment.update!(params)
       end
 
       deployment
@@ -88,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
@@ -201,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
@@ -219,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/db/migrate/20220805164628_add_metadata_to_deployment.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddMetadataToDeployment < ActiveRecord::Migration[6.1]
+  def change
+    add_column(:uffizzi_core_deployments, :metadata, :jsonb, default: {})
+  end
+end

data/lib/uffizzi_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UffizziCore
-  VERSION = '0.6.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.6.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-17 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
@@ -877,6 +876,8 @@ files:
 - app/serializers/uffizzi_core/api/cli/v1/projects/deployments/container_serializer.rb
 - app/serializers/uffizzi_core/api/cli/v1/projects/deployments/container_serializer/container_config_file_serializer.rb
 - app/serializers/uffizzi_core/api/cli/v1/projects/deployments/container_serializer/container_config_file_serializer/config_file_serializer.rb
+- app/serializers/uffizzi_core/api/cli/v1/projects/deployments_serializer.rb
+- app/serializers/uffizzi_core/api/cli/v1/projects/deployments_serializer/user_serializer.rb
 - app/serializers/uffizzi_core/api/cli/v1/projects/secret_serializer.rb
 - app/serializers/uffizzi_core/api/cli/v1/short_project_serializer.rb
 - app/serializers/uffizzi_core/api/cli/v1/user_serializer.rb
@@ -964,6 +965,7 @@ files:
 - db/migrate/20220422151523_add_volumes_to_uffizzi_core_containers.rb
 - db/migrate/20220525113412_rename_name_to_uffizzi_containers.rb
 - db/migrate/20220704135629_add_disabled_at_to_deployments.rb
+- db/migrate/20220805164628_add_metadata_to_deployment.rb
 - db/seeds.rb
 - lib/tasks/uffizzi_core_tasks.rake
 - lib/uffizzi_core.rb

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

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