Skip to content

Commit 6b6ffb6

Browse files
philippthunphilippthun
committed
Remove Base namespace from config schemas
1 parent 7c22bc9 commit 6b6ffb6

File tree

14 files changed

+124
-243
lines changed

14 files changed

+124
-243
lines changed

‎lib/cloud_controller/config.rb‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
require 'cloud_controller/index_stopper'
66
require 'cloud_controller/backends/instances_reporters'
77
require 'repositories/service_event_repository'
8-
require 'cloud_controller/config_schemas/vms/api_schema'
9-
require 'cloud_controller/config_schemas/vms/clock_schema'
10-
require 'cloud_controller/config_schemas/vms/migrate_schema'
11-
require 'cloud_controller/config_schemas/vms/route_syncer_schema'
12-
require 'cloud_controller/config_schemas/vms/worker_schema'
13-
require 'cloud_controller/config_schemas/vms/deployment_updater_schema'
14-
require 'cloud_controller/config_schemas/vms/rotate_database_key_schema'
8+
require 'cloud_controller/config_schemas/api_schema'
9+
require 'cloud_controller/config_schemas/clock_schema'
10+
require 'cloud_controller/config_schemas/migrate_schema'
11+
require 'cloud_controller/config_schemas/route_syncer_schema'
12+
require 'cloud_controller/config_schemas/worker_schema'
13+
require 'cloud_controller/config_schemas/deployment_updater_schema'
14+
require 'cloud_controller/config_schemas/rotate_database_key_schema'
1515
require 'utils/hash_utils'
1616

1717
module VCAP::CloudController
@@ -28,10 +28,8 @@ def load_from_file(file_name, context: :api, secrets_hash: {})
2828
def config
2929
@instance
3030
end
31-
3231
def schema_class_for_context(context, _config)
33-
module_name = 'Vms'
34-
const_get("VCAP::CloudController::ConfigSchemas::#{module_name}::#{context.to_s.camelize}Schema")
32+
const_get("VCAP::CloudController::ConfigSchemas::#{context.to_s.camelize}Schema")
3533
end
3634

3735
def read_file(file_name)

lib/cloud_controller/config_schemas/base/api_schema.rb renamed to lib/cloud_controller/config_schemas/api_schema.rb

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
module VCAP::CloudController
55
module ConfigSchemas
6-
module Base
76
class ApiSchema < VCAP::Config
87
# rubocop:disable Metrics/BlockLength
98
define_schema do
@@ -122,13 +121,42 @@ class ApiSchema < VCAP::Config
122121
},
123122

124123
staging: {
124+
auth: {
125+
user: String,
126+
password: String
127+
},
125128
optional(:legacy_md5_buildpack_paths_enabled) => bool,
126129
timeout_in_seconds: Integer,
127130
minimum_staging_memory_mb: Integer,
128131
minimum_staging_disk_mb: Integer,
129132
minimum_staging_file_descriptor_limit: Integer
130133
},
131134

135+
diego: {
136+
bbs: {
137+
url: String,
138+
ca_file: String,
139+
cert_file: String,
140+
key_file: String,
141+
connect_timeout: Integer,
142+
send_timeout: Integer,
143+
receive_timeout: Integer
144+
},
145+
cc_uploader_url: String,
146+
file_server_url: String,
147+
lifecycle_bundles: Hash,
148+
droplet_destinations: Hash,
149+
pid_limit: Integer,
150+
use_privileged_containers_for_running: bool,
151+
use_privileged_containers_for_staging: bool,
152+
insecure_docker_registry_list: [String],
153+
docker_staging_stack: String,
154+
optional(:temporary_oci_buildpack_mode) => enum('oci-phase-1', NilClass),
155+
enable_declarative_asset_downloads: bool
156+
},
157+
158+
app_log_revision: bool,
159+
132160
index: Integer, # Component index (cc-0, cc-1, etc)
133161
name: String, # Component name (api_z1, api_z2)
134162
local_route: String, # If set, use this to determine the IP address that is returned in discovery messages
@@ -412,4 +440,3 @@ def configure_components(config)
412440
end
413441
end
414442
end
415-
end

lib/cloud_controller/config_schemas/base/clock_schema.rb renamed to lib/cloud_controller/config_schemas/clock_schema.rb

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
module VCAP::CloudController
44
module ConfigSchemas
5-
module Base
65
class ClockSchema < VCAP::Config
76
# rubocop:disable Metrics/BlockLength
87
define_schema do
@@ -66,9 +65,36 @@ class ClockSchema < VCAP::Config
6665
},
6766

6867
staging: {
68+
auth: {
69+
user: String,
70+
password: String
71+
},
6972
timeout_in_seconds: Integer
7073
},
7174

75+
diego: {
76+
bbs: {
77+
url: String,
78+
ca_file: String,
79+
cert_file: String,
80+
key_file: String,
81+
connect_timeout: Integer,
82+
send_timeout: Integer,
83+
receive_timeout: Integer
84+
},
85+
cc_uploader_url: String,
86+
file_server_url: String,
87+
lifecycle_bundles: Hash,
88+
droplet_destinations: Hash,
89+
pid_limit: Integer,
90+
use_privileged_containers_for_running: bool,
91+
use_privileged_containers_for_staging: bool,
92+
optional(:temporary_oci_buildpack_mode) => enum('oci-phase-1', NilClass),
93+
enable_declarative_asset_downloads: bool
94+
},
95+
96+
app_log_revision: bool,
97+
7298
index: Integer, # Component index (cc-0, cc-1, etc)
7399
name: String, # Component name (api_z1, api_z2)
74100
local_route: String, # If set, use this to determine the IP address that is returned in discovery messages
@@ -199,4 +225,3 @@ def configure_components(config); end
199225
end
200226
end
201227
end
202-
end

lib/cloud_controller/config_schemas/base/deployment_updater_schema.rb renamed to lib/cloud_controller/config_schemas/deployment_updater_schema.rb

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
module VCAP::CloudController
44
module ConfigSchemas
5-
module Base
65
class DeploymentUpdaterSchema < VCAP::Config
76
# rubocop:disable Metrics/BlockLength
87
define_schema do
@@ -75,9 +74,36 @@ class DeploymentUpdaterSchema < VCAP::Config
7574
},
7675

7776
staging: {
77+
auth: {
78+
user: String,
79+
password: String
80+
},
7881
timeout_in_seconds: Integer
7982
},
8083

84+
diego: {
85+
bbs: {
86+
url: String,
87+
ca_file: String,
88+
cert_file: String,
89+
key_file: String,
90+
connect_timeout: Integer,
91+
send_timeout: Integer,
92+
receive_timeout: Integer
93+
},
94+
cc_uploader_url: String,
95+
file_server_url: String,
96+
lifecycle_bundles: Hash,
97+
droplet_destinations: Hash,
98+
pid_limit: Integer,
99+
use_privileged_containers_for_running: bool,
100+
use_privileged_containers_for_staging: bool,
101+
optional(:temporary_oci_buildpack_mode) => enum('oci-phase-1', NilClass),
102+
enable_declarative_asset_downloads: bool
103+
},
104+
105+
app_log_revision: bool,
106+
81107
resource_pool: {
82108
maximum_size: Integer,
83109
minimum_size: Integer,
@@ -145,4 +171,3 @@ def configure_components(config); end
145171
end
146172
end
147173
end
148-
end

lib/cloud_controller/config_schemas/base/migrate_schema.rb renamed to lib/cloud_controller/config_schemas/migrate_schema.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
module VCAP::CloudController
44
module ConfigSchemas
5-
module Base
65
class MigrateSchema < VCAP::Config
76
define_schema do
87
{
@@ -47,4 +46,3 @@ def configure_components(_); end
4746
end
4847
end
4948
end
50-
end

lib/cloud_controller/config_schemas/vms/rotate_database_key_schema.rb renamed to lib/cloud_controller/config_schemas/rotate_database_key_schema.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
module VCAP::CloudController
44
module ConfigSchemas
5-
module Vms
65
class RotateDatabaseKeySchema < VCAP::Config
76
define_schema do
87
{
@@ -48,4 +47,3 @@ def configure_components(config); end
4847
end
4948
end
5049
end
51-
end

lib/cloud_controller/config_schemas/vms/route_syncer_schema.rb renamed to lib/cloud_controller/config_schemas/route_syncer_schema.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
module VCAP::CloudController
44
module ConfigSchemas
5-
module Vms
65
class RouteSyncerSchema < VCAP::Config
76
define_schema do
87
{
@@ -48,4 +47,3 @@ def configure_components(config); end
4847
end
4948
end
5049
end
51-
end

‎lib/cloud_controller/config_schemas/vms/api_schema.rb‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎lib/cloud_controller/config_schemas/vms/clock_schema.rb‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎lib/cloud_controller/config_schemas/vms/deployment_updater_schema.rb‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)