uffizzi_core 2.4.2 → 2.4.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controller_modules/uffizzi_core/api/cli/v1/accounts_controller_module.rb +5 -0
- data/app/controllers/uffizzi_core/api/cli/v1/accounts_controller.rb +2 -0
- data/app/lib/uffizzi_core/concerns/models/deployment.rb +1 -1
- data/app/policies/uffizzi_core/api/cli/v1/accounts_policy.rb +4 -0
- data/app/serializers/uffizzi_core/api/cli/v1/account_serializer.rb +12 -1
- data/app/serializers/uffizzi_core/controller/create_cluster/cluster_serializer.rb +1 -1
- data/app/serializers/uffizzi_core/controller/update_cluster/cluster_serializer.rb +1 -1
- data/app/services/uffizzi_core/controller_service.rb +2 -2
- data/app/services/uffizzi_core/controller_settings_service.rb +6 -2
- data/config/routes.rb +1 -1
- data/lib/uffizzi_core/version.rb +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: fe4138139998d00870f71519ae7d1a04a0e6e67679f3f9bddbd7cd40bb12ac8b
|
4
|
+
data.tar.gz: f9a83213e9471f2521b8a49bb387357bd51c736a8b8a84bc93773d41c779cd17
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 50ca23705bf0074517eceaf9627b79a5f7b9bc1bd36d05badb516d88a8910b3b76d7abf34427cd75a78a6443e75a03cab6f4e1a6f6243d0778162d1a7f8b6dbb
|
7
|
+
data.tar.gz: a294d76a3709fb1030e3fb7acd6539d9b255b2543419fd6fc96903f95b093287a255a50929a2740d69f34db241159b50818b278b36a521f4618f1850a09ed905
|
@@ -3,6 +3,8 @@
|
|
3
3
|
# @resource Project
|
4
4
|
|
5
5
|
class UffizziCore::Api::Cli::V1::AccountsController < UffizziCore::Api::Cli::V1::ApplicationController
|
6
|
+
include UffizziCore::Api::Cli::V1::AccountsControllerModule
|
7
|
+
|
6
8
|
before_action :authorize_uffizzi_core_api_cli_v1_accounts
|
7
9
|
|
8
10
|
# Get accounts of current user
|
@@ -72,7 +72,7 @@ module UffizziCore::Concerns::Models::Deployment
|
|
72
72
|
end
|
73
73
|
|
74
74
|
def preview_url
|
75
|
-
managed_dns_zone = controller_settings_service.
|
75
|
+
managed_dns_zone = controller_settings_service.deployment_settings_by_deployment(self).managed_dns_zone
|
76
76
|
"#{subdomain}.#{managed_dns_zone}"
|
77
77
|
end
|
78
78
|
|
@@ -1,9 +1,20 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
class UffizziCore::Api::Cli::V1::AccountSerializer < UffizziCore::BaseSerializer
|
4
|
+
include UffizziCore::DependencyInjectionConcern
|
5
|
+
include_module_if_exists('UffizziCore::Api::Cli::V1::AccountSerializerModule')
|
6
|
+
|
4
7
|
type :account
|
5
8
|
|
6
9
|
has_many :projects
|
7
10
|
|
8
|
-
attributes :id, :name
|
11
|
+
attributes :id, :name, :api_url, :vclusters_controller_url
|
12
|
+
|
13
|
+
def api_url
|
14
|
+
Settings.domain
|
15
|
+
end
|
16
|
+
|
17
|
+
def vclusters_controller_url
|
18
|
+
controller_settings_service.vcluster_settings_by_account(object).url
|
19
|
+
end
|
9
20
|
end
|
@@ -7,7 +7,7 @@ class UffizziCore::Controller::CreateCluster::ClusterSerializer < UffizziCore::B
|
|
7
7
|
attributes :name, :manifest, :base_ingress_host, :distro, :image
|
8
8
|
|
9
9
|
def base_ingress_host
|
10
|
-
managed_dns_zone = controller_settings_service.
|
10
|
+
managed_dns_zone = controller_settings_service.vcluster_settings_by_vcluster(object).managed_dns_zone
|
11
11
|
|
12
12
|
[object.namespace, managed_dns_zone].join('.')
|
13
13
|
end
|
@@ -7,7 +7,7 @@ class UffizziCore::Controller::UpdateCluster::ClusterSerializer < UffizziCore::B
|
|
7
7
|
attributes :name, :manifest, :base_ingress_host
|
8
8
|
|
9
9
|
def base_ingress_host
|
10
|
-
managed_dns_zone = controller_settings_service.
|
10
|
+
managed_dns_zone = controller_settings_service.vcluster_settings_by_vcluster(object).managed_dns_zone
|
11
11
|
|
12
12
|
[object.namespace, managed_dns_zone].join('.')
|
13
13
|
end
|
@@ -145,9 +145,9 @@ class UffizziCore::ControllerService
|
|
145
145
|
def controller_client(deployable)
|
146
146
|
settings = case deployable
|
147
147
|
when UffizziCore::Deployment
|
148
|
-
controller_settings_service.
|
148
|
+
controller_settings_service.deployment_settings_by_deployment(deployable)
|
149
149
|
when UffizziCore::Cluster
|
150
|
-
controller_settings_service.
|
150
|
+
controller_settings_service.vcluster_settings_by_vcluster(deployable)
|
151
151
|
else
|
152
152
|
raise StandardError, "Deployable #{deployable.class.name} undefined"
|
153
153
|
end
|
@@ -2,11 +2,15 @@
|
|
2
2
|
|
3
3
|
class UffizziCore::ControllerSettingsService
|
4
4
|
class << self
|
5
|
-
def
|
5
|
+
def vcluster_settings_by_vcluster(_cluster)
|
6
6
|
Settings.vcluster_controller
|
7
7
|
end
|
8
8
|
|
9
|
-
def
|
9
|
+
def vcluster_settings_by_account(_account)
|
10
|
+
Settings.vcluster_controller
|
11
|
+
end
|
12
|
+
|
13
|
+
def deployment_settings_by_deployment(_deployment)
|
10
14
|
Settings.controller.deep_dup.tap do |s|
|
11
15
|
s.managed_dns_zone = Settings.app.managed_dns_zone
|
12
16
|
end
|
data/config/routes.rb
CHANGED
@@ -51,7 +51,7 @@ UffizziCore::Engine.routes.draw do
|
|
51
51
|
resource :session, only: ['create']
|
52
52
|
end
|
53
53
|
|
54
|
-
resources :accounts, only: ['show'], param: :name
|
54
|
+
resources :accounts, only: ['show', 'update'], param: :name
|
55
55
|
|
56
56
|
resources :accounts, only: ['index'] do
|
57
57
|
scope module: :accounts do
|
data/lib/uffizzi_core/version.rb
CHANGED
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: 2.4.
|
4
|
+
version: 2.4.4
|
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: 2023-12-
|
12
|
+
date: 2023-12-29 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: aasm
|
@@ -777,6 +777,7 @@ files:
|
|
777
777
|
- app/contexts/uffizzi_core/project/cluster_context.rb
|
778
778
|
- app/contexts/uffizzi_core/project_context.rb
|
779
779
|
- app/contexts/uffizzi_core/webhooks_context.rb
|
780
|
+
- app/controller_modules/uffizzi_core/api/cli/v1/accounts_controller_module.rb
|
780
781
|
- app/controller_modules/uffizzi_core/api/cli/v1/projects/clusters_controller_module.rb
|
781
782
|
- app/controller_modules/uffizzi_core/api/cli/v1/projects/deployments_controller_module.rb
|
782
783
|
- app/controller_modules/uffizzi_core/api/cli/v1/projects_controller_module.rb
|