uffizzi_core 0.1.8 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c41a6d9264646c853ed0636d7855602ee530a1d8feaa412e47b89c0e3a90a4b
-  data.tar.gz: aa67d7c9ba86f5fd0e8b07b85106ad877e14585e999193ba1c308455c8a76aa3
+  metadata.gz: 48e413ec49645c1e18d15251bcfa9ceaf94309be078fd46befbfd97894d9318e
+  data.tar.gz: 213cd12f3c9216b851ccd16c44562da68c954a03f126fd35ec683119ee7b8755
 SHA512:
-  metadata.gz: d398069220fd51c2ee9e5a797491b0a75058b1698330a7e9fb097f19b45795ad860a9008ea540f9c96535df6b005415ea766d2032aa9d749dda33c47a4904e7f
-  data.tar.gz: 4b6566f15e749351219f155cbebbf3e78caf3b43a52ca2f01e44bfb81391115d27f232484890ea4852d881fdc9c94f4d7cfb2ed27e4366ad18651c232f018d5e
+  metadata.gz: 339656968a5609d9674536a6bd36518f2efb33afe30bf77ef2c56d158fe3b1b7a9f27da8dd76dcc8c1f35ad5624121a2914482d296b0b2e5afe9025735dda974
+  data.tar.gz: b5369f15696f2e011b1be386c1ee1b4660a0e5733e09030d0af8095612337cf544e2be0adfce7b3410f0338bd64e7e0d479a0f0f779360d9c99eb6990261670f

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/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/app/services/uffizzi_core/manage_activity_items_service.rb

@@ -116,18 +116,26 @@ class UffizziCore::ManageActivityItemsService
     state = pod_container[:state][pod_container_status]
     reason = state&.reason
 
+    Rails.logger.info("manage_activity_items get_status dep_id=#{container.deployment.id} pod_container_status: #{pod_container_status}")
+    Rails.logger.info("manage_activity_items get_status dep_id=#{container.deployment.id} state: #{state}")
+    ap pod_container[:state]
+
     case pod_container_status.to_sym
     when :running
+      Rails.logger.info("manage_activity_items get_status dep_id=#{container.deployment.id} running")
       UffizziCore::Event.state.deployed
     when :terminated
+      Rails.logger.info("manage_activity_items get_status dep_id=#{container.deployment.id} terminated")
       UffizziCore::Event.state.failed
     when :waiting
+      Rails.logger.info("manage_activity_items get_status dep_id=#{container.deployment.id} waiting")
       return UffizziCore::Event.state.failed if ['CrashLoopBackOff'].include?(reason)
 
       raise UffizziCore::Deployment::ImagePullError, @deployment.id if ['ErrImagePull', 'ImagePullBackOff'].include?(reason)
 
       UffizziCore::Event.state.deploying
     else
+      Rails.logger.info("manage_activity_items get_status dep_id=#{container.deployment.id} else")
       UffizziCore::Event.state.deploying
     end
   end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.11
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-27 00:00:00.000000000 Z
+date: 2022-05-28 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