fix(tests/NoCredentialsError): use aws_credentials fixture (#3131)

api/.env-ci

@@ -2,9 +2,3 @@ DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres
 ANALYTICS_DATABASE_URL=postgres://postgres:postgres@localhost:5432/analytics
 PYTEST_ADDOPTS=--cov . --cov-report xml -n auto --dist worksteal
 
-# used by moto # ref https://github.com/getmoto/moto/issues/5941
-AWS_ACCESS_KEY_ID=testing
-AWS_SECRET_ACCESS_KEY=testing
-AWS_SECURITY_TOKEN=testing
-AWS_SESSION_TOKEN=testing
-AWS_DEFAULT_REGION=eu-east-2

api/sse/sse_service.py

@@ -10,8 +10,6 @@
 from sse import tasks
 from sse.dataclasses import SSEAccessLogs
 
-s3 = boto3.resource("s3")
-
 
 def _sse_enabled(get_project_from_first_arg=lambda obj: obj.project):
     """
@@ -55,7 +53,8 @@ def send_environment_update_message_for_environment(environment):
 
 def stream_access_logs() -> Generator[SSEAccessLogs, None, None]:
     gpg = gnupg.GPG()
-    bucket = s3.Bucket(settings.AWS_SSE_LOGS_BUCKET_NAME)
+    bucket = boto3.resource("s3").Bucket(settings.AWS_SSE_LOGS_BUCKET_NAME)
+
     for log_file in bucket.objects.all():
         encrypted_body = log_file.get()["Body"].read()
         decrypted_body = gpg.decrypt(encrypted_body)

api/tests/unit/sse/test_sse_service.py

@@ -2,13 +2,11 @@
 import pytest
 from django.conf import settings
 from moto import mock_s3
-from moto.core import patch_resource
 from pytest_lazyfixture import lazy_fixture
 from pytest_mock import MockerFixture
 
 from sse.dataclasses import SSEAccessLogs
 from sse.sse_service import (
-    s3,
     send_environment_update_message_for_environment,
     send_environment_update_message_for_project,
     stream_access_logs,
@@ -107,7 +105,7 @@ def test_send_environment_update_message_for_environment_schedules_task_correctl
 
 
 @mock_s3
-def test_stream_access_logs(mocker: MockerFixture):
+def test_stream_access_logs(mocker: MockerFixture, aws_credentials: None) -> None:
     # Given - Some test data
     first_log = SSEAccessLogs("2023-11-27T06:42:47+0000", "key_one")
     second_log = SSEAccessLogs("2023-11-27T06:42:47+0000", "key_two")
@@ -123,10 +121,6 @@ def test_stream_access_logs(mocker: MockerFixture):
         f"{third_log.generated_at},{third_log.api_key}".encode()
     )
 
-    # patch the s3 resource because it was created before the mock_s3 decorator was applied
-    # ref: https://docs.getmoto.org/en/latest/docs/getting_started.html#patching-the-client-or-resource
-    patch_resource(s3)
-
     # Next, let's create a bucket
     bucket_name = settings.AWS_SSE_LOGS_BUCKET_NAME
     s3_client = boto3.client("s3", region_name="eu-west-2")