uffizzi_core 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a39e41ef8a1ef0300ac30d802f223c0c99c8f771591569401ba7f8835bcfb095
-  data.tar.gz: f3cb1e26f85f2751d7076234719d12a325eacab01ed4db85a6f7da8872442eb2
+  metadata.gz: 5a1fdc0ffa4aadeeeac07ab3776a7f2dcc63f19968accc8d1820bb6b842a0877
+  data.tar.gz: 992b23980cc8e63db90b835f967bf2c1771d51019a17f805783fb6b2c4550b4f
 SHA512:
-  metadata.gz: 62647e990dd6c5c449993a851d69b2f72e4d8d391ccb5d24bdffd62a16e76f1784f1d2e0e75838b74a320166d12ac560011cce8d7fe28fcf3414e7910853b854
-  data.tar.gz: cd2d7b36a7d231e6d090e29abced6c2617f0b950de0f9491e93d05e268c147102af90e6190e7cced76fe1678ec5f4dfbdd9242698c1eddb8bfb7ee07af8e1028
+  metadata.gz: 9dac4d2ec9bbae5bb2f322ed3311cc48b3471a3f05d13fa6e650e1c16e4f1f722318df5c2d20c31e77435bfa5aea91a4b7e0405276f2c4ea1800687e88e891f7
+  data.tar.gz: 3579e513b890716d21ae35c21bdb500eab2ee1677d49e6cffeffd75f5ef4c5aeddfbbf4e3563a544bf9d02a210a00424ea38980346d9fc7f6e1992dd96832ea5

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/account/credential/create_form.rb

@@ -17,7 +17,7 @@ class UffizziCore::Api::Cli::V1::Account::Credential::CreateForm < UffizziCore::
   end
 
   def check_credential_correctness
-    errors.add(:username, :incorrect, type: type.text) unless UffizziCore::CredentialService.correct_credentials?(self)
+    errors.add(:username, :incorrect) unless UffizziCore::CredentialService.correct_credentials?(self)
   end
 
   def credential_exists?

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/lib/uffizzi_core/concerns/models/credential.rb

@@ -11,18 +11,6 @@ module UffizziCore::Concerns::Models::Credential
 
     self.table_name = UffizziCore.table_names[:credentials]
 
-    const_set(:CREDENTIAL_TYPES, [
-                UffizziCore::Credential::Amazon.name,
-                UffizziCore::Credential::Azure.name,
-                UffizziCore::Credential::DockerHub.name,
-                UffizziCore::Credential::DockerRegistry.name,
-                UffizziCore::Credential::GithubContainerRegistry.name,
-                UffizziCore::Credential::Google.name,
-              ])
-
-    enumerize :type,
-              in: self::CREDENTIAL_TYPES, i18n_scope: ['enumerize.credential.type']
-
     belongs_to :account
 
     before_destroy :remove_token

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/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/config/locales/en.activerecord.yml

@@ -13,7 +13,7 @@ en:
             password:
               password_blank: Password/Access Token can't be blank
             username:
-              incorrect: "We were unable to log you into %{type}. Please verify that your username and password are correct."
+              incorrect: We were unable to log you in to docker registry. Please verify that your username and password are correct.
             type:
               exist: Credential of that type already exist.
         uffizzi_core/deployment:

data/config/locales/en.yml

@@ -76,12 +76,3 @@ en:
   session:
     unsupported_login_type: This type of login is not supported
     unauthorized: Unauthorized
-  enumerize:
-    credential:
-      type:
-        "UffizziCore::Credential::GithubContainerRegistry": "Github Container Registry"
-        "UffizziCore::Credential::DockerHub": "DockerHub"
-        "UffizziCore::Credential::DockerRegistry": "Docker Registry"
-        "UffizziCore::Credential::Azure": "Azure"
-        "UffizziCore::Credential::Google": "Google"
-        "UffizziCore::Credential::Amazon": "Amazon"

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.0'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Josh Thurman
@@ -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