uffizzi_core 0.1.7 → 0.1.10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (44) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/concerns/uffizzi_core/dependency_injection_concern.rb +2 -2
  3. data/app/controllers/uffizzi_core/api/cli/v1/projects/deployments/containers/application_controller.rb +1 -1
  4. data/app/controllers/uffizzi_core/application_controller.rb +1 -1
  5. data/app/forms/uffizzi_core/api/cli/v1/deployment/create_form.rb +1 -1
  6. data/app/forms/uffizzi_core/api/cli/v1/template/create_form.rb +1 -1
  7. data/app/lib/uffizzi_core/rbac/user_access_service.rb +14 -12
  8. data/app/models/uffizzi_core/account.rb +1 -1
  9. data/app/models/uffizzi_core/activity_item.rb +1 -1
  10. data/app/models/uffizzi_core/build.rb +1 -1
  11. data/app/models/uffizzi_core/comment.rb +1 -1
  12. data/app/models/uffizzi_core/compose_file.rb +1 -1
  13. data/app/models/uffizzi_core/config_file.rb +1 -1
  14. data/app/models/uffizzi_core/container.rb +1 -1
  15. data/app/models/uffizzi_core/container_config_file.rb +1 -1
  16. data/app/models/uffizzi_core/coupon.rb +1 -1
  17. data/app/models/uffizzi_core/credential.rb +1 -1
  18. data/app/models/uffizzi_core/deployment.rb +1 -1
  19. data/app/models/uffizzi_core/event.rb +1 -1
  20. data/app/models/uffizzi_core/invitation.rb +1 -1
  21. data/app/models/uffizzi_core/membership.rb +1 -1
  22. data/app/models/uffizzi_core/payment.rb +1 -1
  23. data/app/models/uffizzi_core/price.rb +1 -1
  24. data/app/models/uffizzi_core/product.rb +1 -1
  25. data/app/models/uffizzi_core/project.rb +1 -1
  26. data/app/models/uffizzi_core/rating.rb +1 -1
  27. data/app/models/uffizzi_core/repo.rb +1 -1
  28. data/app/models/uffizzi_core/role.rb +2 -2
  29. data/app/models/uffizzi_core/secret.rb +1 -1
  30. data/app/models/uffizzi_core/template.rb +1 -1
  31. data/app/models/uffizzi_core/user.rb +1 -1
  32. data/app/models/uffizzi_core/user_project.rb +1 -1
  33. data/app/serializers/uffizzi_core/controller/create_credential/credential_serializer.rb +0 -2
  34. data/app/serializers/uffizzi_core/controller/deploy_containers/container_serializer.rb +5 -4
  35. data/app/services/uffizzi_core/compose_file/builders/container_builder_service.rb +1 -1
  36. data/app/services/uffizzi_core/compose_file/ingress_options_service.rb +4 -2
  37. data/app/services/uffizzi_core/manage_activity_items_service.rb +2 -0
  38. data/app/services/uffizzi_core/user_access_service.rb +14 -0
  39. data/config/locales/en.yml +1 -1
  40. data/db/migrate/20220525113412_rename_name_to_uffizzi_containers.rb +7 -0
  41. data/lib/uffizzi_core/engine.rb +0 -35
  42. data/lib/uffizzi_core/version.rb +1 -1
  43. data/lib/uffizzi_core.rb +31 -1
  44. metadata +8 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 503ded723d48c023e0c47bc007b75e704927ba6bb13e9ea672feb573b45a2b95
4
- data.tar.gz: ac2d0d440e82ea78fc3a5cca1f2dcac89a9db129a4cd2eee4ca712fad2be53d1
3
+ metadata.gz: 47eea084cd84fe9074609e526971df1417befd6d56d5d40e63a89023a9362602
4
+ data.tar.gz: 5a05f8c69d95b3829464d08f7b854bda15200dbe835e1e47ecf1c5f42c88edaf
5
5
  SHA512:
6
- metadata.gz: 46299f40846b2ef159fdd856f58cb47584907b26f1a16341007d5c6137f15a4afd905233f8db1e9d33252e652c218a4dba6ac216f59bb09ed00f6627c2b4643b
7
- data.tar.gz: 2b1816b02b108dbd24ace6e4a6761fca714a62cd2226048ab2266b59bc09a9861a5f2cc425345326207feec9eeaa6f0ae1e3a539bbca8d2006ac8686fdb90edd
6
+ metadata.gz: 11c3d78965eac3fb0e57783843f8b42fd03eb8fa334852d2364f5d79a6c613062fed607f11f386bbdc14941cac9d3d21448b8f82092e66eac9777979e13f8dca
7
+ data.tar.gz: f02157e2b222d62729459a234952ee957897bfd94733b5ec9be52aa0a7e0770ddd0661ee5facdb7c630cfb76d111ededf6536b8a83c6617681600b58d773a0ab
@@ -4,7 +4,7 @@ module UffizziCore::DependencyInjectionConcern
4
4
  def user_access_module
5
5
  return unless module_exists?(:rbac)
6
6
 
7
- module_class(:rbac).new
7
+ UffizziCore::UserAccessService.new(module_class(:rbac))
8
8
  end
9
9
 
10
10
  private
@@ -14,6 +14,6 @@ module UffizziCore::DependencyInjectionConcern
14
14
  end
15
15
 
16
16
  def module_class(module_name)
17
- Rails.application.config.uffizzi_core[:dependencies][module_name]&.constantize
17
+ UffizziCore.dependencies[module_name]&.constantize
18
18
  end
19
19
  end
@@ -3,6 +3,6 @@
3
3
  class UffizziCore::Api::Cli::V1::Projects::Deployments::Containers::ApplicationController <
4
4
  UffizziCore::Api::Cli::V1::Projects::Deployments::ApplicationController
5
5
  def resource_container
6
- @resource_container ||= resource_deployment.active_containers.find_by!(name: params[:container_name])
6
+ @resource_container ||= resource_deployment.active_containers.find_by!(service_name: params[:container_name])
7
7
  end
8
8
  end
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  class UffizziCore::ApplicationController < ActionController::Base
4
- include Pundit::Authorization
4
+ include Pundit
5
5
  include UffizziCore::ResponseService
6
6
  include UffizziCore::AuthManagement
7
7
  include UffizziCore::AuthorizationConcern
@@ -6,7 +6,7 @@ class UffizziCore::Api::Cli::V1::Deployment::CreateForm < UffizziCore::Deploymen
6
6
  permit :creation_source,
7
7
  containers_attributes: [
8
8
  :image,
9
- :name,
9
+ :service_name,
10
10
  :tag,
11
11
  :port,
12
12
  :public,
@@ -16,7 +16,7 @@ class UffizziCore::Api::Cli::V1::Template::CreateForm < UffizziCore::Template
16
16
  :command,
17
17
  :receive_incoming_requests,
18
18
  :continuously_deploy,
19
- :name,
19
+ :service_name,
20
20
  { variables: [:name, :value],
21
21
  secret_variables: [:name, :value],
22
22
  repo_attributes: [
@@ -1,19 +1,21 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- class UffizziCore::Rbac::UserAccessService
4
- def admin_access_to_account?(_user, _account)
5
- true
6
- end
3
+ module UffizziCore::Rbac::UserAccessService
4
+ class << self
5
+ def admin_access_to_account?(_user, _account)
6
+ true
7
+ end
7
8
 
8
- def any_access_to_account?(_user, _account)
9
- true
10
- end
9
+ def any_access_to_account?(_user, _account)
10
+ true
11
+ end
11
12
 
12
- def admin_or_developer_access_to_project?(_user, _project)
13
- true
14
- end
13
+ def admin_or_developer_access_to_project?(_user, _project)
14
+ true
15
+ end
15
16
 
16
- def any_access_to_project?(_user, _project)
17
- true
17
+ def any_access_to_project?(_user, _project)
18
+ true
19
+ end
18
20
  end
19
21
  end
@@ -5,7 +5,7 @@ class UffizziCore::Account < UffizziCore::ApplicationRecord
5
5
  include UffizziCore::StateMachineConcern
6
6
  extend Enumerize
7
7
 
8
- self.table_name = Rails.application.config.uffizzi_core[:table_names][:accounts]
8
+ self.table_name = UffizziCore.table_names[:accounts]
9
9
 
10
10
  enumerize :kind, in: [:personal, :organizational], scope: true, predicates: true
11
11
  validates :kind, presence: true
@@ -21,7 +21,7 @@
21
21
  class UffizziCore::ActivityItem < UffizziCore::ApplicationRecord
22
22
  include UffizziCore::ActivityItemRepo
23
23
 
24
- self.table_name = Rails.application.config.uffizzi_core[:table_names][:activity_items]
24
+ self.table_name = UffizziCore.table_names[:activity_items]
25
25
 
26
26
  belongs_to :deployment
27
27
  belongs_to :container
@@ -3,7 +3,7 @@
3
3
  class UffizziCore::Build < UffizziCore::ApplicationRecord
4
4
  include UffizziCore::BuildRepo
5
5
 
6
- self.table_name = Rails.application.config.uffizzi_core[:table_names][:builds]
6
+ self.table_name = UffizziCore.table_names[:builds]
7
7
 
8
8
  BUILDING = 1
9
9
  SUCCESS = 2
@@ -3,7 +3,7 @@
3
3
  class UffizziCore::Comment < UffizziCore::ApplicationRecord
4
4
  include UffizziCore::CommentRepo
5
5
 
6
- self.table_name = Rails.application.config.uffizzi_core[:table_names][:comments]
6
+ self.table_name = UffizziCore.table_names[:comments]
7
7
 
8
8
  has_ancestry(cache_depth: true)
9
9
  MAX_DEPTH_LEVEL = 1
@@ -14,7 +14,7 @@ class UffizziCore::ComposeFile < UffizziCore::ApplicationRecord
14
14
  include AASM
15
15
  extend Enumerize
16
16
 
17
- self.table_name = Rails.application.config.uffizzi_core[:table_names][:compose_files]
17
+ self.table_name = UffizziCore.table_names[:compose_files]
18
18
 
19
19
  belongs_to :project
20
20
  belongs_to :added_by, class_name: UffizziCore::User.name, foreign_key: :added_by_id, optional: true
@@ -11,7 +11,7 @@ class UffizziCore::ConfigFile < UffizziCore::ApplicationRecord
11
11
  include UffizziCore::ConfigFileRepo
12
12
  extend Enumerize
13
13
 
14
- self.table_name = Rails.application.config.uffizzi_core[:table_names][:config_files]
14
+ self.table_name = UffizziCore.table_names[:config_files]
15
15
 
16
16
  belongs_to :project
17
17
  belongs_to :added_by, class_name: UffizziCore::User.name, foreign_key: :added_by_id, optional: true
@@ -17,7 +17,7 @@ class UffizziCore::Container < UffizziCore::ApplicationRecord
17
17
  include UffizziCore::StateMachineConcern
18
18
  extend Enumerize
19
19
 
20
- self.table_name = Rails.application.config.uffizzi_core[:table_names][:containers]
20
+ self.table_name = UffizziCore.table_names[:containers]
21
21
 
22
22
  enumerize :kind, in: [:internal, :user], predicates: true
23
23
 
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  class UffizziCore::ContainerConfigFile < UffizziCore::ApplicationRecord
4
- self.table_name = Rails.application.config.uffizzi_core[:table_names][:container_config_files]
4
+ self.table_name = UffizziCore.table_names[:container_config_files]
5
5
 
6
6
  belongs_to :container
7
7
  belongs_to :config_file
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  class UffizziCore::Coupon < UffizziCore::ApplicationRecord
4
- self.table_name = Rails.application.config.uffizzi_core[:table_names][:coupons]
4
+ self.table_name = UffizziCore.table_names[:coupons]
5
5
  end
@@ -4,7 +4,7 @@ class UffizziCore::Credential < UffizziCore::ApplicationRecord
4
4
  include AASM
5
5
  include UffizziCore::CredentialRepo
6
6
 
7
- self.table_name = Rails.application.config.uffizzi_core[:table_names][:credentials]
7
+ self.table_name = UffizziCore.table_names[:credentials]
8
8
 
9
9
  belongs_to :account
10
10
 
@@ -25,7 +25,7 @@ class UffizziCore::Deployment < UffizziCore::ApplicationRecord
25
25
  include UffizziCore::DeploymentRepo
26
26
  extend Enumerize
27
27
 
28
- self.table_name = Rails.application.config.uffizzi_core[:table_names][:deployments]
28
+ self.table_name = UffizziCore.table_names[:deployments]
29
29
 
30
30
  enumerize :kind, in: [:standard, :performance, :enterprise, :free], predicates: true, default: :standard
31
31
 
@@ -4,7 +4,7 @@ class UffizziCore::Event < UffizziCore::ApplicationRecord
4
4
  include UffizziCore::EventRepo
5
5
  extend Enumerize
6
6
 
7
- self.table_name = Rails.application.config.uffizzi_core[:table_names][:events]
7
+ self.table_name = UffizziCore.table_names[:events]
8
8
 
9
9
  enumerize :state, in: [:queued, :successful, :deployed, :failed, :building, :timeout, :cancelled, :deploying], predicates: true,
10
10
  scope: true
@@ -5,7 +5,7 @@ class UffizziCore::Invitation < UffizziCore::ApplicationRecord
5
5
  include UffizziCore::StateMachineConcern
6
6
  extend Enumerize
7
7
 
8
- self.table_name = Rails.application.config.uffizzi_core[:table_names][:invitations]
8
+ self.table_name = UffizziCore.table_names[:invitations]
9
9
 
10
10
  enumerize :role, in: [:admin, :developer, :viewer], predicates: true
11
11
 
@@ -4,7 +4,7 @@ class UffizziCore::Membership < UffizziCore::ApplicationRecord
4
4
  include UffizziCore::MembershipRepo
5
5
  extend Enumerize
6
6
 
7
- self.table_name = Rails.application.config.uffizzi_core[:table_names][:memberships]
7
+ self.table_name = UffizziCore.table_names[:memberships]
8
8
 
9
9
  enumerize :role, in: [:admin, :developer, :viewer], predicates: true
10
10
  validates :role, presence: true
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  class UffizziCore::Payment < UffizziCore::ApplicationRecord
4
- self.table_name = Rails.application.config.uffizzi_core[:table_names][:payments]
4
+ self.table_name = UffizziCore.table_names[:payments]
5
5
 
6
6
  belongs_to :account
7
7
 
@@ -3,7 +3,7 @@
3
3
  class UffizziCore::Price < UffizziCore::ApplicationRecord
4
4
  include UffizziCore::PriceRepo
5
5
 
6
- self.table_name = Rails.application.config.uffizzi_core[:table_names][:prices]
6
+ self.table_name = UffizziCore.table_names[:prices]
7
7
 
8
8
  belongs_to :product
9
9
  end
@@ -3,7 +3,7 @@
3
3
  class UffizziCore::Product < UffizziCore::ApplicationRecord
4
4
  include UffizziCore::ProductRepo
5
5
 
6
- self.table_name = Rails.application.config.uffizzi_core[:table_names][:products]
6
+ self.table_name = UffizziCore.table_names[:products]
7
7
 
8
8
  has_one :price, dependent: :destroy
9
9
 
@@ -8,7 +8,7 @@ class UffizziCore::Project < UffizziCore::ApplicationRecord
8
8
  include UffizziCore::StateMachineConcern
9
9
  include UffizziCore::ProjectRepo
10
10
 
11
- self.table_name = Rails.application.config.uffizzi_core[:table_names][:projects]
11
+ self.table_name = UffizziCore.table_names[:projects]
12
12
 
13
13
  belongs_to :account
14
14
 
@@ -3,7 +3,7 @@
3
3
  class UffizziCore::Rating < UffizziCore::ApplicationRecord
4
4
  include AASM
5
5
 
6
- self.table_name = Rails.application.config.uffizzi_core[:table_names][:ratings]
6
+ self.table_name = UffizziCore.table_names[:ratings]
7
7
 
8
8
  aasm(:state) do
9
9
  state :active, initial: true
@@ -4,7 +4,7 @@ class UffizziCore::Repo < UffizziCore::ApplicationRecord
4
4
  extend Enumerize
5
5
  include UffizziCore::RepoRepo
6
6
 
7
- self.table_name = Rails.application.config.uffizzi_core[:table_names][:repos]
7
+ self.table_name = UffizziCore.table_names[:repos]
8
8
 
9
9
  enumerize :kind, in: [:buildpacks18, :dockerfile, :dotnet, :gatsby, :barestatic], predicates: true
10
10
 
@@ -1,9 +1,9 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  class UffizziCore::Role < UffizziCore::ApplicationRecord
4
- self.table_name = Rails.application.config.uffizzi_core[:table_names][:roles]
4
+ self.table_name = UffizziCore.table_names[:roles]
5
5
 
6
- has_and_belongs_to_many :users, join_table: Rails.application.config.uffizzi_core[:table_names][:users_roles]
6
+ has_and_belongs_to_many :users, join_table: UffizziCore.table_names[:users_roles]
7
7
 
8
8
  belongs_to :resource,
9
9
  polymorphic: true,
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  class UffizziCore::Secret < ApplicationRecord
4
- self.table_name = Rails.application.config.uffizzi_core[:table_names][:secrets]
4
+ self.table_name = UffizziCore.table_names[:secrets]
5
5
 
6
6
  belongs_to :resource, polymorphic: true
7
7
 
@@ -4,7 +4,7 @@ class UffizziCore::Template < UffizziCore::ApplicationRecord
4
4
  include UffizziCore::TemplateRepo
5
5
  extend Enumerize
6
6
 
7
- self.table_name = Rails.application.config.uffizzi_core[:table_names][:templates]
7
+ self.table_name = UffizziCore.table_names[:templates]
8
8
 
9
9
  belongs_to :added_by, class_name: UffizziCore::User.name, foreign_key: :added_by_id
10
10
  belongs_to :project, touch: true
@@ -8,7 +8,7 @@ class UffizziCore::User < ActiveRecord::Base
8
8
  include UffizziCore::UserRepo
9
9
  extend Enumerize
10
10
 
11
- self.table_name = Rails.application.config.uffizzi_core[:table_names][:users]
11
+ self.table_name = UffizziCore.table_names[:users]
12
12
 
13
13
  rolify
14
14
 
@@ -3,7 +3,7 @@
3
3
  class UffizziCore::UserProject < UffizziCore::ApplicationRecord
4
4
  extend Enumerize
5
5
 
6
- self.table_name = Rails.application.config.uffizzi_core[:table_names][:user_projects]
6
+ self.table_name = UffizziCore.table_names[:user_projects]
7
7
 
8
8
  enumerize :role, in: [:admin, :developer, :viewer], predicates: true
9
9
  validates :role, presence: true
@@ -12,8 +12,6 @@ class UffizziCore::Controller::CreateCredential::CredentialSerializer < UffizziC
12
12
  def password
13
13
  if object.amazon?
14
14
  UffizziCore::Amazon::CredentialService.access_token(object)
15
- elsif object.github_container_registry?
16
- UffizziCore::GithubContainerRegistry::CredentialService.access_token(object, instance_options[:image])
17
15
  else
18
16
  object.password
19
17
  end
@@ -20,16 +20,17 @@ class UffizziCore::Controller::DeployContainers::ContainerSerializer < UffizziCo
20
20
  has_many :container_config_files
21
21
 
22
22
  def image
23
- credential = UffizziCore::RepoService.credential(object.repo)
23
+ repo = object.repo
24
+ credential = UffizziCore::RepoService.credential(repo)
24
25
 
25
- case object.repo.type
26
+ case repo.type
26
27
  when UffizziCore::Repo::Google.name, UffizziCore::Repo::Amazon.name, UffizziCore::Repo::Azure.name
27
28
  registry_host = URI.parse(credential.registry_url).host
28
29
 
29
30
  "#{registry_host}/#{object.image}"
30
31
  when UffizziCore::Repo::GithubContainerRegistry.name
31
32
  registry_host = URI.parse(credential.registry_url).host
32
- "#{registry_host}/#{credential.username}/#{object.image}"
33
+ "#{registry_host}/#{repo.namespace}/#{object.image}"
33
34
  else
34
35
  object.image
35
36
  end
@@ -37,7 +38,7 @@ class UffizziCore::Controller::DeployContainers::ContainerSerializer < UffizziCo
37
38
 
38
39
  def tag
39
40
  case object.repo.type
40
- when UffizziCore::Repo::Github.name, UffizziCore::Repo::GithubContainerRegistry.name
41
+ when UffizziCore::Repo::Github.name
41
42
  UffizziCore::RepoService.tag(object.repo)
42
43
  else
43
44
  object.tag
@@ -45,7 +45,7 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
45
45
  continuously_deploy: continuously_deploy(deploy_data),
46
46
  receive_incoming_requests: is_ingress,
47
47
  container_config_files_attributes: config_files(configs_data, configs_dependencies),
48
- name: container_name,
48
+ service_name: container_name,
49
49
  }
50
50
  end
51
51
 
@@ -39,8 +39,10 @@ class UffizziCore::ComposeFile::IngressOptionsService
39
39
 
40
40
  raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_integer', option: :port) unless port.is_a?(Integer)
41
41
 
42
- if port < Settings.compose.port_min_value || port > Settings.compose.port_max_value
43
- raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_port')
42
+ port_min = Settings.compose.port_min_value
43
+ port_max = Settings.compose.port_max_value
44
+ if port < port_min || port > port_max
45
+ raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.port_out_of_range', port_min: port_min, port_max: port_max)
44
46
  end
45
47
 
46
48
  port
@@ -116,6 +116,8 @@ class UffizziCore::ManageActivityItemsService
116
116
  state = pod_container[:state][pod_container_status]
117
117
  reason = state&.reason
118
118
 
119
+ Rails.logger.info("manage_activity_items get_status dep_id=#{container.deployment.id} pod_container: #{pod_container[:state].inspect}")
120
+
119
121
  case pod_container_status.to_sym
120
122
  when :running
121
123
  UffizziCore::Event.state.deployed
@@ -0,0 +1,14 @@
1
+ # frozen_string_literal: true
2
+
3
+ class UffizziCore::UserAccessService
4
+ attr_accessor :user_access_module
5
+
6
+ delegate :admin_access_to_account?, :developer_access_to_account?, :viewer_access_to_account?,
7
+ :admin_or_developer_access_to_account?, :any_access_to_account?, :admin_access_to_project?,
8
+ :developer_access_to_project?, :viewer_access_to_project?, :admin_or_developer_access_to_project?,
9
+ :any_access_to_project?, :global_admin?, to: :@user_access_module
10
+
11
+ def initialize(user_access_module)
12
+ @user_access_module = user_access_module
13
+ end
14
+ end
@@ -25,7 +25,7 @@ en:
25
25
  invalid_ingress_service: Invalid ingress service '%{value}'
26
26
  no_variable_name: Invalid environment variable 'name=%{name}' 'value=%{value}'
27
27
  invalid_config: Invalid config value 'source=%{source}' 'target=%{target}'
28
- invalid_port: Invalid port specification '%{value}'
28
+ port_out_of_range: Port should be specified between %{port_min} - %{port_max}
29
29
  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
30
30
  invalid_memory_type: Memory '%{value}' contains an invalid type, it should be a string
31
31
  invalid_memory_value: Invalid memory value '%{value}'
@@ -0,0 +1,7 @@
1
+ # frozen_string_literal: true
2
+
3
+ class RenameNameToUffizziContainers < ActiveRecord::Migration[6.1]
4
+ def change
5
+ rename_column(:uffizzi_core_containers, :name, :service_name)
6
+ end
7
+ end
@@ -10,41 +10,6 @@ module UffizziCore
10
10
  config.i18n.load_path += Dir["#{config.root}/config/locales/**/*.yml"]
11
11
  end
12
12
 
13
- config.uffizzi_core = ActiveSupport::OrderedOptions.new
14
-
15
- config.uffizzi_core.dependencies = {
16
- rbac: 'UffizziCore::Rbac::UserAccessService',
17
- }
18
-
19
- config.uffizzi_core.table_names = {
20
- accounts: :uffizzi_core_accounts,
21
- activity_items: :uffizzi_core_activity_items,
22
- builds: :uffizzi_core_builds,
23
- comments: :uffizzi_core_comments,
24
- compose_files: :uffizzi_core_compose_files,
25
- config_files: :uffizzi_core_config_files,
26
- container_config_files: :uffizzi_core_container_config_files,
27
- containers: :uffizzi_core_containers,
28
- coupons: :uffizzi_core_coupons,
29
- credentials: :uffizzi_core_credentials,
30
- deployments: :uffizzi_core_deployments,
31
- events: :uffizzi_core_events,
32
- invitations: :uffizzi_core_invitations,
33
- memberships: :uffizzi_core_memberships,
34
- payments: :uffizzi_core_payments,
35
- prices: :uffizzi_core_prices,
36
- products: :uffizzi_core_products,
37
- projects: :uffizzi_core_projects,
38
- ratings: :uffizzi_core_ratings,
39
- repos: :uffizzi_core_repos,
40
- roles: :uffizzi_core_roles,
41
- secrets: :uffizzi_core_secrets,
42
- templates: :uffizzi_core_templates,
43
- user_projects: :uffizzi_core_user_projects,
44
- users: :uffizzi_core_users,
45
- users_roles: :uffizzi_core_users_roles,
46
- }
47
-
48
13
  ActiveModelSerializers.config.adapter = :json
49
14
  end
50
15
  end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module UffizziCore
4
- VERSION = '0.1.7'
4
+ VERSION = '0.1.10'
5
5
  end
data/lib/uffizzi_core.rb CHANGED
@@ -27,5 +27,35 @@ require 'sidekiq'
27
27
  require 'virtus'
28
28
 
29
29
  module UffizziCore
30
- mattr_accessor :table_names, default: {}
30
+ mattr_accessor :dependencies, default: {
31
+ rbac: 'UffizziCore::Rbac::UserAccessService',
32
+ }
33
+ mattr_accessor :table_names, default: {
34
+ accounts: :uffizzi_core_accounts,
35
+ activity_items: :uffizzi_core_activity_items,
36
+ builds: :uffizzi_core_builds,
37
+ comments: :uffizzi_core_comments,
38
+ compose_files: :uffizzi_core_compose_files,
39
+ config_files: :uffizzi_core_config_files,
40
+ container_config_files: :uffizzi_core_container_config_files,
41
+ containers: :uffizzi_core_containers,
42
+ coupons: :uffizzi_core_coupons,
43
+ credentials: :uffizzi_core_credentials,
44
+ deployments: :uffizzi_core_deployments,
45
+ events: :uffizzi_core_events,
46
+ invitations: :uffizzi_core_invitations,
47
+ memberships: :uffizzi_core_memberships,
48
+ payments: :uffizzi_core_payments,
49
+ prices: :uffizzi_core_prices,
50
+ products: :uffizzi_core_products,
51
+ projects: :uffizzi_core_projects,
52
+ ratings: :uffizzi_core_ratings,
53
+ repos: :uffizzi_core_repos,
54
+ roles: :uffizzi_core_roles,
55
+ secrets: :uffizzi_core_secrets,
56
+ templates: :uffizzi_core_templates,
57
+ user_projects: :uffizzi_core_user_projects,
58
+ users: :uffizzi_core_users,
59
+ users_roles: :uffizzi_core_users_roles,
60
+ }
31
61
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: uffizzi_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.7
4
+ version: 0.1.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - Josh Thurman
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2022-05-24 00:00:00.000000000 Z
12
+ date: 2022-05-27 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: aasm
@@ -675,7 +675,7 @@ dependencies:
675
675
  - - ">="
676
676
  - !ruby/object:Gem::Version
677
677
  version: '0'
678
- description: uffizzi-core
678
+ description: uffizzi_core
679
679
  email:
680
680
  - info@uffizzi.com
681
681
  executables: []
@@ -901,6 +901,7 @@ files:
901
901
  - app/services/uffizzi_core/response_service.rb
902
902
  - app/services/uffizzi_core/template_service.rb
903
903
  - app/services/uffizzi_core/token_service.rb
904
+ - app/services/uffizzi_core/user_access_service.rb
904
905
  - app/services/uffizzi_core/user_generator_service.rb
905
906
  - app/utils/uffizzi_core/converters.rb
906
907
  - app/validators/uffizzi_core/email_validator.rb
@@ -919,6 +920,7 @@ files:
919
920
  - db/migrate/20220329123323_rename_project_secrets_to_secrets.rb
920
921
  - db/migrate/20220329124542_add_resource_to_secrets.rb
921
922
  - db/migrate/20220329143241_remove_project_ref_from_secrets.rb
923
+ - db/migrate/20220525113412_rename_name_to_uffizzi_containers.rb
922
924
  - db/seeds.rb
923
925
  - lib/tasks/uffizzi_core_tasks.rake
924
926
  - lib/uffizzi_core.rb
@@ -930,8 +932,8 @@ licenses:
930
932
  - Apache-2.0
931
933
  metadata:
932
934
  homepage_uri: https://uffizzi.com
933
- source_code_uri: https://github.com/UffizziCloud/uffizzi_core
934
- changelog_uri: https://github.com/UffizziCloud/uffizzi_core/blob/master/CHANGELOG.md
935
+ source_code_uri: https://github.com/UffizziCloud/uffizzi_app/tree/main/core
936
+ changelog_uri: https://github.com/UffizziCloud/uffizzi_app/blob/main/core/CHANGELOG.md
935
937
  post_install_message:
936
938
  rdoc_options: []
937
939
  require_paths:
@@ -950,5 +952,5 @@ requirements: []
950
952
  rubygems_version: 3.2.22
951
953
  signing_key:
952
954
  specification_version: 4
953
- summary: uffizzi-core
955
+ summary: uffizzi_core
954
956
  test_files: []