uffizzi_core 0.2.1 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adfd2aad21040ef9ab01dbd4057d37185b70a57d7886fad0add89e64ae4a1c77
-  data.tar.gz: d1b593337123b302cf5e5a4986be2806f806a8afd4a7f9292940222e1225c857
+  metadata.gz: 95b83037cf5b0e2be7f85038f8e42a2cce5b44f90a92ff0f0f006ca6d518d03f
+  data.tar.gz: 777a69d65951babbeb3cb8d4624a8fcb813cf23afe2ce3af35e52da923044f07
 SHA512:
-  metadata.gz: b6d2ee7b78505a764da65fb0e100678b35b9f8e974105b8e1600ee61dd499b3546653a556fa1531bbd14c0a5043fbae85d2f23d3701f209802fdd3e6951d8e7c
-  data.tar.gz: 7fae0d641e8c2ec495fb2250931245a16893a2b9e88564c2e52cba0f94fa1cf9b4da1800cdc3606de53fcb1ea750e5e18bce39af405b34d6ac5cb1b459389334
+  metadata.gz: af3ae4e46eee3ab0f72c7370d956e92a5eefcb48ff3c05b51682148258014eee0e833994b481c910220148ab4a99e9b91ae3cf33e45c5659cdbcbe8a2ae9b2bc
+  data.tar.gz: becb67e6136eb7096113058058e2f4e16e5a92f2c6313513f3efef9f517ef6f5220444a8e99cca831d17b8b44940d87805b897bc009bf9385e2cf645917258b2

data/app/controllers/uffizzi_core/api/cli/v1/projects/compose_files_controller.rb

@@ -62,7 +62,7 @@ class UffizziCore::Api::Cli::V1::Projects::ComposeFilesController < UffizziCore:
 
   def compose_file
     compose_file = resource_project.compose_file
-    raise ActiveRecord::RecordNotFound if compose_file.blank?
+    raise ActiveRecord::RecordNotFound.new("Couldn't find UffizziCore::ComposeFile", UffizziCore::ComposeFile) if compose_file.blank?
 
     compose_file
   end

data/app/controllers/uffizzi_core/application_controller.rb

@@ -11,11 +11,13 @@ class UffizziCore::ApplicationController < ActionController::Base
   DEFAULT_PER_PAGE = 20
 
   protect_from_forgery with: :exception
-  rescue_from ActiveRecord::RecordNotFound, with: :render_not_found
   RESCUABLE_EXCEPTIONS = [RuntimeError, TypeError, NameError, ArgumentError, SyntaxError].freeze
   rescue_from *RESCUABLE_EXCEPTIONS do |exception|
     render_server_error(exception)
   end
+  rescue_from ActiveRecord::RecordNotFound do |exception|
+    render_not_found(exception)
+  end
 
   before_action :authenticate_request!
   skip_before_action :verify_authenticity_token
@@ -29,8 +31,9 @@ class UffizziCore::ApplicationController < ActionController::Base
     UffizziCore::JsonResponder
   end
 
-  def render_not_found
-    render json: { errors: { title: ['Resource Not Found'] } }, status: :not_found
+  def render_not_found(exception)
+    resource = exception.model || 'Resource'
+    render json: { errors: { title: ["#{resource} Not Found"] } }, status: :not_found
   end
 
   def render_server_error(error)

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

@@ -7,7 +7,7 @@ class UffizziCore::ComposeFile::ConfigOptionService
         raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.boolean_option', value: option)
       end
 
-      option.match(/^[a-zA-Z_][a-zA-Z0-9._\-]+$/).present?
+      option.match(/^[\w.-]+$/).present?
     end
 
     def config_options(compose_data)

data/app/services/uffizzi_core/deployment_service.rb

@@ -112,8 +112,8 @@ module UffizziCore::DeploymentService
       project = deployment.project
       continuous_preview_payload = deployment.continuous_preview_payload
       docker_payload = continuous_preview_payload['docker']
-      repo_name = docker_payload['image'].split('/').last.gsub('_', '-')
-      image_tag = docker_payload['tag'].gsub('_', '-')
+      repo_name = docker_payload['image'].split('/').last
+      image_tag = docker_payload['tag']
       deployment_name = name(deployment)
       subdomain = "#{image_tag}-#{deployment_name}-#{repo_name}-#{project.slug}"
 
@@ -298,10 +298,13 @@ module UffizziCore::DeploymentService
     end
 
     def format_subdomain(full_subdomain_name)
+      # Replace _ to - because RFC 1123 subdomain must consist of lower case alphanumeric characters,
+      # '-' or '.', and must start and end with an alphanumeric character
+      rfc_subdomain = full_subdomain_name.gsub('_', '-')
       subdomain_length_limit = Settings.deployment.subdomain.length_limit
-      return full_subdomain_name if full_subdomain_name.length <= subdomain_length_limit
+      return rfc_subdomain if rfc_subdomain.length <= subdomain_length_limit
 
-      full_subdomain_name.slice(0, subdomain_length_limit)
+      rfc_subdomain.slice(0, subdomain_length_limit)
     end
   end
 end

data/app/services/uffizzi_core/manage_activity_items_service.rb

@@ -119,11 +119,7 @@ class UffizziCore::ManageActivityItemsService
     case pod_container_status.to_sym
     when :running
       UffizziCore::Event.state.deployed
-    when :terminated
-      UffizziCore::Event.state.failed
     when :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

data/config/locales/en.yml

@@ -13,7 +13,7 @@ en:
   compose:
     unsupported_file: Unsupported compose file
     invalid_file: Invalid compose file
-    invalid_config_option: Invalid config option '%{value}' - only [a-zA-Z0-9\._\-] characters are allowed
+    invalid_config_option: Invalid config option '%{value}' - only a-zA-Z0-9._- characters are allowed
     no_services: Service services has neither an image nor a build context specified. At least one must be provided.
     no_ingress: Service ingress has not been defined.
     invalid_image_value: Invalid image value '%{value}'
@@ -30,7 +30,7 @@ en:
     invalid_memory_type: Memory '%{value}' contains an invalid type, it should be a string
     invalid_memory_value: Invalid memory value '%{value}'
     invalid_memory: The memory should be one of the `125m` `250m` `500m` `1000m` `2000m` `4000m` values
-    image_build_no_specified: Service %{value} has neither an image nor a build context specified. At least one must be provided.
+    image_build_no_specified: Service '%{value}' has neither an image nor a build context specified. At least one must be provided.
     build_context_no_specified: The context option should be specified
     config_file_not_found: Config file not found '%{name}'
     invalid_context: Invalid context value '%{value}'

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.4
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-10 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm