uffizzi_core 0.1.11 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48e413ec49645c1e18d15251bcfa9ceaf94309be078fd46befbfd97894d9318e
-  data.tar.gz: 213cd12f3c9216b851ccd16c44562da68c954a03f126fd35ec683119ee7b8755
+  metadata.gz: d4aa056e4e94f8dbd93efddc149a68b583fe31090307048c1167df16b8842032
+  data.tar.gz: f7c91d5144ebe0f7cf95cbe7f3241e85bae67ff79eac46465a5cb329b23dfac6
 SHA512:
-  metadata.gz: 339656968a5609d9674536a6bd36518f2efb33afe30bf77ef2c56d158fe3b1b7a9f27da8dd76dcc8c1f35ad5624121a2914482d296b0b2e5afe9025735dda974
-  data.tar.gz: b5369f15696f2e011b1be386c1ee1b4660a0e5733e09030d0af8095612337cf544e2be0adfce7b3410f0338bd64e7e0d479a0f0f779360d9c99eb6990261670f
+  metadata.gz: c21e0edc0adf7905754850aabe30d4aec880029de985d90434c70f5bd2804dd7a44d87664f5e668b5bbac049cf6fda304c297c5ab44cc68a778d00d4fdf95b56
+  data.tar.gz: 6aa9ac0ab849cf07720a3642222d51a258252be4ad658f2f878a6a0b54ee725fe7b8f7a3f29bd42037a62be22dc268bf339baf7dc043ad3c66b7de497692f4da

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

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

data/app/lib/uffizzi_core/concerns/models/activity_item.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module UffizziCore::Concerns::Models::ActivityItem
+  extend ActiveSupport::Concern
+
+  included do
+    include UffizziCore::ActivityItemRepo
+
+    self.table_name = UffizziCore.table_names[:activity_items]
+
+    belongs_to :deployment
+    belongs_to :container
+    belongs_to :build, optional: true
+
+    has_many :events, dependent: :destroy
+
+    scope :docker, -> {
+      where(type: UffizziCore::ActivityItem::Docker.name)
+    }
+
+    scope :github, -> {
+      where(type: UffizziCore::ActivityItem::Github.name)
+    }
+
+    def docker?
+      type == UffizziCore::ActivityItem::Docker.name
+    end
+
+    def image
+      [namespace, name].compact.join('/')
+    end
+
+    def full_image
+      return "#{image}:#{tag}" if docker?
+
+      ''
+    end
+  end
+end

data/app/lib/uffizzi_core/concerns/models/credential.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module UffizziCore::Concerns::Models::Credential
+  extend ActiveSupport::Concern
+
+  included do
+    include AASM
+    include UffizziCore::CredentialRepo
+
+    self.table_name = UffizziCore.table_names[:credentials]
+
+    belongs_to :account
+
+    before_destroy :remove_token
+
+    validates :registry_url, presence: true
+
+    aasm :state, column: :state do
+      state :not_connected, initial: true
+      state :active
+      state :unauthorized
+
+      event :activate do
+        transitions from: [:not_connected, :unauthorized], to: :active
+      end
+
+      event :unauthorize do
+        transitions from: [:not_connected, :active], to: :unauthorized
+      end
+    end
+
+    def github_container_registry?
+      type == UffizziCore::Credential::GithubContainerRegistry.name
+    end
+
+    def docker_hub?
+      type == UffizziCore::Credential::DockerHub.name
+    end
+
+    def azure?
+      type == UffizziCore::Credential::Azure.name
+    end
+
+    def google?
+      type == UffizziCore::Credential::Google.name
+    end
+
+    def amazon?
+      type == UffizziCore::Credential::Amazon.name
+    end
+
+    private
+
+    def remove_token
+      account.projects.find_each do |project|
+        project.deployments.find_each do |deployment|
+          containers = deployment.containers
+          attributes = { continuously_deploy: UffizziCore::Container::STATE_DISABLED }
+
+          containers.with_docker_hub_repo.update_all(attributes) if docker_hub?
+        end
+      end
+    end
+  end
+end

data/app/lib/uffizzi_core/concerns/models/repo.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module UffizziCore::Concerns::Models::Repo
+  extend ActiveSupport::Concern
+
+  included do
+    extend Enumerize
+    include UffizziCore::RepoRepo
+
+    self.table_name = UffizziCore.table_names[:repos]
+
+    enumerize :kind, in: [:buildpacks18, :dockerfile, :dotnet, :gatsby, :barestatic], predicates: true
+
+    belongs_to :project
+    has_one :container, inverse_of: :repo, dependent: :destroy
+    has_many :builds, dependent: :destroy
+
+    validates :dockerfile_path, presence: true, if: :dockerfile?
+    validates :delete_preview_after, numericality: { greater_than: 0, only_integer: true }, allow_nil: true
+
+    def docker_hub?
+      type == UffizziCore::Repo::DockerHub.name
+    end
+
+    def azure?
+      type == UffizziCore::Repo::Azure.name
+    end
+
+    def google?
+      type == UffizziCore::Repo::Google.name
+    end
+  end
+end

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

@@ -12,6 +12,10 @@ class UffizziCore::ComposeFile::ConfigOptionService
 
     def config_options(compose_data)
       compose_data.each_with_object([]) do |(key, value), keys|
+        if compose_data.equal?(value)
+          raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.infinite_recursion', key: key)
+        end
+
         keys << key
         keys.concat(config_options(value)) if value.is_a?(Hash)
       end

data/app/services/uffizzi_core/compose_file_service.rb

@@ -158,7 +158,7 @@ module UffizziCore::ComposeFileService
 
     def load_compose_data(compose_content)
       begin
-        compose_data = YAML.safe_load(compose_content)
+        compose_data = YAML.safe_load(compose_content, aliases: true)
       rescue Psych::SyntaxError
         raise UffizziCore::ComposeFile::ParseError, 'Invalid compose file'
       end

data/app/services/uffizzi_core/deployment_service.rb

@@ -103,8 +103,9 @@ module UffizziCore::DeploymentService
       pull_request_payload = continuous_preview_payload['pull_request']
       repo_name = pull_request_payload['repository_full_name'].split('/').last
       deployment_name = name(deployment)
+      subdomain = "pr#{pull_request_payload['id']}-#{deployment_name}-#{repo_name}-#{project.slug}"
 
-      "pr#{pull_request_payload['id']}-#{deployment_name}.#{repo_name}.#{project.slug}"
+      format_subdomain(subdomain)
     end
 
     def build_docker_continuous_preview_subdomain(deployment)
@@ -114,14 +115,17 @@ module UffizziCore::DeploymentService
       repo_name = docker_payload['image'].split('/').last.gsub('_', '-')
       image_tag = docker_payload['tag'].gsub('_', '-')
       deployment_name = name(deployment)
+      subdomain = "#{image_tag}-#{deployment_name}-#{repo_name}-#{project.slug}"
 
-      "#{image_tag}-#{deployment_name}.#{repo_name}.#{project.slug}"
+      format_subdomain(subdomain)
     end
 
     def build_default_subdomain(deployment)
       deployment_name = name(deployment)
       slug = deployment.project.slug.to_s
-      "#{deployment_name}.#{slug}"
+      subdomain = "#{deployment_name}-#{slug}"
+
+      format_subdomain(subdomain)
     end
 
     def build_preview_url(deployment)
@@ -291,5 +295,12 @@ module UffizziCore::DeploymentService
         container.variables.push(*envs)
       end
     end
+
+    def format_subdomain(full_subdomain_name)
+      subdomain_length_limit = Settings.deployment.subdomain.length_limit
+      return full_subdomain_name if full_subdomain_name.length <= subdomain_length_limit
+
+      full_subdomain_name.slice(0, subdomain_length_limit)
+    end
   end
 end

data/app/services/uffizzi_core/manage_activity_items_service.rb

@@ -116,26 +116,18 @@ 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

@@ -59,6 +59,7 @@ en:
     invalid_healthcheck_command: "Service '%{name}' defines an invalid healthcheck: when 'test' is a list the first item must be either NONE, CMD or CMD-SHELL"
     string_or_array_error: "'%{option}' contains an invalid type, it should be a string, or an array"
     not_implemented: "'%{option}' option is not implemented"
+    infinite_recursion: "Found infinite recursion for key '%{key}'"
   secrets:
     duplicates_exists: Secret with key %{secrets} already exist.
     invalid_key_length: A secret key must be no longer than 256 characters.

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.14
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-28 00:00:00.000000000 Z
+date: 2022-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -757,6 +757,9 @@ files:
 - app/jobs/uffizzi_core/deployment/delete_job.rb
 - app/jobs/uffizzi_core/deployment/deploy_containers_job.rb
 - app/jobs/uffizzi_core/deployment/manage_deploy_activity_item_job.rb
+- app/lib/uffizzi_core/concerns/models/activity_item.rb
+- app/lib/uffizzi_core/concerns/models/credential.rb
+- app/lib/uffizzi_core/concerns/models/repo.rb
 - app/lib/uffizzi_core/rbac/user_access_service.rb
 - app/mailers/uffizzi_core/application_mailer.rb
 - app/models/concerns/uffizzi_core/hashid_concern.rb