uffizzi_core 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 377c1d90c271757c6d8728d3f4d3dd6c7499b22f606bfbf37c4e6545b074bc90
-  data.tar.gz: 4cbaac6e361d336cd4c13f004e2b76b9df0ac44638f2eeaa2e94afaff203c75b
+  metadata.gz: f9863f1734f5ee6937e8b498f95a78ff853b1b546c9f33a30578755c2a580869
+  data.tar.gz: 036277c7c8913e0cfda95f5bf413296dd65bccf9d11c7d8f47b0ca70e26da661
 SHA512:
-  metadata.gz: e68d968cd53a9ee833092724977d6b0752988225640488bf3c03af081bbcc00173c9e62a85ccf3403ef174a196bc86edbd4f1065dfc25c93dcbf4029015ee003
-  data.tar.gz: 39cf4ac688207af05cdc2c7cdcc8451d2bcdd00d202e014fe9c275d63c53780868f7f2ad7bd4b1243fe6e2ac18389dde06b24e485d464338d4d776a91c34a849
+  metadata.gz: cbfe3b99fb50fd90bf91d8894eb89104d7239ac58a27dfd0a60e022c9d525995586a074b236f642b85c903d9c5d21f2837610feeef61ade40357d1e55bb649bd
+  data.tar.gz: da2f031e15feb3b3350e4a42bed43f465b581854a77f402b9365fad976f1f000ac53066618224a1521dea0a0d0e0dcdcafd4888ac183d5c955ee820974f220ad

data/app/clients/uffizzi_core/docker_hub_client.rb

@@ -43,34 +43,6 @@ class UffizziCore::DockerHubClient
     RequestResult.new(result: response.body)
   end
 
-  def get_webhooks(slug:, registry:)
-    url = BASE_URL + "/v2/repositories/#{slug}/webhook_pipeline/"
-
-    response = connection.get(url, { registry: registry, page_size: 100 }) do |request|
-      request.headers['Authorization'] = "JWT #{jwt}"
-    end
-
-    RequestResult.new(status: response.status, result: response.body)
-  end
-
-  def create_webhook(slug:, name:, expect_final_callback:, webhooks:)
-    raise NotAuthorizedError if !authentificated?
-
-    url = BASE_URL + "/v2/repositories/#{slug}/webhook_pipeline/"
-
-    params = {
-      name: name,
-      expect_final_callback: expect_final_callback,
-      webhooks: webhooks,
-    }
-
-    response = connection.post(url, params) do |request|
-      request.headers['Authorization'] = "JWT #{jwt}"
-    end
-
-    RequestResult.new(status: response.status, result: response.body)
-  end
-
   def accounts
     raise NotAuthorizedError if !authentificated?
 
@@ -115,16 +87,6 @@ class UffizziCore::DockerHubClient
     RequestResult.new(result: response.body)
   end
 
-  def send_webhook_answer(url, params)
-    conn = Faraday.new do |c|
-      c.request(:json)
-      c.adapter(Faraday.default_adapter)
-    end
-    response = conn.post(url, params)
-
-    RequestResult.quiet.new(result: response.body)
-  end
-
   def authentificated?
     jwt.present?
   end

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/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/deployment_service.rb

@@ -12,39 +12,41 @@ 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)
-        UffizziCore::Deployment::CreateWebhooksJob.perform_async(deployment_form.id)
       end
 
       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
@@ -208,28 +210,6 @@ class UffizziCore::DeploymentService
       deployment.save!
     end
 
-    def create_webhooks(deployment)
-      credential = deployment.project.account.credentials.docker_hub.active.first
-
-      if !deployment.containers.with_docker_hub_repo.exists? || !credential.present?
-        Rails.logger.info("DEPLOYMENT_PROCESS deployment_id=#{deployment.id} create_webhooks no dockerhub containers or credential")
-        return
-      end
-
-      accounts = UffizziCore::DockerHubService.accounts(credential)
-
-      deployment.containers.with_docker_hub_repo.find_each do |container|
-        if !accounts.include?(container.repo.namespace)
-          logger_message = "DEPLOYMENT_PROCESS deployment_id=#{deployment.id} no namespace(#{container.repo.namespace})
-          in accounts(#{accounts.inspect})"
-          Rails.logger.info(logger_message)
-          next
-        end
-
-        UffizziCore::Credential::DockerHub::CreateWebhookJob.perform_async(credential.id, container.image, deployment.id)
-      end
-    end
-
     def pull_request_payload_present?(deployment)
       deployment.continuous_preview_payload.present? && deployment.continuous_preview_payload['pull_request'].present?
     end

data/app/services/uffizzi_core/docker_hub_service.rb

@@ -1,44 +1,7 @@
 # frozen_string_literal: true
 
 class UffizziCore::DockerHubService
-  HOOK_NAME = 'Uffizzi OpenSource Deploy Webhook'
-  HOOK_URL = "#{Settings.app.host}api/cli/v1/webhooks/docker_hub"
-  REGISTRY = 'registry-1.docker.io'
-
   class << self
-    def create_webhook(credential, image)
-      client = user_client(credential)
-
-      webhooks_response = client.get_webhooks(slug: image, registry: REGISTRY)
-      Rails.logger.info("DockerHubService create_webhook get_webhooks_response=#{webhooks_response.inspect}")
-
-      return false if webhooks_response.status != 200
-
-      webhooks = webhooks_response.result['results']
-
-      webhook = webhooks.detect { |hook| hook['name'] == HOOK_NAME }
-
-      return true if !webhook.nil?
-
-      params = {
-        slug: image,
-        name: HOOK_NAME,
-        expect_final_callback: false,
-        webhooks: [{ name: HOOK_NAME, hook_url: HOOK_URL, registry: REGISTRY }],
-      }
-
-      response = client.create_webhook(params)
-
-      Rails.logger.info("DockerHubService create_webhook create_webhook_response=#{response.inspect} params=#{params.inspect}")
-
-      response.status == 201
-    end
-
-    def send_webhook_answer(callback_url)
-      params = { state: 'success', description: 'Successfully deployed to Uffizzi' }
-      public_docker_hub_client.send_webhook_answer(callback_url, params)
-    end
-
     def accounts(credential)
       client = user_client(credential)
       response = client.accounts

data/config/routes.rb

@@ -7,14 +7,6 @@ UffizziCore::Engine.routes.draw do
   namespace :api, defaults: { format: :json } do
     namespace :cli do
       namespace :v1 do
-        resource :webhooks, only: [] do
-          post :docker_hub
-          post :github
-          post :azure
-          post :amazon
-          post :google
-        end
-
         resources :projects, only: ['index', 'show', 'create', 'destroy'], param: :slug do
           scope module: :projects do
             resource :compose_file, only: ['show', 'create', 'destroy']

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.5.0'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-15 00:00:00.000000000 Z
+date: 2022-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -754,11 +754,9 @@ files:
 - app/jobs/uffizzi_core/activity_item/docker/update_digest_job.rb
 - app/jobs/uffizzi_core/application_job.rb
 - app/jobs/uffizzi_core/config_file/apply_job.rb
-- app/jobs/uffizzi_core/credential/docker_hub/create_webhook_job.rb
 - app/jobs/uffizzi_core/deployment/create_credential_job.rb
 - app/jobs/uffizzi_core/deployment/create_credentials_job.rb
 - app/jobs/uffizzi_core/deployment/create_job.rb
-- app/jobs/uffizzi_core/deployment/create_webhooks_job.rb
 - app/jobs/uffizzi_core/deployment/delete_credential_job.rb
 - app/jobs/uffizzi_core/deployment/delete_job.rb
 - app/jobs/uffizzi_core/deployment/deploy_containers_job.rb
@@ -879,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
@@ -966,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

data/app/jobs/uffizzi_core/credential/docker_hub/create_webhook_job.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-class UffizziCore::Credential::DockerHub::CreateWebhookJob < UffizziCore::ApplicationJob
-  sidekiq_options queue: :accounts, retry: 5
-
-  def perform(credential_id, image, deployment_id = nil)
-    if deployment_id.present?
-      Rails.logger.info("DEPLOYMENT_PROCESS deployment_id=#{deployment_id} DockerHub CreateWebhooksJob")
-    end
-
-    credential = UffizziCore::Credential.find(credential_id)
-
-    UffizziCore::DockerHubService.create_webhook(credential, image)
-  end
-end

data/app/jobs/uffizzi_core/deployment/create_webhooks_job.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-class UffizziCore::Deployment::CreateWebhooksJob < UffizziCore::ApplicationJob
-  sidekiq_options queue: :deployments, retry: 5
-
-  def perform(id)
-    Rails.logger.info("DEPLOYMENT_PROCESS deployment_id=#{id} CreateWebhooksJob")
-
-    deployment = UffizziCore::Deployment.find(id)
-
-    UffizziCore::DeploymentService.create_webhooks(deployment)
-  end
-end