uffizzi_core 0.6.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 906801fea12b493de551c88a90e6a8fb576d76e07cca94d599387a620dcca920
-  data.tar.gz: e42b3989f0cee2e2ca4a87c7231d477cffc426d73ba26368a5ed47a60ac2c569
+  metadata.gz: 25654d45dce9f26feb5a3cca55a5891bb389216e749512b2900898bec4a8da0b
+  data.tar.gz: cb7784c03bcffb216adc343ae30e0ef0c51e3038791da4fe0229b86179cdc8e9
 SHA512:
-  metadata.gz: 7ccf182b08308c44d6b62c00832cefd031b34abad8b7c5eace999d6c34ec43976b5d2c577c5044bcf83299cef80776a55a9ebdd56a4dc82e12013bee47dd9582
-  data.tar.gz: 4e6a3c3921e8d360a73eeeb615c24039b362148a9f4119f04e0bfa7f8f9cff3ab8b27ed9f5923d033d482cd668f65e669a9af60609f2b060a0ed9276b56cdee2
+  metadata.gz: c3b6ae9974961ae5d39e723264e6c72fa0f4dfa9f99085a6550a98af67afd6ddcbd92f98e7f815ff602bb7f6a3144d2f87ac9d61a58f228099b9dedd537ce6be
+  data.tar.gz: 572bcfcc9d1e3396d721a83a60c703db10c0b3848031e35b63aa26065b67ceb6fc11bb5278fd6b383e4686a5885758d45d69b0a3c3314cda4f6d93fc3a81d93b

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,

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/services/uffizzi_core/compose_file/parsers/services/image_parser_service.rb

@@ -5,9 +5,8 @@ class UffizziCore::ComposeFile::Parsers::Services::ImageParserService
     def parse(value)
       return {} if value.blank?
 
-      parse_error = UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_image_value', value: value)
-      image_path, tag = get_image_path_and_tag(value, parse_error)
-      raise parse_error if image_path.blank?
+      image_path, tag = get_image_path_and_tag(value)
+      raise_parse_error(value) if image_path.blank?
 
       tag = Settings.compose.default_tag if tag.blank?
 
@@ -27,7 +26,11 @@ class UffizziCore::ComposeFile::Parsers::Services::ImageParserService
 
     private
 
-    def get_image_path_and_tag(value, parse_error)
+    def raise_parse_error(value)
+      raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_image_value', value: value)
+    end
+
+    def get_image_path_and_tag(value)
       image_path_parts = value.downcase.split(':')
       case image_path_parts.size
       when 1
@@ -40,18 +43,18 @@ class UffizziCore::ComposeFile::Parsers::Services::ImageParserService
         elsif tag_pattern.match?(value)
           [image_path_parts[0], image_path_parts[1]]
         else
-          raise parse_error
+          raise_parse_error(value)
         end
       when 3
         ["#{image_path_parts[0]}:#{image_path_parts[1]}", image_path_parts[2]]
       else
-        raise parse_error
+        raise_parse_error(value)
       end
     end
 
     def url?(image_path)
       uri = URI(add_https_if_needed(image_path))
-      uri.host.present? && uri.host =~ /\w+\.(\w+\.)*\w+/ && uri.path.present?
+      uri.host.present? && uri.host =~ /(localhost(:\d+)?|\w+\.(\w+\.)*\w+)/ && uri.path.present?
     rescue URI::InvalidURIError
       false
     end

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,12 +12,13 @@ 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)
@@ -28,22 +29,24 @@ class UffizziCore::DeploymentService
       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

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.0'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2022-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -877,6 +877,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 +966,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