uffizzi_core 0.3.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40e3a8b7bbd915a1e861fbc7cff0b188741c49be50aa02d8ee05e790e47038a3
-  data.tar.gz: d02d1b3eba6bfbc471266dd28f23200a43cc88c71e7139c1d5bf43c915292f31
+  metadata.gz: '0995e3de000730f4d7d9efeeb62415e374f4d58569b31a60db5faffa99f58453'
+  data.tar.gz: 53ea793138e8229747e1462156a158e0c4114130c03c7a7eb7993d66e07f472f
 SHA512:
-  metadata.gz: 4bff4a31ff842379bd0907336285b65f31052b58d55ecd104632d483304e07722b75d2591eba942c6583e99ea4f3d23c08765a42b1b102e478f031b5001c4ff4
-  data.tar.gz: 7d0e59f416be2ed26806363b85efa090eb3b02a3ba34546cd5103467d0f80566ddcb7f34270250c8112e65e2c2e35f2ce8dd6fab22f7fb958207e89f72c749f9
+  metadata.gz: cdba3364a0821713bb040dc31192fcbac362aea072ae0865d5353576b0428ee7aeada4fcdd15733dfdef340e0c49bd9055f07752a712f7c0063d3dd4cc396c88
+  data.tar.gz: 3fec15634e8fc1e9de9eea24b2b913832633cba55065390ee22141f80a22290d31d50c30a9f998ff2d0cd90d023d45a0f3ad7fc0dd111d84d7235111e63c4882

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

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

@@ -27,13 +27,11 @@ class UffizziCore::Controller::DeployContainers::ContainerSerializer < UffizziCo
     credential = UffizziCore::RepoService.credential(repo)
 
     case repo.type
-    when UffizziCore::Repo::Google.name, UffizziCore::Repo::Amazon.name, UffizziCore::Repo::Azure.name
+    when UffizziCore::Repo::Google.name, UffizziCore::Repo::Amazon.name, UffizziCore::Repo::Azure.name,
+        UffizziCore::Repo::GithubContainerRegistry.name
       registry_host = URI.parse(credential.registry_url).host
 
       "#{registry_host}/#{object.image}"
-    when UffizziCore::Repo::GithubContainerRegistry.name
-      registry_host = URI.parse(credential.registry_url).host
-      "#{registry_host}/#{repo.namespace}/#{object.image}"
     else
       object.image
     end

data/app/services/uffizzi_core/compose_file/builders/container_builder_service.rb

@@ -105,7 +105,9 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
   end
 
   def image_name(container_data, image_data)
-    if image_data[:registry_url].present? && !UffizziCore::ComposeFile::ContainerService.google?(container_data)
+    if image_data[:registry_url].present? &&
+        !UffizziCore::ComposeFile::ContainerService.google?(container_data) &&
+        !UffizziCore::ComposeFile::ContainerService.github_container_registry?(container_data)
       image_data[:name]
     else
       "#{image_data[:namespace]}/#{image_data[:name]}"

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,
@@ -53,6 +55,10 @@ class UffizziCore::ControllerService
         deployment_url: UffizziCore::DeploymentService.build_preview_url(deployment),
       }
 
+      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/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.0'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.3
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-07 00:00:00.000000000 Z
+date: 2022-07-19 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