Skip to content

Commit

Permalink
bug-1908018: drop support for AWS
Browse files Browse the repository at this point in the history
  • Loading branch information
relud committed Jul 15, 2024
1 parent c6a973f commit bf11540
Show file tree
Hide file tree
Showing 39 changed files with 81 additions and 2,251 deletions.
15 changes: 0 additions & 15 deletions .github/workflows/build-and-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions antenna/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -78,7 +77,6 @@ def configure_sentry(app_config):
default_integrations=False,
integrations=[
AtexitIntegration(),
Boto3Integration(),
ExcepthookIntegration(),
DedupeIntegration(),
StdlibIntegration(),
Expand Down
2 changes: 1 addition & 1 deletion antenna/crashmover.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class CrashMover:
For example::
CRASHMOVER_CRASHSTORAGE_CLASS=antenna.ext.s3.crashstorage.S3CrashStorage
CRASHMOVER_CRASHSTORAGE_CLASS=antenna.ext.gcs.crashstorage.GcsCrashStorage
"""
Expand Down
2 changes: 1 addition & 1 deletion antenna/ext/fs/crashstorage.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
::
Expand Down
3 changes: 0 additions & 3 deletions antenna/ext/s3/__init__.py

This file was deleted.

248 changes: 0 additions & 248 deletions antenna/ext/s3/connection.py

This file was deleted.

Loading

0 comments on commit bf11540

Please sign in to comment.