uffizzi_core 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 398869abc38d2bc2416b1589de95feb828d73abdc34a388f74339fae083332d0
-  data.tar.gz: a58d996964d92dd95a0bd5e4ebffab62dd84eaafcc7580bf3462cc6a58ccee46
+  metadata.gz: cfa4de16cbd2efbc1c9b12748807a9c283e206a490eaa4cf544eaee9e5a11733
+  data.tar.gz: 8d3d6a27ed932c3760669f2397deef476b57c44ec09b783de51eca3143bb7aad
 SHA512:
-  metadata.gz: a70937d88e1d4733d113184b702f99226f5bee51dbed31cf8d8a9bbf2b2e93f8b702a68a72bf6fcb992f8493be910d0d1d18f0c2af90328bdda755a54405617e
-  data.tar.gz: cc53ee6c8d52ad74d732ea97996e84999e2f660e47b18d251695fa81f60010060955d6e9ef5e27fe7312d56faa329bf54243eb99138efa7a1e4a92907e6a8c98
+  metadata.gz: 0db9e7b5f79bf19ac9576b516e72792b3a58ff98edccea36ef1f9a4385e214d7498d5c5dc047fb989cd1c958a8ec8be32ad39d0257ab57c8b264a6fef7b85d96
+  data.tar.gz: a1f4c8f5a39e04357a1e9185454230b7671dffdac46f180a23310ae07f0b906912cf10fcd252fdfd1d31c7553a3074d139d504d94a916f4b2219e174771be945

data/app/clients/uffizzi_core/docker_hub_client/not_authorized_error.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+class UffizziCore::DockerHubClient
+  class NotAuthorizedError < StandardError
+  end
+end

data/app/controllers/concerns/uffizzi_core/dependency_injection_concern.rb

@@ -7,6 +7,12 @@ module UffizziCore::DependencyInjectionConcern
     UffizziCore::UserAccessService.new(module_class(:rbac))
   end
 
+  def build_parser_module
+    return unless module_exists?(:github)
+
+    module_class(:github).new
+  end
+
   private
 
   def module_exists?(module_name)

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-# rubocop:disable Metrics/LineLength
+# rubocop:disable Layout/LineLength
 class UffizziCore::Controller::DeployContainers::ContainerSerializer::ContainerConfigFileSerializer::ConfigFileSerializer < UffizziCore::BaseSerializer
-  # rubocop:enable Metrics/LineLength
+  # rubocop:enable Layout/LineLength
 
   attributes :id, :filename, :kind, :payload
 end

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

@@ -2,6 +2,8 @@
 
 class UffizziCore::ComposeFile::ServicesOptionsService
   class << self
+    include UffizziCore::DependencyInjectionConcern
+
     def parse(services, global_configs_data, global_secrets_data, compose_payload)
       raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.no_services') if services.nil? || services.keys.empty?
 
@@ -18,7 +20,7 @@ class UffizziCore::ComposeFile::ServicesOptionsService
 
     private
 
-    def prepare_service_data(service_name, service_data, global_configs_data, global_secrets_data, _compose_payload)
+    def prepare_service_data(service_name, service_data, global_configs_data, global_secrets_data, compose_payload)
       options_data = {}
       service_data.each_pair do |key, value|
         service_key = key.to_sym
@@ -27,7 +29,7 @@ class UffizziCore::ComposeFile::ServicesOptionsService
                                     when :image
                                       UffizziCore::ComposeFile::ServicesOptions::ImageService.parse(value)
                                     when :build
-                                      raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.not_implemented', option: :build)
+                                      check_and_parse_build_option(value, compose_payload)
                                     when :env_file
                                       UffizziCore::ComposeFile::ServicesOptions::EnvFileService.parse(value)
                                     when :environment
@@ -51,5 +53,11 @@ class UffizziCore::ComposeFile::ServicesOptionsService
 
       options_data
     end
+
+    def check_and_parse_build_option(value, compose_payload)
+      raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.not_implemented', option: :build) unless build_parser_module
+
+      build_parser_module.parse(value, compose_payload)
+    end
   end
 end

data/app/services/uffizzi_core/deployment_service.rb

@@ -104,9 +104,8 @@ 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}"
 
-      format_subdomain(subdomain)
+      "pr#{pull_request_payload['id']}-#{deployment_name}.#{repo_name}.#{project.slug}"
     end
 
     def build_docker_continuous_preview_subdomain(deployment)
@@ -116,17 +115,14 @@ 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}"
 
-      format_subdomain(subdomain)
+      "#{image_tag}-#{deployment_name}.#{repo_name}.#{project.slug}"
     end
 
     def build_default_subdomain(deployment)
       deployment_name = name(deployment)
       slug = deployment.project.slug.to_s
-      subdomain = "#{deployment_name}-#{slug}"
-
-      format_subdomain(subdomain)
+      "#{deployment_name}.#{slug}"
     end
 
     def build_preview_url(deployment)
@@ -297,12 +293,5 @@ 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/user_generator_service.rb

@@ -6,6 +6,12 @@ class UffizziCore::UserGeneratorService
   DEFAULT_ACCOUNT_NAME = 'default'
 
   class << self
+    def safe_generate(email, password, project_name)
+      generate(email, password, project_name)
+    rescue ActiveRecord::RecordInvalid => e
+      puts e.message
+    end
+
     def generate(email, password, project_name)
       user_attributes = build_user_attributes(email, password)
       project_attributes = build_project_attributes(project_name)
@@ -31,19 +37,17 @@ class UffizziCore::UserGeneratorService
 
       if email.present?
         user_attributes[:email] = email
-      else
+      elsif IO::console.present?
         IO::console.write("Enter User Email (default: #{DEFAULT_USER_EMAIL}): ")
         user_attributes[:email] = IO::console.gets.strip.presence || DEFAULT_USER_EMAIL
       end
 
       user_attributes[:password] = if password.present?
         password
-      else
+      elsif IO::console.present?
         IO::console.getpass('Enter Password: ')
       end
 
-      abort('password can\'t be blank') if user_attributes[:password].blank?
-
       user_attributes
     end
 
@@ -53,9 +57,11 @@ class UffizziCore::UserGeneratorService
       }
       if project_name.present?
         project_attributes[:name] = project_name
-      else
+      elsif IO::console.present?
         IO::console.write("Enter Project Name (default: #{DEFAULT_PROJECT_NAME}): ")
         project_attributes[:name] = IO::console.gets.strip.presence || DEFAULT_PROJECT_NAME
+      else
+        project_attributes[:name] = DEFAULT_PROJECT_NAME
       end
 
       project_attributes[:slug] = prepare_project_slug(project_attributes[:name])

data/lib/tasks/uffizzi_core_tasks.rake

@@ -14,6 +14,6 @@ namespace :uffizzi_core do
 
   desc 'Create a new user'
   task create_user: :environment do
-    UffizziCore::UserGeneratorService.generate(ENV['UFFIZZI_USER_EMAIL'], ENV['UFFIZZI_USER_PASSWORD'], ENV['UFFIZZI_PROJECT_NAME'])
+    UffizziCore::UserGeneratorService.safe_generate(ENV['UFFIZZI_USER_EMAIL'], ENV['UFFIZZI_USER_PASSWORD'], ENV['UFFIZZI_PROJECT_NAME'])
   end
 end

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-31 00:00:00.000000000 Z
+date: 2022-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -693,6 +693,7 @@ files:
 - app/clients/uffizzi_core/controller_client.rb
 - app/clients/uffizzi_core/controller_client/request_result.rb
 - app/clients/uffizzi_core/docker_hub_client.rb
+- app/clients/uffizzi_core/docker_hub_client/not_authorized_error.rb
 - app/clients/uffizzi_core/docker_hub_client/request_result.rb
 - app/clients/uffizzi_core/github_container_registry_client.rb
 - app/clients/uffizzi_core/github_container_registry_client/request_result.rb
@@ -758,9 +759,6 @@ 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

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

@@ -1,39 +0,0 @@
-# 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

@@ -1,65 +0,0 @@
-# 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

@@ -1,33 +0,0 @@
-# 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