bug-1908018: drop support for AWS

mozilla-services · Jul 15, 2024 · 13bff04 · 13bff04
1 parent c6a973f
commit 13bff04
Show file tree

Hide file tree

Showing 39 changed files with 79 additions and 2,237 deletions.
diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
@@ -47,27 +47,12 @@ jobs:
       - name: Run tests
         run: |
           make my.env
-          docker compose up --detach --no-color \
-              localstack \
-              statsd \
-              fakesentry
           docker compose run --rm ci shell ./bin/run_tests.sh
       - name: Run systemtest
         run: |
           docker compose run --rm ci-web shell ./bin/run_setup.sh
           docker compose up --detach --wait --wait-timeout=10 ci-web
           docker compose run --rm ci-web shell bash -c 'cd systemtest && NGINX_TESTS=0 POST_CHECK=1 HOST=http://ci-web:8000 pytest -vv'
-      - name: Run systemtest with pubsub and gcs
-        run: |
-          echo 'CRASHMOVER_CRASHPUBLISH_CLASS=antenna.ext.pubsub.crashpublish.PubSubCrashPublish' >> my.env
-          echo 'CRASHMOVER_CRASHSTORAGE_CLASS=antenna.ext.gcs.crashstorage.GcsCrashStorage' >> my.env
-          docker compose run --rm ci-web shell ./bin/run_setup.sh
-          docker compose up --detach --wait --wait-timeout=10 ci-web
-          # Use -m "not aws" to select gcp and unmarked tests
-          docker compose run --rm ci-web shell bash -c 'cd systemtest && NGINX_TESTS=0 POST_CHECK=1 HOST=http://ci-web:8000 pytest -vv -m "not aws"'
-          # remove config on last two lines
-          sed '$d' -i my.env
-          sed '$d' -i my.env
 
       - name: Set Docker image tag to "latest" for updates of the main branch
         if: github.ref == 'refs/heads/main'

diff --git a/Makefile b/Makefile
@@ -53,7 +53,7 @@ my.env:
 .PHONY: build
 build: my.env  ## | Build docker images.
 	${DC} --progress plain build ${DOCKER_BUILD_OPTS} --build-arg userid=${ANTENNA_UID} --build-arg groupid=${ANTENNA_GID} deploy-base
-	${DC} --progress plain build fakesentry gcs-emulator localstack statsd
+	${DC} --progress plain build fakesentry gcs-emulator statsd
 	touch .docker-build
 
 .PHONY: setup

diff --git a/antenna/app.py b/antenna/app.py
@@ -20,7 +20,6 @@
 from fillmore.scrubber import Scrubber, Rule, SCRUB_RULES_DEFAULT
 import sentry_sdk
 from sentry_sdk.integrations.atexit import AtexitIntegration
-from sentry_sdk.integrations.boto3 import Boto3Integration
 from sentry_sdk.integrations.dedupe import DedupeIntegration
 from sentry_sdk.integrations.excepthook import ExcepthookIntegration
 from sentry_sdk.integrations.modules import ModulesIntegration
@@ -78,7 +77,6 @@ def configure_sentry(app_config):
         default_integrations=False,
         integrations=[
             AtexitIntegration(),
-            Boto3Integration(),
             ExcepthookIntegration(),
             DedupeIntegration(),
             StdlibIntegration(),

diff --git a/antenna/crashmover.py b/antenna/crashmover.py
@@ -49,7 +49,7 @@ class CrashMover:
 
     For example::
 
-        CRASHMOVER_CRASHSTORAGE_CLASS=antenna.ext.s3.crashstorage.S3CrashStorage
+        CRASHMOVER_CRASHSTORAGE_CLASS=antenna.ext.gcs.crashstorage.GcsCrashStorage
 
 
     """

diff --git a/antenna/ext/fs/crashstorage.py b/antenna/ext/fs/crashstorage.py
@@ -21,7 +21,7 @@ class FSCrashStorage(CrashStorageBase):
     """Save raw crash files to the file system.
 
     This generates a tree something like this which mirrors what we do
-    on S3:
+    on GCS:
 
     ::
 

diff --git a/antenna/ext/s3/__init__.py b/antenna/ext/s3/__init__.py
diff --git a/antenna/ext/s3/connection.py b/antenna/ext/s3/connection.py