Skip to content

Commit cf59208

Browse files
committed
Removed AWS auth related code
1 parent 003dd4d commit cf59208

File tree

8 files changed

+0
-104
lines changed

8 files changed

+0
-104
lines changed

scripts/aws-cleanup.sh

Lines changed: 0 additions & 18 deletions
This file was deleted.

scripts/populate_tox/tox.jinja

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -533,8 +533,6 @@ setenv =
533533
socket: TESTPATH=tests/integrations/socket
534534
535535
passenv =
536-
SENTRY_PYTHON_TEST_AWS_ACCESS_KEY_ID
537-
SENTRY_PYTHON_TEST_AWS_SECRET_ACCESS_KEY
538536
SENTRY_PYTHON_TEST_POSTGRES_HOST
539537
SENTRY_PYTHON_TEST_POSTGRES_USER
540538
SENTRY_PYTHON_TEST_POSTGRES_PASSWORD

scripts/split_tox_gh_actions/split_tox_gh_actions.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,6 @@
4343
"clickhouse_driver",
4444
}
4545

46-
FRAMEWORKS_NEEDING_AWS = {
47-
"aws_lambda",
48-
}
49-
50-
FRAMEWORKS_NEEDING_GITHUB_SECRETS = {
51-
"aws_lambda",
52-
}
53-
5446
# Frameworks grouped here will be tested together to not hog all GitHub runners.
5547
# If you add or remove a group, make sure to git rm the generated YAML file as
5648
# well.
@@ -292,13 +284,9 @@ def render_template(group, frameworks, py_versions_pinned, py_versions_latest):
292284
"group": group,
293285
"frameworks": frameworks,
294286
"categories": sorted(categories),
295-
"needs_aws_credentials": bool(set(frameworks) & FRAMEWORKS_NEEDING_AWS),
296287
"needs_clickhouse": bool(set(frameworks) & FRAMEWORKS_NEEDING_CLICKHOUSE),
297288
"needs_postgres": bool(set(frameworks) & FRAMEWORKS_NEEDING_POSTGRES),
298289
"needs_redis": bool(set(frameworks) & FRAMEWORKS_NEEDING_REDIS),
299-
"needs_github_secrets": bool(
300-
set(frameworks) & FRAMEWORKS_NEEDING_GITHUB_SECRETS
301-
),
302290
"py_versions": {
303291
category: [f'"{version}"' for version in _normalize_py_versions(versions)]
304292
for category, versions in py_versions.items()

scripts/split_tox_gh_actions/templates/base.jinja

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,7 @@ on:
1313
- release/**
1414
- potel-base
1515

16-
{% if needs_github_secrets %}
17-
# XXX: We are using `pull_request_target` instead of `pull_request` because we want
18-
# this to run on forks with access to the secrets necessary to run the test suite.
19-
# Prefer to use `pull_request` when possible.
20-
pull_request_target:
21-
types: [labeled, opened, reopened, synchronize]
22-
{% else %}
2316
pull_request:
24-
{% endif %}
2517

2618
# Cancel in progress workflows on pull_requests.
2719
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
@@ -31,27 +23,13 @@ concurrency:
3123

3224
permissions:
3325
contents: read
34-
{% if needs_github_secrets %}
35-
# `write` is needed to remove the `Trigger: tests using secrets` label
36-
pull-requests: write
37-
{% endif %}
3826

3927
env:
40-
{% if needs_aws_credentials %}
41-
{% raw %}
42-
SENTRY_PYTHON_TEST_AWS_ACCESS_KEY_ID: ${{ secrets.SENTRY_PYTHON_TEST_AWS_ACCESS_KEY_ID }}
43-
SENTRY_PYTHON_TEST_AWS_SECRET_ACCESS_KEY: ${{ secrets.SENTRY_PYTHON_TEST_AWS_SECRET_ACCESS_KEY }}
44-
{% endraw %}
45-
{% endif %}
4628
BUILD_CACHE_KEY: {% raw %}${{ github.sha }}{% endraw %}
4729
CACHED_BUILD_PATHS: |
4830
{% raw %}${{ github.workspace }}/dist-serverless{% endraw %}
4931

5032
jobs:
51-
{% if needs_github_secrets %}
52-
{% include "check_permissions.jinja" %}
53-
{% endif %}
54-
5533
{% for category in categories %}
5634
{% include "test_group.jinja" %}
5735
{% endfor %}

scripts/split_tox_gh_actions/templates/check_permissions.jinja

Lines changed: 0 additions & 30 deletions
This file was deleted.

scripts/split_tox_gh_actions/templates/test_group.jinja

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
1313
os: [ubuntu-20.04]
1414

15-
{% if needs_github_secrets %}
16-
needs: check-permissions
17-
{% endif %}
18-
1915
{% if needs_postgres %}
2016
services:
2117
postgres:
@@ -40,12 +36,6 @@
4036

4137
steps:
4238
- uses: actions/[email protected]
43-
{% if needs_github_secrets %}
44-
{% raw %}
45-
with:
46-
ref: ${{ github.event.pull_request.head.sha || github.ref }}
47-
{% endraw %}
48-
{% endif %}
4939
- uses: actions/setup-python@v5
5040
with:
5141
python-version: {% raw %}${{ matrix.python-version }}{% endraw %}

tests/integrations/aws_lambda/client.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
import os
2-
3-
AWS_CREDENTIALS = {
4-
"aws_access_key_id": os.environ["SENTRY_PYTHON_TEST_AWS_ACCESS_KEY_ID"],
5-
"aws_secret_access_key": os.environ["SENTRY_PYTHON_TEST_AWS_SECRET_ACCESS_KEY"],
6-
}
7-
8-
91
# This is for inspecting new Python runtime environments in AWS Lambda
102
# If you need to debug a new runtime, use this REPL to run arbitrary Python or bash commands
113
# in that runtime in a Lambda function:

tox.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -798,8 +798,6 @@ setenv =
798798
socket: TESTPATH=tests/integrations/socket
799799

800800
passenv =
801-
SENTRY_PYTHON_TEST_AWS_ACCESS_KEY_ID
802-
SENTRY_PYTHON_TEST_AWS_SECRET_ACCESS_KEY
803801
SENTRY_PYTHON_TEST_POSTGRES_HOST
804802
SENTRY_PYTHON_TEST_POSTGRES_USER
805803
SENTRY_PYTHON_TEST_POSTGRES_PASSWORD

0 commit comments

Comments
 (0)