Address PR feedback

Author: tcdowney

app/models/runtime/app_model.rb

@@ -7,7 +7,7 @@ module VCAP::CloudController
   class AppModel < Sequel::Model(:apps)
     include Serializer
     APP_NAME_REGEX = /\A[[:alnum:][:punct:][:print:]]+\Z/
-    DEFAULT_USER = 'vcap'.freeze
+    DEFAULT_CONTAINER_USER = 'vcap'.freeze
 
     many_to_many :routes, join_table: :route_mappings, left_key: :app_guid, left_primary_key: :guid, right_primary_key: :guid, right_key: :route_guid
     one_to_many :route_mappings, class: 'VCAP::CloudController::RouteMappingModel', key: :app_guid, primary_key: :guid

app/models/runtime/process_model.rb

@@ -395,7 +395,7 @@ def started_command
     def run_action_user
       return user if user.present?
 
-      docker? ? docker_run_action_user : AppModel::DEFAULT_USER
+      docker? ? docker_run_action_user : AppModel::DEFAULT_CONTAINER_USER
     end
 
     def specified_or_detected_command
@@ -572,11 +572,11 @@ def open_ports
     private
 
     def permitted_users
-      Set.new([AppModel::DEFAULT_USER]) + Config.config.get(:additional_allowed_process_users)
+      Set.new([AppModel::DEFAULT_CONTAINER_USER]) + Config.config.get(:additional_allowed_process_users)
     end
 
     def docker_run_action_user
-      desired_droplet.docker_user.presence || AppModel::DEFAULT_USER
+      desired_droplet.docker_user.presence || AppModel::DEFAULT_CONTAINER_USER
     end
 
     def non_unique_process_types

app/models/runtime/task_model.rb

@@ -47,19 +47,19 @@ def after_destroy
     def run_action_user
       return user if user.present?
 
-      docker? ? docker_run_action_user : AppModel::DEFAULT_USER
+      docker? ? docker_run_action_user : AppModel::DEFAULT_CONTAINER_USER
     end
 
     delegate :docker?, to: :droplet
 
     private
 
     def permitted_users
-      Set.new([AppModel::DEFAULT_USER]) + Config.config.get(:additional_allowed_process_users)
+      Set.new([AppModel::DEFAULT_CONTAINER_USER]) + Config.config.get(:additional_allowed_process_users)
     end
 
     def docker_run_action_user
-      droplet.docker_user.presence || AppModel::DEFAULT_USER
+      droplet.docker_user.presence || AppModel::DEFAULT_CONTAINER_USER
     end
 
     def running_state?

docs/v3/source/includes/resources/tasks/_create.md.erb

@@ -49,7 +49,7 @@ Name | Type | Description
 | Name                                        | Type                                | Description                                                  | Default                                                              |
 |---------------------------------------------|-------------------------------------|--------------------------------------------------------------|----------------------------------------------------------------------|
 | **name**                                    | _string_                            | Name of the task                                             | auto-generated                                                       |
-| **user**                                    | _string_                            | User used to run the task                                    | "vcap"                                                               |
+| **user**                                    | _string_                            | OS user used to run the task in the runtime                  | "vcap"                                                               |
 | **disk_in_mb**<sup>[1]</sup>                | _integer_                           | Amount of disk to allocate for the task in MB                | operator-configured `default_app_disk_in_mb`                         |
 | **memory_in_mb**<sup>[1]</sup>              | _integer_                           | Amount of memory to allocate for the task in MB              | operator-configured `default_app_memory`                             |
 | **log_rate_limit_per_second**<sup>[1]</sup> | _integer_                           | Amount of log rate to allocate for the task in bytes         | operator-configured `default_app_log_rate_limit_in_bytes_per_second` |

docs/v3/source/includes/resources/tasks/_object.md.erb

@@ -15,7 +15,7 @@ Name | Type | Description
 **sequence_id** | _integer_ | User-facing id of the task; this number is unique for every task associated with a given app
 **name** | _string_ | Name of the task
 **command** | _string_ | Command that will be executed; this field may be excluded based on a user's role
-**user** | _string_ or _null_ | The user used to run the task
+**user** | _string_ or _null_ | The OS user used to run the task in the runtime
 **state** | _string_ | State of the task Possible states are `PENDING`, `RUNNING`, `SUCCEEDED`, `CANCELING`, and `FAILED`
 **memory_in_mb** | _integer_ | Amount of memory to allocate for the task in MB
 **disk_in_mb** | _integer_ | Amount of disk to allocate for the task in MB

spec/unit/models/runtime/droplet_model_spec.rb

@@ -356,7 +356,7 @@ module VCAP::CloudController
       end
 
       context 'when the droplet belongs to a Docker lifecycle app' do
-        let(:droplet_execution_metadata) { '{"entrypoint":["/cnb/lifecycle/launcher"],"user":"cnb"}' }
+        let(:droplet_execution_metadata) { '{"entrypoint":["/image-entrypoint.sh"],"user":"cnb"}' }
         let(:droplet_model) { DropletModel.make(:docker, execution_metadata: droplet_execution_metadata) }
 
         context 'when the droplet execution metadata specifies a user' do
@@ -366,7 +366,7 @@ module VCAP::CloudController
         end
 
         context 'when the droplet execution metadata DOES NOT specify a user' do
-          let(:droplet_execution_metadata) { '{"entrypoint":["/cnb/lifecycle/launcher"]}' }
+          let(:droplet_execution_metadata) { '{"entrypoint":["/image-entrypoint.sh"]}' }
 
           it 'defaults the user to root' do
             expect(droplet_model.docker_user).to eq('root')

spec/unit/models/runtime/process_model_spec.rb

@@ -679,7 +679,7 @@ def act_as_cf_admin
 
       context 'when the process belongs to a Docker lifecycle app' do
         subject(:process) { ProcessModelFactory.make({ docker_image: 'example.com/image' }) }
-        let(:droplet_execution_metadata) { '{"entrypoint":["/cnb/lifecycle/launcher"],"user":"cnb"}' }
+        let(:droplet_execution_metadata) { '{"entrypoint":["/image-entrypoint.sh"],"user":"cnb"}' }
 
         before do
           process.desired_droplet.update(execution_metadata: droplet_execution_metadata)
@@ -704,7 +704,7 @@ def act_as_cf_admin
         end
 
         context 'when the droplet execution metadata DOES NOT specify a user' do
-          let(:droplet_execution_metadata) { '{"entrypoint":["/cnb/lifecycle/launcher"]}' }
+          let(:droplet_execution_metadata) { '{"entrypoint":["/image-entrypoint.sh"]}' }
 
           it 'defaults the user to root' do
             expect(process.run_action_user).to eq('root')

spec/unit/models/runtime/task_model_spec.rb

@@ -172,7 +172,7 @@ module VCAP::CloudController
         let(:parent_app) { AppModel.make(:docker) }
         let(:task) { TaskModel.make(app: parent_app, droplet: droplet, state: TaskModel::SUCCEEDED_STATE) }
         let(:droplet) { DropletModel.make(:docker) }
-        let(:droplet_execution_metadata) { '{"entrypoint":["/cnb/lifecycle/launcher"],"user":"cnb"}' }
+        let(:droplet_execution_metadata) { '{"entrypoint":["/image-entrypoint.sh"],"user":"cnb"}' }
 
         before do
           task.droplet.update(execution_metadata: droplet_execution_metadata)
@@ -195,7 +195,7 @@ module VCAP::CloudController
         end
 
         context 'when the droplet execution metadata DOES NOT specify a user' do
-          let(:droplet_execution_metadata) { '{"entrypoint":["/cnb/lifecycle/launcher"]}' }
+          let(:droplet_execution_metadata) { '{"entrypoint":["/image-entrypoint.sh"]}' }
 
           it 'defaults the user to root' do
             expect(task.run_action_user).to eq('root')