Skip to content

Commit 242f0d6

Browse files
committed
Rename allowed_process_users to additional_allowed_process_users
1 parent 893c73f commit 242f0d6

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

app/models/runtime/process_model.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ def open_ports
573573
private
574574

575575
def permitted_users
576-
Set.new([DEFAULT_USER]) + Config.config.get(:allowed_process_users)
576+
Set.new([DEFAULT_USER]) + Config.config.get(:additional_allowed_process_users)
577577
end
578578

579579
def docker_run_action_user

config/cloud_controller.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ maximum_app_disk_in_mb: 2048
6767
max_retained_deployments_per_app: 100
6868
max_retained_builds_per_app: 100
6969
max_retained_revisions_per_app: 100
70-
allowed_process_users: ['ContainerUser']
70+
additional_allowed_process_users: ['ContainerUser']
7171

7272
broker_client_default_async_poll_interval_seconds: 60
7373
broker_client_max_async_poll_duration_minutes: 10080

lib/cloud_controller/config_schemas/base/api_schema.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class ApiSchema < VCAP::Config
4545
maximum_app_disk_in_mb: Integer,
4646
default_health_check_timeout: Integer,
4747
maximum_health_check_timeout: Integer,
48-
optional(:allowed_process_users) => Array,
48+
optional(:additional_allowed_process_users) => Array,
4949

5050
instance_file_descriptor_limit: Integer,
5151

lib/cloud_controller/config_schemas/base/clock_schema.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ class ClockSchema < VCAP::Config
157157
max_retained_deployments_per_app: Integer,
158158
max_retained_builds_per_app: Integer,
159159
max_retained_revisions_per_app: Integer,
160-
optional(:allowed_process_users) => Array,
160+
optional(:additional_allowed_process_users) => Array,
161161

162162
diego_sync: { frequency_in_seconds: Integer },
163163

lib/cloud_controller/config_schemas/base/deployment_updater_schema.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class DeploymentUpdaterSchema < VCAP::Config
5858
default_app_disk_in_mb: Integer,
5959
maximum_app_disk_in_mb: Integer,
6060
instance_file_descriptor_limit: Integer,
61-
optional(:allowed_process_users) => Array,
61+
optional(:additional_allowed_process_users) => Array,
6262

6363
deployment_updater: {
6464
update_frequency_in_seconds: Integer,

lib/cloud_controller/config_schemas/base/worker_schema.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ class WorkerSchema < VCAP::Config
167167
maximum_app_disk_in_mb: Integer,
168168
default_app_log_rate_limit_in_bytes_per_second: Integer,
169169
default_app_ssh_access: bool,
170-
optional(:allowed_process_users) => Array,
170+
optional(:additional_allowed_process_users) => Array,
171171

172172
jobs: {
173173
global: {

spec/unit/models/runtime/process_model_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,12 +337,12 @@ def expect_no_validator(validator_class)
337337
let(:process_user) { 'vcap' }
338338

339339
before do
340-
TestConfig.override(allowed_process_users: %w[some_user some_other_user])
340+
TestConfig.override(additional_allowed_process_users: %w[some_user some_other_user])
341341
end
342342

343343
context 'when user is vcap' do
344344
before do
345-
TestConfig.override(allowed_process_users: [])
345+
TestConfig.override(additional_allowed_process_users: [])
346346
end
347347

348348
it 'is always permitted' do

0 commit comments

Comments
 (0)