uffizzi_core 0.3.1 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e2b2cafe23575e7c21cd2108009cf69b9f96684929648f20aabdfe15f4f174b
-  data.tar.gz: 48501037f9780aaede4255937497fe7a4e62ff74eaeebf5d35f38324c74bccd3
+  metadata.gz: 34e197de1424923114ad82fd43fa818b4841058bd0681e3320c4ba4e2352c452
+  data.tar.gz: 4b94e04a11bcef28b4fc732fbf0c0d2f51a6512b609fbbc8cbe9b52d2123fd4f
 SHA512:
-  metadata.gz: 53784fee926eda545a859338847377dbbffdbfe45b81ab1beb8a461dddb9d9d87393f6a29d936f0b96dc7b33e45db1019b3ca14f4d89cc06b31054d5bace04c3
-  data.tar.gz: 1c29d8d4c7077f640dfe253faa7ef2c3417db14745ecff19d749fd4daa3743e6c626c670eb4a40e00d78a932c206e766d7bdd45eed04e799d51b917d8289e5fa
+  metadata.gz: 97b2382ee4af9787273b595d1d8840332c51dba8d861cc7752a773137ab1e2639129219ad361ef1f752e5cc88e3a3524b142c84fca22e4076f4da273c461e8ae
+  data.tar.gz: 195a8f935b0866004c1e6a0a7beb9b42f613042d36f66f2331f19bb86c5c8bb67df5f190d8a42ab5d97c42ddb9fb51685d9082e5370e8edc3fcf51cf872e9e11

data/app/controllers/concerns/uffizzi_core/dependency_injection_concern.rb

@@ -13,6 +13,12 @@ module UffizziCore::DependencyInjectionConcern
     module_class(:github)
   end
 
+  def password_protection_module
+    return unless module_exists?(:password_protection)
+
+    module_class(:password_protection)
+  end
+
   private
 
   def module_exists?(module_name)

data/app/jobs/uffizzi_core/config_file/apply_job.rb

@@ -5,7 +5,7 @@ class UffizziCore::ConfigFile::ApplyJob < UffizziCore::ApplicationJob
 
   sidekiq_retry_in do |count, exception|
     case exception
-    when UffizziCore::ControllerService::DeploymentNotFoundError
+    when UffizziCore::DeploymentNotFoundError
       Rails.logger.info("DEPLOYMENT_PROCESS ApplyJob retry deployment_id=#{exception.deployment_id} count=#{count}")
       Settings.controller.resource_create_retry_time
     end
@@ -22,7 +22,7 @@ class UffizziCore::ConfigFile::ApplyJob < UffizziCore::ApplicationJob
     end
 
     unless UffizziCore::ControllerService.deployment_exists?(deployment)
-      raise UffizziCore::ControllerService::DeploymentNotFoundError,
+      raise UffizziCore::DeploymentNotFoundError,
             deployment_id
     end
 

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

@@ -57,6 +57,7 @@ module UffizziCore::Concerns::Models::Deployment
 
     def after_disable
       clean
+      update!(disabled_at: Time.now)
     end
 
     def after_fail
@@ -67,5 +68,9 @@ module UffizziCore::Concerns::Models::Deployment
       active_containers.each(&:disable!)
       UffizziCore::Deployment::DeleteJob.perform_async(id)
     end
+
+    def preview_url
+      "#{subdomain}.#{Settings.app.managed_dns_zone}"
+    end
   end
 end

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

@@ -6,8 +6,4 @@ class UffizziCore::Api::Cli::V1::ProjectSerializer::DeploymentSerializer < Uffiz
   attributes :id,
              :preview_url,
              :state
-
-  def preview_url
-    UffizziCore::DeploymentService.build_preview_url(object)
-  end
 end

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

@@ -30,10 +30,6 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentSerializer < UffizziCore::B
     object.containers.active
   end
 
-  def preview_url
-    UffizziCore::DeploymentService.build_preview_url(object)
-  end
-
   def tag
     object.ingress_container&.tag
   end

data/app/services/uffizzi_core/controller_service.rb

@@ -2,6 +2,8 @@
 
 class UffizziCore::ControllerService
   class << self
+    include UffizziCore::DependencyInjectionConcern
+
     def apply_config_file(deployment, config_file)
       body = {
         config_file: UffizziCore::Controller::ApplyConfigFile::ConfigFileSerializer.new(config_file).as_json,
@@ -50,9 +52,13 @@ class UffizziCore::ControllerService
       body = {
         containers: containers,
         credentials: credentials,
-        deployment_url: UffizziCore::DeploymentService.build_preview_url(deployment),
+        deployment_url: deployment.preview_url,
       }
 
+      if password_protection_module.present?
+        body = password_protection_module.add_password_configuration(body, deployment.project_id)
+      end
+
       controller_client.deploy_containers(deployment_id: deployment.id, body: body)
     end
 

data/app/services/uffizzi_core/deployment_service.rb

@@ -62,7 +62,7 @@ class UffizziCore::DeploymentService
         Rails.logger.info("DEPLOYMENT_PROCESS deployment_id=#{deployment.id} start deploying into controller")
 
         containers = deployment.active_containers
-        containers = add_default_deployment_variables!(containers)
+        containers = add_default_deployment_variables!(containers, deployment)
 
         UffizziCore::ControllerService.deploy_containers(deployment, containers)
       else
@@ -284,13 +284,15 @@ class UffizziCore::DeploymentService
       Digest::SHA256.hexdigest("#{container.id}:#{container.image}")[0, 10]
     end
 
-    def add_default_deployment_variables!(containers)
+    def add_default_deployment_variables!(containers, deployment)
       containers.each do |container|
         envs = []
         if container.port.present? && !UffizziCore::ContainerService.defines_env?(container, 'PORT')
           envs.push('name' => 'PORT', 'value' => container.target_port.to_s)
         end
 
+        envs.push('name' => 'UFFIZZI_URL', 'value' => "https://#{deployment.preview_url}")
+
         container.variables = [] if container.variables.nil?
 
         container.variables.push(*envs)

data/app/services/uffizzi_core/docker_hub_service.rb

@@ -49,13 +49,13 @@ class UffizziCore::DockerHubService
     end
 
     def user_client(credential)
-      if @client.nil?
-        @client = UffizziCore::DockerHubClient.new(credential)
+      return @client if @client&.credential&.username == credential.username
 
-        unless @client.authentificated?
-          Rails.logger.warn("broken credentials, DockerHubService credential_id=#{credential.id}")
-          credential.unauthorize! unless credential.unauthorized?
-        end
+      @client = UffizziCore::DockerHubClient.new(credential)
+
+      unless @client.authentificated?
+        Rails.logger.warn("broken credentials, DockerHubService credential_id=#{credential.id}")
+        credential.unauthorize! unless credential.unauthorized?
       end
 
       @client

data/db/migrate/20220704135629_add_disabled_at_to_deployments.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddDisabledAtToDeployments < ActiveRecord::Migration[6.1]
+  def up
+    change_table :uffizzi_core_deployments do |t|
+      t.datetime :disabled_at
+    end
+    UffizziCore::Deployment.disabled.update_all('disabled_at = updated_at')
+  end
+
+  def down
+    change_table :uffizzi_core_deployments do |t|
+      t.remove :disabled_at
+    end
+  end
+end

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.4
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -957,6 +957,7 @@ files:
 - db/migrate/20220419074956_add_health_check_to_containers.rb
 - 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/seeds.rb
 - lib/tasks/uffizzi_core_tasks.rake
 - lib/uffizzi_core.rb