Skip to content
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

Jump to bottom

feat: linux ec2-based tests test installer-based user creation #138

Merged
merged 2 commits into from
Aug 13, 2024
Merged

feat: linux ec2-based tests test installer-based user creation #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1997d60
feat: linux ec2-based tests test installer-based user creation
ddneilson Aug 13, 2024
05a39e3
fix f-string
ddneilson Aug 13, 2024
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
43 changes: 23 additions & 20 deletions src/deadline_test_fixtures/deadline/worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,13 +583,14 @@ class PosixInstanceWorker(EC2InstanceWorker):
def ssm_document_name(self) -> str:
return "AWS-RunShellScript"

def send_command(self, command: str) -> CommandResult:
return super().send_command("set -eou pipefail; " + command)

def _start_worker_agent(self) -> None:
assert self.instance_id
LOG.info(f"Sending SSM command to configure Worker agent on instance {self.instance_id}")

cmd_result = self.send_command(
f"cd /home/{self.configuration.agent_user}; . .venv/bin/activate; AWS_DEFAULT_REGION={self.configuration.region} {self.configure_worker_command(config=self.configuration)}"
)
cmd_result = self.send_command(self.configure_worker_command(config=self.configuration))
assert cmd_result.exit_code == 0, f"Failed to configure Worker agent: {cmd_result}"
LOG.info("Successfully configured Worker agent")

Expand Down Expand Up @@ -617,6 +618,8 @@ def configure_worker_command(
"""Get the command to configure the Worker. This must be run as root."""

cmds = [
"source /opt/deadline/worker/bin/activate",
f"AWS_DEFAULT_REGION={self.configuration.region}",
config.worker_agent_install.install_command_for_linux,
*(config.pre_install_commands or []),
# fmt: off
Expand All @@ -633,8 +636,22 @@ def configure_worker_command(
+ f"{'--start ' if config.start_service else ''}"
),
# fmt: on
f"runuser --login {self.configuration.agent_user} --command 'echo \"source /opt/deadline/worker/bin/activate\" >> $HOME/.bashrc'",
]

for job_user in self.configuration.job_users:
cmds.append(f"usermod -a -G {job_user.group} {self.configuration.agent_user}")

sudoer_rule_users = ",".join(
[
self.configuration.agent_user,
*[job_user.user for job_user in self.configuration.job_users],
]
)
cmds.append(
f'echo "{self.configuration.agent_user} ALL=({sudoer_rule_users}) NOPASSWD: ALL" > /etc/sudoers.d/{self.configuration.agent_user}'
)

if config.service_model_path:
cmds.append(
f"runuser -l {config.agent_user} -s /bin/bash -c 'aws configure add-model --service-model file://{config.service_model_path}'"
Expand Down Expand Up @@ -666,39 +683,25 @@ def userdata(self, s3_files) -> str:

if s3_files:
copy_s3_command = " && ".join(
[
f"aws s3 cp {s3_uri} {dst} && chown {self.configuration.agent_user} {dst}"
for s3_uri, dst in s3_files
]
[f"aws s3 cp {s3_uri} {dst} && chmod o+rx {dst}" for s3_uri, dst in s3_files]
)
for job_user in self.configuration.job_users:
job_users_cmds.append(f"groupadd {job_user.group}")
job_users_cmds.append(
f"useradd --create-home --system --shell=/bin/bash --groups={self.configuration.job_user_group} -g {job_user.group} {job_user.user}"
)
job_users_cmds.append(f"usermod -a -G {job_user.group} {self.configuration.agent_user}")

sudoer_rule_users = ",".join(
[
self.configuration.agent_user,
*[job_user.user for job_user in self.configuration.job_users],
]
)
job_users_cmds.append(
f'echo "{self.configuration.agent_user} ALL=({sudoer_rule_users}) NOPASSWD: ALL" > /etc/sudoers.d/{self.configuration.agent_user}'
)

configure_job_users = "\n".join(job_users_cmds)

userdata = f"""#!/bin/bash
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
set -x
groupadd --system {self.configuration.job_user_group}
useradd --create-home --system --shell=/bin/bash --groups={self.configuration.job_user_group} {self.configuration.agent_user}
{configure_job_users}
{copy_s3_command}
runuser --login {self.configuration.agent_user} --command 'python3 -m venv $HOME/.venv && echo ". $HOME/.venv/bin/activate" >> $HOME/.bashrc'
mkdir /opt/deadline
python3 -m venv /opt/deadline/worker
"""

return userdata
Expand Down
6 changes: 3 additions & 3 deletions test/unit/deadline/test_worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ def test_sends_command(self, worker: PosixInstanceWorker) -> None:
send_command_spy.assert_called_once_with(
InstanceIds=[worker.instance_id],
DocumentName="AWS-RunShellScript",
Parameters={"commands": [cmd]},
Parameters={"commands": ["set -eou pipefail; " + cmd]},
)

def test_retries_when_instance_not_ready(self, worker: PosixInstanceWorker) -> None:
Expand Down Expand Up @@ -323,7 +323,7 @@ def side_effect(*args, **kwargs):
call(
InstanceIds=[worker.instance_id],
DocumentName="AWS-RunShellScript",
Parameters={"commands": [cmd]},
Parameters={"commands": ["set -eou pipefail; " + cmd]},
)
]
* 2
Expand Down Expand Up @@ -351,7 +351,7 @@ def test_raises_any_other_error(self, worker: PosixInstanceWorker) -> None:
mock_send_command.assert_called_once_with(
InstanceIds=[worker.instance_id],
DocumentName="AWS-RunShellScript",
Parameters={"commands": [cmd]},
Parameters={"commands": ["set -eou pipefail; " + cmd]},
)

@pytest.mark.parametrize(
Expand Down