diff --git a/src/deadline_test_fixtures/__init__.py b/src/deadline_test_fixtures/__init__.py index 83ecc60..6efc701 100644 --- a/src/deadline_test_fixtures/__init__.py +++ b/src/deadline_test_fixtures/__init__.py @@ -18,10 +18,14 @@ BootstrapResources, DeadlineResources, bootstrap_resources, + codeartifact, deadline_client, deadline_resources, deploy_job_attachment_resources, + install_service_model, + service_model, worker, + worker_config, ) from .job_attachment_manager import JobAttachmentManager from .models import ( @@ -38,9 +42,6 @@ "CommandResult", "DeadlineResources", "DeadlineClient", - "DeadlineScaffolding", - "DeadlineSubmitter", - "DeadlineJob", "DeadlineWorker", "DeadlineWorkerConfiguration", "DockerContainerWorker", @@ -53,14 +54,17 @@ "PipInstall", "S3Object", "ServiceModel", - "StubDeadlineClient", "Queue", "QueueFleetAssociation", "TaskStatus", "bootstrap_resources", + "codeartifact", "deadline_client", "deadline_resources", "deploy_job_attachment_resources", + "install_service_model", + "service_model", "version", "worker", + "worker_config", ] diff --git a/src/deadline_test_fixtures/cloudformation/worker_bootstrap_stack.py b/src/deadline_test_fixtures/cloudformation/worker_bootstrap_stack.py index 448a882..c480697 100644 --- a/src/deadline_test_fixtures/cloudformation/worker_bootstrap_stack.py +++ b/src/deadline_test_fixtures/cloudformation/worker_bootstrap_stack.py @@ -150,8 +150,12 @@ def __init__( "Action": [ "s3:HeadObject", "s3:GetObject", + "s3:ListBucket", + ], + "Resource": [ + self.bootstrap_bucket.arn, + self.bootstrap_bucket.arn_for_objects(), ], - "Resource": [self.bootstrap_bucket.arn_for_objects()], }, # Allows access to code artifact { diff --git a/src/deadline_test_fixtures/deadline/worker.py b/src/deadline_test_fixtures/deadline/worker.py index aa67b2e..0468f61 100644 --- a/src/deadline_test_fixtures/deadline/worker.py +++ b/src/deadline_test_fixtures/deadline/worker.py @@ -318,7 +318,7 @@ def _start_worker_agent(self) -> None: # pragma: no cover 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.user}; . .venv/bin/activate; {configure_worker_command(config=self.configuration)}" + f"cd /home/{self.configuration.user}; . .venv/bin/activate; AWS_DEFAULT_REGION={self.configuration.region} {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")