uffizzi_core 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8dde4ab08b392e84558c16e4967250af65c53920c983b1736df5af3091bbdac
-  data.tar.gz: c7267a556db1b7132881ec0d9424eef05ce8dbbdf3b255456aba42bf0c38836c
+  metadata.gz: 62fa420959689bef475db8e095621079cc7e96ae0b73decf0282a1d9bec5744e
+  data.tar.gz: 76c69a8e8bfa2c6265dd3bcc7ad065a34e6ac6b3cfe8cc22ac3afcba6d477d1e
 SHA512:
-  metadata.gz: 27c1495b43f347282da5ac664db5485d4d4f5a751660ae502baa76b23990656546dcfb16f3221b48bf1d6f7f9fa8919d0b8e8a665e041cf05c446d95305ad82a
-  data.tar.gz: 2a0b7ae8d5e85aa69bc1c93f8e9a9bf6658b19a33bec346ecf9296a8c7a8e8defa10b93be8ff381c296578a0b90d9be8c31b1b5d13fb7bc20b7f7a92c96ce53f
+  metadata.gz: 005451ab5a4349aec3311fddb5257d1513f7d7b1f381375a75c5739c0635aea5d463574d7d6fb20424af76cc6c49e1d9146848fec7235d1a7d3b5c8ab2de5635
+  data.tar.gz: f3ac1a20fdb378b4926438abd9b3814cdedecea4de75fb48bc88f8a7d5b3d076f24becfce10df9edc794f55f6457f76c652a7395606f6b31dd9b56af0b98fc9d

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

@@ -27,6 +27,10 @@ module UffizziCore::DependencyInjectionConcern
     module_class(:password_protection)
   end
 
+  def find_ingress_parser_module
+    module_class(:ingress_parser)
+  end
+
   private
 
   def module_exists?(module_name)

data/app/forms/uffizzi_core/api/cli/v1/deployment/create_form.rb

@@ -18,6 +18,7 @@ class UffizziCore::Api::Cli::V1::Deployment::CreateForm < UffizziCore::Deploymen
            :receive_incoming_requests,
            :continuously_deploy,
            { variables: [:name, :value],
+             additional_subdomains: [],
              secret_variables: [:name, :value],
              volumes: [:source, :target, :type, :read_only],
              healthcheck: [:test, :interval, :timeout, :retries, :start_period, :disable, { test: [] }],

data/app/forms/uffizzi_core/api/cli/v1/deployment/update_form.rb

@@ -17,6 +17,7 @@ class UffizziCore::Api::Cli::V1::Deployment::UpdateForm < UffizziCore::Deploymen
            :receive_incoming_requests,
            :continuously_deploy,
            { variables: [:name, :value],
+             additional_subdomains: [],
              secret_variables: [:name, :value],
              volumes: [:source, :target, :type, :read_only],
              healthcheck: [:test, :interval, :timeout, :retries, :start_period, :disable, { test: [] }],

data/app/forms/uffizzi_core/api/cli/v1/template/create_form.rb

@@ -19,6 +19,7 @@ class UffizziCore::Api::Cli::V1::Template::CreateForm < UffizziCore::Template
              :service_name,
              :name,
              { variables: [:name, :value],
+               additional_subdomains: [],
                secret_variables: [:name, :value],
                volumes: [:source, :target, :type, :read_only],
                healthcheck: [:test, :interval, :timeout, :retries, :start_period, :disable, { test: [] }],

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

@@ -18,7 +18,8 @@ class UffizziCore::Controller::DeployContainers::ContainerSerializer < UffizziCo
              :receive_incoming_requests,
              :healthcheck,
              :volumes,
-             :service_name
+             :service_name,
+             :additional_subdomains
 
   has_many :container_config_files
 

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

@@ -27,6 +27,7 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
                                                                                                                   container_name)
     is_ingress = ingress_container?(container_name, ingress_data)
     repo_attributes = repo_attributes(container_data, continuous_preview_global_data)
+    additional_subdomains = is_ingress ? ingress_data[:additional_subdomains] : []
 
     {
       tag: tag(image_data, repo_attributes),
@@ -47,6 +48,7 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
       name: container_name,
       healthcheck: healthcheck_data,
       volumes: volumes_data,
+      additional_subdomains: additional_subdomains,
     }
   end
   # rubocop:enable Metrics/PerceivedComplexity

data/app/services/uffizzi_core/compose_file/parsers/ingress_parser_service.rb

@@ -7,11 +7,12 @@ class UffizziCore::ComposeFile::Parsers::IngressParserService
 
       container_name = container_name(ingress_data, services_data)
       port = port(ingress_data)
+      additional_attributes = build_additional_attributes(ingress_data, services_data)
 
       {
         container_name: container_name,
         port: port,
-      }
+      }.merge(additional_attributes)
     end
 
     private
@@ -47,5 +48,9 @@ class UffizziCore::ComposeFile::Parsers::IngressParserService
 
       port
     end
+
+    def build_additional_attributes(*)
+      {}
+    end
   end
 end

data/app/services/uffizzi_core/compose_file_service.rb

@@ -2,6 +2,8 @@
 
 class UffizziCore::ComposeFileService
   class << self
+    include UffizziCore::DependencyInjectionConcern
+
     def create(params, kind)
       compose_file_form = create_compose_form(params, kind)
 
@@ -31,7 +33,7 @@ class UffizziCore::ComposeFileService
       continuous_preview_data = UffizziCore::ComposeFile::Parsers::ContinuousPreviewParserService.parse(continuous_preview_option)
 
       ingress_option = UffizziCore::ComposeFile::ConfigOptionService.ingress_option(compose_data)
-      ingress_data = UffizziCore::ComposeFile::Parsers::IngressParserService.parse(ingress_option, compose_data['services'])
+      ingress_data = parse_ingress(ingress_option, compose_data)
 
       {
         containers: containers_data,
@@ -40,6 +42,17 @@ class UffizziCore::ComposeFileService
       }
     end
 
+    def parse_ingress(ingress_option, compose_data)
+      ingress_parser_module = find_ingress_parser_module
+
+      unless ingress_parser_module
+        return UffizziCore::ComposeFile::Parsers::IngressParserService.parse(ingress_option,
+                                                                             compose_data['services'])
+      end
+
+      ingress_parser_module.parse(ingress_option, compose_data['services'])
+    end
+
     def build_template_attributes(compose_data, source, credentials, project, compose_dependencies = [], compose_repositories = [])
       builder = UffizziCore::ComposeFile::Builders::TemplateBuilderService.new(credentials, project, compose_repositories)
 

data/app/services/uffizzi_core/deployment_service.rb

@@ -99,7 +99,7 @@ class UffizziCore::DeploymentService
 
     def build_pull_request_subdomain(deployment)
       github_payload = deployment.metadata.dig('labels', 'github')
-      repo_name = github_payload['repository'].split('/').last
+      repo_name = github_payload['repository'].split('/').last.downcase
       pull_request_number = github_payload['pull_request']['number']
       subdomain = "pr-#{pull_request_number}-#{name(deployment)}-#{repo_name}-#{deployment.project.slug}"
       format_subdomain(subdomain)

data/app/services/uffizzi_core/manage_activity_items_service.rb

@@ -142,6 +142,6 @@ class UffizziCore::ManageActivityItemsService
   end
 
   def deployment_network_connectivity
-    namespace_data&.metadata&.annotations&.network_connectivity || '{}'
+    namespace_data&.metadata&.annotations&.network_connectivity.presence || '{}'
   end
 end

data/db/migrate/20220927113647_add_additional_subdomains_to_containers.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddAdditionalSubdomainsToContainers < ActiveRecord::Migration[6.1]
+  def change
+    add_column(:uffizzi_core_containers, :additional_subdomains, :string, array: true, default: [])
+  end
+end

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-06 00:00:00.000000000 Z
+date: 2022-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -521,6 +521,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: deepsort
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.5
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
@@ -987,6 +1001,7 @@ files:
 - 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/migrate/20220927113647_add_additional_subdomains_to_containers.rb
 - db/seeds.rb
 - lib/tasks/uffizzi_core_tasks.rake
 - lib/uffizzi_core.rb