Merge branch 'develop'

UffizziCloud · Nov 28, 2023 · 7c3bba9 · 7c3bba9
2 parents daba3de + 2727437
commit 7c3bba9
Show file tree

Hide file tree

Showing 7 changed files with 86 additions and 90 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: core
   specs:
-    uffizzi_core (2.3.0)
+    uffizzi_core (2.3.1)
       aasm
       actionpack (~> 6.1.0)
       active_model_serializers
@@ -110,23 +110,23 @@ GEM
       activerecord (>= 5.2.6)
     ast (2.4.2)
     awesome_print (1.9.2)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.843.0)
-    aws-sdk-core (3.185.1)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.859.0)
+    aws-sdk-core (3.188.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-ecr (1.65.0)
-      aws-sdk-core (~> 3, >= 3.184.0)
+    aws-sdk-ecr (1.67.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-eventbridge (1.51.0)
-      aws-sdk-core (~> 3, >= 3.184.0)
+    aws-sdk-eventbridge (1.53.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-iam (1.89.0)
-      aws-sdk-core (~> 3, >= 3.184.0)
+    aws-sdk-iam (1.91.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.6.1)
+    aws-sigv4 (1.7.0)
       aws-eventstream (~> 1, >= 1.0.2)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -260,15 +260,15 @@ GEM
     nokogiri (1.13.3)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    octokit (7.2.0)
+    octokit (8.0.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     parallel (1.21.0)
     parser (3.1.1.0)
       ast (~> 2.4.1)
     parslet (2.0.0)
     pg (1.3.4)
-    public_suffix (5.0.3)
+    public_suffix (5.0.4)
     puma (4.3.11)
       nio4r (~> 2.0)
     pundit (2.3.1)
@@ -318,9 +318,9 @@ GEM
       railties (>= 5.2)
     rexml (3.2.5)
     rolify (6.0.1)
-    rswag-api (2.11.0)
+    rswag-api (2.12.0)
       railties (>= 3.1, < 7.2)
-    rswag-ui (2.11.0)
+    rswag-ui (2.12.0)
       actionpack (>= 3.1, < 7.2)
       railties (>= 3.1, < 7.2)
     rubocop (1.26.0)
@@ -347,7 +347,7 @@ GEM
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
-    sidekiq-unique-jobs (7.1.30)
+    sidekiq-unique-jobs (7.1.31)
       brpoplpush-redis_script (> 0.1.1, <= 2.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       redis (< 5.0)

diff --git a/README.md b/README.md
diff --git a/core/Gemfile.lock b/core/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uffizzi_core (2.3.0)
+    uffizzi_core (2.3.1)
       aasm
       actionpack (~> 6.1.0)
       active_model_serializers
@@ -109,23 +109,23 @@ GEM
     ancestry (4.3.3)
       activerecord (>= 5.2.6)
     awesome_print (1.9.2)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.843.0)
-    aws-sdk-core (3.185.1)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.859.0)
+    aws-sdk-core (3.188.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-ecr (1.65.0)
-      aws-sdk-core (~> 3, >= 3.184.0)
+    aws-sdk-ecr (1.67.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-eventbridge (1.51.0)
-      aws-sdk-core (~> 3, >= 3.184.0)
+    aws-sdk-eventbridge (1.53.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-iam (1.89.0)
-      aws-sdk-core (~> 3, >= 3.184.0)
+    aws-sdk-iam (1.91.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.6.1)
+    aws-sigv4 (1.7.0)
       aws-eventstream (~> 1, >= 1.0.2)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -151,7 +151,7 @@ GEM
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    date (3.3.3)
+    date (3.3.4)
     deep_merge (1.2.2)
     deepsort (0.4.5)
     descendants_tracker (0.0.4)
@@ -252,7 +252,7 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    loofah (2.21.4)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -271,21 +271,21 @@ GEM
       power_assert (>= 1.1)
     mocha (1.13.0)
     multipart-post (2.3.0)
-    net-imap (0.4.2)
+    net-imap (0.4.6)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.1)
+    net-protocol (0.2.2)
       timeout
     net-smtp (0.4.0)
       net-protocol
     nio4r (2.5.8)
-    nokogiri (1.15.4-aarch64-linux)
+    nokogiri (1.15.5-aarch64-linux)
       racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-linux)
+    nokogiri (1.15.5-x86_64-linux)
       racc (~> 1.4)
-    octokit (7.2.0)
+    octokit (8.0.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     parslet (2.0.0)
@@ -305,7 +305,7 @@ GEM
       nio4r (~> 2.0)
     pundit (2.3.1)
       activesupport (>= 3.0.0)
-    racc (1.7.1)
+    racc (1.7.3)
     rack (2.2.3)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
@@ -350,9 +350,9 @@ GEM
       railties (>= 5.2)
     rexml (3.2.5)
     rolify (6.0.1)
-    rswag-api (2.11.0)
+    rswag-api (2.12.0)
       railties (>= 3.1, < 7.2)
-    rswag-ui (2.11.0)
+    rswag-ui (2.12.0)
       actionpack (>= 3.1, < 7.2)
       railties (>= 3.1, < 7.2)
     ruby2_keywords (0.0.5)
@@ -363,7 +363,7 @@ GEM
       connection_pool (>= 2.2.5, < 3)
       rack (~> 2.0)
       redis (>= 4.5.0, < 5)
-    sidekiq-unique-jobs (7.1.30)
+    sidekiq-unique-jobs (7.1.31)
       brpoplpush-redis_script (> 0.1.1, <= 2.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       redis (< 5.0)
@@ -381,7 +381,7 @@ GEM
       yard
     thor (1.3.0)
     thread_safe (0.3.6)
-    timeout (0.4.0)
+    timeout (0.4.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode (0.4.4.4)

diff --git a/core/app/lib/uffizzi_core/concerns/models/deployment.rb b/core/app/lib/uffizzi_core/concerns/models/deployment.rb
@@ -9,6 +9,7 @@ module UffizziCore::Concerns::Models::Deployment
     include UffizziCore::StateMachineConcern
     include UffizziCore::DeploymentRepo
     extend Enumerize
+    include UffizziCore::DependencyInjectionConcern
 
     self.table_name = UffizziCore.table_names[:deployments]
 
@@ -71,7 +72,8 @@ def clean
     end
 
     def preview_url
-      "#{subdomain}.#{Settings.app.managed_dns_zone}"
+      managed_dns_zone = controller_settings_service.deployment(self).managed_dns_zone
+      "#{subdomain}.#{managed_dns_zone}"
     end
 
     def namespace

diff --git a/core/app/services/uffizzi_core/controller_service.rb b/core/app/services/uffizzi_core/controller_service.rb
@@ -145,7 +145,7 @@ def request_events(deployment)
     def controller_client(deployable)
       settings = case deployable
                  when UffizziCore::Deployment
-                   Settings.controller
+                   controller_settings_service.deployment(deployable)
                  when UffizziCore::Cluster
                    controller_settings_service.vcluster(deployable)
                  else

diff --git a/core/app/services/uffizzi_core/controller_settings_service.rb b/core/app/services/uffizzi_core/controller_settings_service.rb
@@ -5,5 +5,11 @@ class << self
     def vcluster(_cluster)
       Settings.vcluster_controller
     end
+
+    def deployment(_cluster)
+      Settings.controller.deep_dup.tap do |s|
+        s.managed_dns_zone = Settings.app.managed_dns_zone
+      end
+    end
   end
 end
diff --git a/core/lib/uffizzi_core/version.rb b/core/lib/uffizzi_core/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UffizziCore
-  VERSION = '2.3.0'
+  VERSION = '2.3.1'
 end