uffizzi_core 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0995e3de000730f4d7d9efeeb62415e374f4d58569b31a60db5faffa99f58453'
-  data.tar.gz: 53ea793138e8229747e1462156a158e0c4114130c03c7a7eb7993d66e07f472f
+  metadata.gz: 34e197de1424923114ad82fd43fa818b4841058bd0681e3320c4ba4e2352c452
+  data.tar.gz: 4b94e04a11bcef28b4fc732fbf0c0d2f51a6512b609fbbc8cbe9b52d2123fd4f
 SHA512:
-  metadata.gz: cdba3364a0821713bb040dc31192fcbac362aea072ae0865d5353576b0428ee7aeada4fcdd15733dfdef340e0c49bd9055f07752a712f7c0063d3dd4cc396c88
-  data.tar.gz: 3fec15634e8fc1e9de9eea24b2b913832633cba55065390ee22141f80a22290d31d50c30a9f998ff2d0cd90d023d45a0f3ad7fc0dd111d84d7235111e63c4882
+  metadata.gz: 97b2382ee4af9787273b595d1d8840332c51dba8d861cc7752a773137ab1e2639129219ad361ef1f752e5cc88e3a3524b142c84fca22e4076f4da273c461e8ae
+  data.tar.gz: 195a8f935b0866004c1e6a0a7beb9b42f613042d36f66f2331f19bb86c5c8bb67df5f190d8a42ab5d97c42ddb9fb51685d9082e5370e8edc3fcf51cf872e9e11

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

@@ -68,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

@@ -52,7 +52,7 @@ 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?

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/lib/uffizzi_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UffizziCore
-  VERSION = '0.3.3'
+  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.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-19 00:00:00.000000000 Z
+date: 2022-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm