uffizzi_core 0.1.6 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73d11e0fbdafef5829631ae769dab8ecfba065e8faf8fd16c008e6509371ae37
-  data.tar.gz: 5822903bdc95b70aef3ea7fe402332ed6f3815c9661c042597f7adde8a69fe45
+  metadata.gz: 9532e97850641367e43300e96a1bfa963fc7ff60eb338b8422108b7e05f86340
+  data.tar.gz: 9cb98221b5762c2f16a6b6b1115eb0cd0ac63d9dd7fa9787591b0c28ed6546b5
 SHA512:
-  metadata.gz: 7617ee397e75a89ea1ddf79a445151fa3b0652008590d3893216833ba55cc1da4ffc23bb3cee448507f9a591c1ff9572fb03713ab1c3bdce652cfdc3b5de28b8
-  data.tar.gz: 465daea8766e80386c3229b20ab0a44152c860013877d14bdbcdc60b020745a834b5f67c41c3792d6fd31a5f7e84a92960ccbe0b6c905586867f65d2eabacdc5
+  metadata.gz: 95975b5880598ab0c1763b7fdc667495bccaa845342f35a337210947ba8d6f2e11fee6117c0b9c96bdfee5541c9410374285d8e2c21501f2d9faf76cc06cf431
+  data.tar.gz: 312e608b26126ebbc52ce964bedc2f961fd87a9e5d528935f9f6a65c621cac4c8cddb4ed6a914616e28432428660bb602d5cf241ac236cd10801dca71232ac03

data/app/controllers/uffizzi_core/api/cli/v1/projects/deployments/containers/application_controller.rb

@@ -3,6 +3,6 @@
 class UffizziCore::Api::Cli::V1::Projects::Deployments::Containers::ApplicationController <
   UffizziCore::Api::Cli::V1::Projects::Deployments::ApplicationController
   def resource_container
-    @resource_container ||= resource_deployment.active_containers.find_by!(name: params[:container_name])
+    @resource_container ||= resource_deployment.active_containers.find_by!(service_name: params[:container_name])
   end
 end

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

@@ -6,7 +6,7 @@ class UffizziCore::Api::Cli::V1::Deployment::CreateForm < UffizziCore::Deploymen
   permit :creation_source,
          containers_attributes: [
            :image,
-           :name,
+           :service_name,
            :tag,
            :port,
            :public,

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

@@ -16,7 +16,7 @@ class UffizziCore::Api::Cli::V1::Template::CreateForm < UffizziCore::Template
              :command,
              :receive_incoming_requests,
              :continuously_deploy,
-             :name,
+             :service_name,
              { variables: [:name, :value],
                secret_variables: [:name, :value],
                repo_attributes: [

data/app/serializers/uffizzi_core/controller/create_credential/credential_serializer.rb

@@ -12,8 +12,6 @@ class UffizziCore::Controller::CreateCredential::CredentialSerializer < UffizziC
   def password
     if object.amazon?
       UffizziCore::Amazon::CredentialService.access_token(object)
-    elsif object.github_container_registry?
-      UffizziCore::GithubContainerRegistry::CredentialService.access_token(object, instance_options[:image])
     else
       object.password
     end

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

@@ -20,16 +20,17 @@ class UffizziCore::Controller::DeployContainers::ContainerSerializer < UffizziCo
   has_many :container_config_files
 
   def image
-    credential = UffizziCore::RepoService.credential(object.repo)
+    repo = object.repo
+    credential = UffizziCore::RepoService.credential(repo)
 
-    case object.repo.type
+    case repo.type
     when UffizziCore::Repo::Google.name, UffizziCore::Repo::Amazon.name, UffizziCore::Repo::Azure.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}/#{credential.username}/#{object.image}"
+      "#{registry_host}/#{repo.namespace}/#{object.image}"
     else
       object.image
     end
@@ -37,7 +38,7 @@ class UffizziCore::Controller::DeployContainers::ContainerSerializer < UffizziCo
 
   def tag
     case object.repo.type
-    when UffizziCore::Repo::Github.name, UffizziCore::Repo::GithubContainerRegistry.name
+    when UffizziCore::Repo::Github.name
       UffizziCore::RepoService.tag(object.repo)
     else
       object.tag

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

@@ -45,7 +45,7 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
       continuously_deploy: continuously_deploy(deploy_data),
       receive_incoming_requests: is_ingress,
       container_config_files_attributes: config_files(configs_data, configs_dependencies),
-      name: container_name,
+      service_name: container_name,
     }
   end
 

data/app/services/uffizzi_core/compose_file/ingress_options_service.rb

@@ -39,8 +39,10 @@ class UffizziCore::ComposeFile::IngressOptionsService
 
       raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_integer', option: :port) unless port.is_a?(Integer)
 
-      if port < Settings.compose.port_min_value || port > Settings.compose.port_max_value
-        raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_port')
+      port_min = Settings.compose.port_min_value
+      port_max = Settings.compose.port_max_value
+      if port < port_min || port > port_max
+        raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.port_out_of_range', port_min: port_min, port_max: port_max)
       end
 
       port

data/config/locales/en.yml

@@ -25,7 +25,7 @@ en:
     invalid_ingress_service: Invalid ingress service '%{value}'
     no_variable_name: Invalid environment variable 'name=%{name}' 'value=%{value}'
     invalid_config: Invalid config value 'source=%{source}' 'target=%{target}'
-    invalid_port: Invalid port specification '%{value}'
+    port_out_of_range: Port should be specified between %{port_min} - %{port_max}
     invalid_memory_postfix: The specified value for memory '%{value}' should specify the units. The postfix should be one of the `b` `k` `m` `g` characters
     invalid_memory_type: Memory '%{value}' contains an invalid type, it should be a string
     invalid_memory_value: Invalid memory value '%{value}'

data/db/migrate/20220525113412_rename_name_to_uffizzi_containers.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RenameNameToUffizziContainers < ActiveRecord::Migration[6.1]
+  def change
+    rename_column(:uffizzi_core_containers, :name, :service_name)
+  end
+end

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.9
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-20 00:00:00.000000000 Z
+date: 2022-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -451,6 +451,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.7
+- !ruby/object:Gem::Dependency
+  name: bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -906,6 +920,7 @@ files:
 - db/migrate/20220329123323_rename_project_secrets_to_secrets.rb
 - db/migrate/20220329124542_add_resource_to_secrets.rb
 - db/migrate/20220329143241_remove_project_ref_from_secrets.rb
+- db/migrate/20220525113412_rename_name_to_uffizzi_containers.rb
 - db/seeds.rb
 - lib/tasks/uffizzi_core_tasks.rake
 - lib/uffizzi_core.rb