Skip to content

Commit 043c181

Browse files
committed
Copy process user when creating a deployment
1 parent 0ab3a64 commit 043c181

File tree

3 files changed

+15
-0
lines changed

3 files changed

+15
-0
lines changed

app/actions/deployment_create.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ def clone_existing_web_process(app, revision, process_instances)
113113
state: ProcessModel::STOPPED,
114114
instances: process_instances,
115115
command: command,
116+
user: web_process.user,
116117
memory: web_process.memory,
117118
file_descriptors: web_process.file_descriptors,
118119
disk_quota: web_process.disk_quota,

spec/request/processes_spec.rb

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
},
117117
'type' => 'web',
118118
'command' => '[PRIVATE DATA HIDDEN IN LISTS]',
119+
'user' => 'vcap',
119120
'instances' => 2,
120121
'memory_in_mb' => 1024,
121122
'disk_in_mb' => 1024,
@@ -155,6 +156,7 @@
155156
},
156157
'type' => 'worker',
157158
'command' => '[PRIVATE DATA HIDDEN IN LISTS]',
159+
'user' => 'vcap',
158160
'instances' => 1,
159161
'memory_in_mb' => 100,
160162
'disk_in_mb' => 200,
@@ -421,6 +423,7 @@
421423
'revision' => { 'data' => { 'guid' => revision.guid } }
422424
},
423425
'command' => 'rackup',
426+
'user' => 'vcap',
424427
'instances' => 2,
425428
'memory_in_mb' => 1024,
426429
'disk_in_mb' => 1024,
@@ -704,6 +707,7 @@
704707
},
705708
'type' => 'web',
706709
'command' => 'new command',
710+
'user' => 'vcap',
707711
'instances' => 2,
708712
'memory_in_mb' => 1024,
709713
'disk_in_mb' => 1024,
@@ -865,6 +869,7 @@
865869
'revision' => nil
866870
},
867871
'command' => 'rackup',
872+
'user' => 'vcap',
868873
'instances' => 5,
869874
'memory_in_mb' => 10,
870875
'disk_in_mb' => 20,
@@ -1230,6 +1235,7 @@
12301235
},
12311236
'type' => 'web',
12321237
'command' => '[PRIVATE DATA HIDDEN IN LISTS]',
1238+
'user' => 'vcap',
12331239
'instances' => 2,
12341240
'memory_in_mb' => 1024,
12351241
'disk_in_mb' => 1024,
@@ -1273,6 +1279,7 @@
12731279
},
12741280
'type' => 'worker',
12751281
'command' => '[PRIVATE DATA HIDDEN IN LISTS]',
1282+
'user' => 'vcap',
12761283
'instances' => 1,
12771284
'memory_in_mb' => 100,
12781285
'disk_in_mb' => 200,
@@ -1401,6 +1408,7 @@
14011408
},
14021409
'type' => 'web',
14031410
'command' => 'rackup',
1411+
'user' => 'vcap',
14041412
'instances' => 2,
14051413
'memory_in_mb' => 1024,
14061414
'disk_in_mb' => 1024,
@@ -1495,6 +1503,7 @@
14951503

14961504
update_request = {
14971505
command: 'new command',
1506+
user: 'containeruser',
14981507
health_check: {
14991508
type: 'http',
15001509
data: {
@@ -1523,6 +1532,7 @@
15231532
},
15241533
'type' => 'web',
15251534
'command' => 'new command',
1535+
'user' => 'containeruser',
15261536
'instances' => 2,
15271537
'memory_in_mb' => 1024,
15281538
'disk_in_mb' => 1024,
@@ -1570,6 +1580,7 @@
15701580

15711581
process.reload
15721582
expect(process.command).to eq('new command')
1583+
expect(process.user).to eq('containeruser')
15731584
expect(process.health_check_type).to eq('http')
15741585
expect(process.health_check_timeout).to eq(20)
15751586
expect(process.health_check_http_endpoint).to eq('/healthcheck')
@@ -1591,6 +1602,7 @@
15911602
'process_type' => 'web',
15921603
'request' => {
15931604
'command' => '[PRIVATE DATA HIDDEN]',
1605+
'user' => 'containeruser',
15941606
'health_check' => {
15951607
'type' => 'http',
15961608
'data' => {
@@ -1652,6 +1664,7 @@
16521664
'revision' => nil
16531665
},
16541666
'command' => 'rackup',
1667+
'user' => 'vcap',
16551668
'instances' => 5,
16561669
'memory_in_mb' => 10,
16571670
'disk_in_mb' => 20,

spec/unit/actions/deployment_create_spec.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ module VCAP::CloudController
181181
expect(deploying_web_process.state).to eq(ProcessModel::STARTED)
182182
expect(deploying_web_process.instances).to eq(1)
183183
expect(deploying_web_process.command).to eq(web_process.command)
184+
expect(deploying_web_process.user).to eq(web_process.user)
184185
expect(deploying_web_process.memory).to eq(web_process.memory)
185186
expect(deploying_web_process.file_descriptors).to eq(web_process.file_descriptors)
186187
expect(deploying_web_process.disk_quota).to eq(web_process.disk_quota)

0 commit comments

Comments
 (0)