Skip to content

Add nil guard to ProcessModel.run_action_user #4879

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jochenehret wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add nil guard to ProcessModel.run_action_user #4879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/models/runtime/process_model.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ def started_command
def run_action_user
return user if user.present?

docker? ? docker_run_action_user : AppModel::DEFAULT_CONTAINER_USER
app&.docker? ? docker_run_action_user : AppModel::DEFAULT_CONTAINER_USER
end

def specified_or_detected_command
Expand Down
11 changes: 11 additions & 0 deletions spec/unit/models/runtime/process_model_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,6 +747,17 @@ def act_as_cf_admin
end
end
end

context 'when the associated app is nil' do
before do
process.app = nil
end

it 'does not raise an error and returns nil' do
expect { process.run_action_user }.not_to raise_error
expect(process.run_action_user).to eq('vcap')
end
end
end

describe '#specified_or_detected_command' do
Expand Down