uffizzi_core 1.1.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2edcfc13672bd0bca6949f51c036ddd4fb30b09f911c309a149141ad2b3d645d
-  data.tar.gz: 4747f7a5566cf82e782af3622aa7a8568dc61c8549805da8676ccf0dcd4c78a5
+  metadata.gz: a39e41ef8a1ef0300ac30d802f223c0c99c8f771591569401ba7f8835bcfb095
+  data.tar.gz: f3cb1e26f85f2751d7076234719d12a325eacab01ed4db85a6f7da8872442eb2
 SHA512:
-  metadata.gz: 33f214f8203c262c402d3f081e7d3e609f2b0e3fb42168e2cfb050e92cb654cfc9d233267593c2defae5bd8365ca613f556cfcb8167413666fd84bf33e45e7af
-  data.tar.gz: 34aa0ad85bd4450a1b4249e93cb588b2ef370c5538943d2878bfdd749dce97b90ffbe4cc1a4b775c41a28a4bd1ae6ce096bb3426ce71f23aa1579889f84566d7
+  metadata.gz: 62647e990dd6c5c449993a851d69b2f72e4d8d391ccb5d24bdffd62a16e76f1784f1d2e0e75838b74a320166d12ac560011cce8d7fe28fcf3414e7910853b854
+  data.tar.gz: cd2d7b36a7d231e6d090e29abced6c2617f0b950de0f9491e93d05e268c147102af90e6190e7cced76fe1678ec5f4dfbdd9242698c1eddb8bfb7ee07af8e1028

data/app/controllers/uffizzi_core/api/cli/v1/accounts/projects_controller.rb

@@ -17,11 +17,8 @@ class UffizziCore::Api::Cli::V1::Accounts::ProjectsController < UffizziCore::Api
 
   def create
     project_form = UffizziCore::Api::Cli::V1::Project::CreateForm.new(project_params)
-    project_form.account = current_user.organizational_account
-
-    if project_form.save
-      UffizziCore::ProjectService.add_users_to_project!(project_form, current_user)
-    end
+    project_form.account = current_user.accounts.find(params[:account_id])
+    UffizziCore::ProjectService.add_users_to_project!(project_form, project_form.account) if project_form.save
 
     respond_with project_form
   end

data/app/controllers/uffizzi_core/api/cli/v1/projects_controller.rb

@@ -53,7 +53,7 @@ class UffizziCore::Api::Cli::V1::ProjectsController < UffizziCore::Api::Cli::V1:
   end
 
   def policy_context
-    account = resource_project&.account || current_user.organizational_account
+    account = resource_project&.account || current_user.default_account
 
     UffizziCore::AccountContext.new(current_user, user_access_module, account, params)
   end

data/app/forms/uffizzi_core/api/cli/v1/account/credential/create_form.rb

@@ -17,7 +17,7 @@ class UffizziCore::Api::Cli::V1::Account::Credential::CreateForm < UffizziCore::
   end
 
   def check_credential_correctness
-    errors.add(:username, :incorrect) unless UffizziCore::CredentialService.correct_credentials?(self)
+    errors.add(:username, :incorrect, type: type.text) unless UffizziCore::CredentialService.correct_credentials?(self)
   end
 
   def credential_exists?

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

@@ -6,6 +6,7 @@ module UffizziCore::Concerns::Models::Account
   # rubocop:disable Metrics/BlockLength
   included do
     include AASM
+    include UffizziCore::AccountRepo
     include UffizziCore::StateMachineConcern
     extend Enumerize
 

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

@@ -3,12 +3,26 @@
 module UffizziCore::Concerns::Models::Credential
   extend ActiveSupport::Concern
 
+  # rubocop:disable Metrics/BlockLength
   included do
     include AASM
     include UffizziCore::CredentialRepo
+    extend Enumerize
 
     self.table_name = UffizziCore.table_names[:credentials]
 
+    const_set(:CREDENTIAL_TYPES, [
+                UffizziCore::Credential::Amazon.name,
+                UffizziCore::Credential::Azure.name,
+                UffizziCore::Credential::DockerHub.name,
+                UffizziCore::Credential::DockerRegistry.name,
+                UffizziCore::Credential::GithubContainerRegistry.name,
+                UffizziCore::Credential::Google.name,
+              ])
+
+    enumerize :type,
+              in: self::CREDENTIAL_TYPES, i18n_scope: ['enumerize.credential.type']
+
     belongs_to :account
 
     before_destroy :remove_token
@@ -70,4 +84,5 @@ module UffizziCore::Concerns::Models::Credential
       end
     end
   end
+  # rubocop:enable Metrics/BlockLength
 end

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

@@ -24,8 +24,12 @@ module UffizziCore::Concerns::Models::User
 
     enumerize :creation_source, in: UffizziCore.user_creation_sources, predicates: true
 
-    def organizational_account
-      accounts.find_by(kind: UffizziCore::Account.kind.organizational)
+    def default_account
+      personal_account
+    end
+
+    def personal_account
+      accounts.find_by(kind: UffizziCore::Account.kind.personal)
     end
 
     def active_projects

data/app/repositories/uffizzi_core/account_repo.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module UffizziCore::AccountRepo
+  extend ActiveSupport::Concern
+
+  included do
+    scope :by_kind, ->(kind) { where(kind: kind) }
+    scope :personal, -> { by_kind(UffizziCore::Account.kind.personal) }
+  end
+end

data/app/services/uffizzi_core/project_service.rb

@@ -36,11 +36,9 @@ class UffizziCore::ProjectService
       UffizziCore::ComposeFile::ErrorsService.update_compose_errors!(compose_file, new_errors, compose_file.content)
     end
 
-    def add_users_to_project!(project, current_user)
-      user_projects = []
-
-      current_user.organizational_account.memberships.where(role: UffizziCore::Membership.role.admin).map do |membership|
-        user_projects << { project: project, user: membership.user, role: UffizziCore::UserProject.role.admin }
+    def add_users_to_project!(project, account)
+      user_projects = account.memberships.where(role: UffizziCore::Membership.role.admin).map do |membership|
+        { project: project, user: membership.user, role: UffizziCore::UserProject.role.admin }
       end
 
       UffizziCore::UserProject.create!(user_projects)

data/app/services/uffizzi_core/user_generator_service.rb

@@ -73,7 +73,7 @@ class UffizziCore::UserGeneratorService
         owner: user,
         name: DEFAULT_ACCOUNT_NAME,
         state: UffizziCore::Account::STATE_ACTIVE,
-        kind: UffizziCore::Account.kind.organizational,
+        kind: UffizziCore::Account.kind.personal,
       }
     end
 

data/config/locales/en.activerecord.yml

@@ -13,14 +13,14 @@ en:
             password:
               password_blank: Password/Access Token can't be blank
             username:
-              incorrect: We were unable to log you in to docker registry. Please verify that your username and password are correct.
+              incorrect: "We were unable to log you into %{type}. Please verify that your username and password are correct."
             type:
               exist: Credential of that type already exist.
         uffizzi_core/deployment:
           attributes:
             containers:
-              max_memory_limit_error: 'Memory limit of containers must be less than %{max}'
-              max_memory_request_error: 'Memory request of containers must be less than %{max}'
+              max_memory_limit_error: "Memory limit of containers must be less than %{max}"
+              max_memory_request_error: "Memory request of containers must be less than %{max}"
         uffizzi_core/user:
           attributes:
             email:

data/config/locales/en.yml

@@ -76,3 +76,12 @@ en:
   session:
     unsupported_login_type: This type of login is not supported
     unauthorized: Unauthorized
+  enumerize:
+    credential:
+      type:
+        "UffizziCore::Credential::GithubContainerRegistry": "Github Container Registry"
+        "UffizziCore::Credential::DockerHub": "DockerHub"
+        "UffizziCore::Credential::DockerRegistry": "Docker Registry"
+        "UffizziCore::Credential::Azure": "Azure"
+        "UffizziCore::Credential::Google": "Google"
+        "UffizziCore::Credential::Amazon": "Amazon"

data/db/seeds.rb

@@ -9,7 +9,7 @@ user = UffizziCore::User.create!(
 account = UffizziCore::Account.create!(
   owner: user, name: 'default',
   state: UffizziCore::Account::STATE_ACTIVE,
-  kind: UffizziCore::Account.kind.organizational
+  kind: UffizziCore::Account.kind.personal
 )
 user.memberships.create!(account: account, role: UffizziCore::Membership.role.admin)
 project = account.projects.create!(name: 'default', slug: 'default', state: UffizziCore::Project::STATE_ACTIVE)

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-27 00:00:00.000000000 Z
+date: 2022-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -862,6 +862,7 @@ files:
 - app/policies/uffizzi_core/api/cli/v1/projects/secrets_policy.rb
 - app/policies/uffizzi_core/api/cli/v1/projects_policy.rb
 - app/policies/uffizzi_core/application_policy.rb
+- app/repositories/uffizzi_core/account_repo.rb
 - app/repositories/uffizzi_core/activity_item_repo.rb
 - app/repositories/uffizzi_core/basic_order_repo.rb
 - app/repositories/uffizzi_core/build_repo.rb