Skip to content

Reassert idp-sql and django tests #7779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 20, 2022
Merged

Reassert idp-sql and django tests #7779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c2a769c
Move idp-sql and django tests to confirm with standard
glasnt Apr 11, 2022
f05a6a9
Correct relative filenames
glasnt Apr 11, 2022
ecac5a7
Correct another filename
glasnt Apr 11, 2022
d1ed8c6
Merge branch 'main' into topic/tests
Apr 12, 2022
24952eb
Merge branch 'main' into topic/tests
glasnt Apr 19, 2022
2346473
Fix type checking for middleware.py
glasnt Apr 19, 2022
394be9f
Merge branch 'main' into topic/tests
leahecole Apr 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions run/django/test/e2e_test.py → run/django/e2e_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def deployed_service() -> str:
"--project",
GOOGLE_CLOUD_PROJECT,
"--config",
"./test/e2e_test_setup.yaml",
"./e2e_test_setup.yaml",
"--substitutions",
]
+ substitutions
Expand Down Expand Up @@ -124,7 +124,7 @@ def deployed_service() -> str:
"--project",
GOOGLE_CLOUD_PROJECT,
"--config",
"./test/e2e_test_cleanup.yaml",
"./e2e_test_cleanup.yaml",
"--substitutions",
]
+ substitutions
Expand Down
14 changes: 7 additions & 7 deletions run/django/test/e2e_test_cleanup.yaml → run/django/e2e_test_cleanup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,25 @@ steps:
args:
- "-ec"
- |
./test/retry.sh "gcloud secrets describe ${_SECRET_SETTINGS_NAME}" \
./retry.sh "gcloud secrets describe ${_SECRET_SETTINGS_NAME}" \
"gcloud secrets delete ${_SECRET_SETTINGS_NAME} --quiet --project $PROJECT_ID"

./test/retry.sh "gcloud secrets describe ${_SECRET_PASSWORD_NAME}" \
./retry.sh "gcloud secrets describe ${_SECRET_PASSWORD_NAME}" \
"gcloud secrets delete ${_SECRET_PASSWORD_NAME} --quiet --project $PROJECT_ID"

./test/retry.sh "gsutil ls gs://${_STORAGE_BUCKET}" \
./retry.sh "gsutil ls gs://${_STORAGE_BUCKET}" \
"gsutil -m rm -r gs://${_STORAGE_BUCKET}"

./test/retry.sh "gcloud container images describe gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION}" \
./retry.sh "gcloud container images describe gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION}" \
"gcloud container images delete gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION} --quiet"

./test/retry.sh "gcloud run services describe ${_SERVICE} --region ${_REGION} --platform ${_PLATFORM}" \
./retry.sh "gcloud run services describe ${_SERVICE} --region ${_REGION} --platform ${_PLATFORM}" \
"gcloud run services delete ${_SERVICE} --region ${_REGION} --platform ${_PLATFORM} --async --quiet"

WAIT=30 ./test/retry.sh "gcloud sql databases describe ${_DB_NAME} --instance ${_DB_INSTANCE} --project $PROJECT_ID" \
WAIT=30 ./retry.sh "gcloud sql databases describe ${_DB_NAME} --instance ${_DB_INSTANCE} --project $PROJECT_ID" \
"gcloud sql databases delete ${_DB_NAME} --instance ${_DB_INSTANCE} --quiet --project $PROJECT_ID"

./test/retry.sh "gcloud sql users list --filter \"name=${_DB_USER}\" --instance ${_DB_INSTANCE}" \
./retry.sh "gcloud sql users list --filter \"name=${_DB_USER}\" --instance ${_DB_INSTANCE}" \
"gcloud sql users delete ${_DB_USER} --instance ${_DB_INSTANCE} --quiet --project $PROJECT_ID"

substitutions:
Expand Down
16 changes: 8 additions & 8 deletions run/django/test/e2e_test_setup.yaml → run/django/e2e_test_setup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ steps:
args:
- "-c"
- |
WAIT=30 ./test/retry.sh "gcloud sql databases create ${_DB_NAME} \
WAIT=30 ./retry.sh "gcloud sql databases create ${_DB_NAME} \
--instance ${_DB_INSTANCE} \
--project ${PROJECT_ID}"

Expand All @@ -30,7 +30,7 @@ steps:
- "-c"
- |
echo -n "${_DB_PASS}" > db_password
./test/retry.sh "gcloud sql users create ${_DB_USER} \
./retry.sh "gcloud sql users create ${_DB_USER} \
--password $(cat db_password) \
--instance ${_DB_INSTANCE} \
--project ${PROJECT_ID}"
Expand All @@ -42,7 +42,7 @@ steps:
args:
- "-c"
- |
./test/retry.sh "gsutil mb \
./retry.sh "gsutil mb \
-l ${_REGION} \
-p ${PROJECT_ID} \
gs://${_STORAGE_BUCKET}"
Expand All @@ -59,7 +59,7 @@ steps:
SECRET_KEY=$(cat /dev/urandom | LC_ALL=C tr -dc '[:alpha:]' | fold -w 30 | head -n1)
PASSWORD_NAME=${_SECRET_PASSWORD_NAME}" > ${_SECRET_SETTINGS_NAME}

./test/retry.sh "gcloud secrets create ${_SECRET_SETTINGS_NAME} \
./retry.sh "gcloud secrets create ${_SECRET_SETTINGS_NAME} \
--project $PROJECT_ID \
--data-file=${_SECRET_SETTINGS_NAME}"

Expand All @@ -72,7 +72,7 @@ steps:

echo -n "${_SECRET_PASSWORD_VALUE}" > ${_SECRET_PASSWORD_NAME}

./test/retry.sh "gcloud secrets create ${_SECRET_PASSWORD_NAME} \
./retry.sh "gcloud secrets create ${_SECRET_PASSWORD_NAME} \
--project $PROJECT_ID \
--data-file=${_SECRET_PASSWORD_NAME}"

Expand All @@ -89,15 +89,15 @@ steps:
args:
- "-c"
- |
./test/retry.sh "docker build -t gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION} ."
./retry.sh "docker build -t gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION} ."

- id: "Push Container Image"
name: "gcr.io/cloud-builders/docker"
entrypoint: "/bin/bash"
args:
- "-c"
- |
./test/retry.sh "docker push gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION}"
./retry.sh "docker push gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION}"

- id: "Migrate database"
name: "gcr.io/google-appengine/exec-wrapper"
Expand Down Expand Up @@ -142,7 +142,7 @@ steps:
args:
- "-c"
- |
./test/retry.sh "gcloud run deploy ${_SERVICE} \
./retry.sh "gcloud run deploy ${_SERVICE} \
--project $PROJECT_ID \
--image gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION} \
--no-allow-unauthenticated \
Expand Down
0 run/django/test/retry.sh → run/django/retry.sh
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions run/idp-sql/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ to be set.
### Unit tests

```
pytest test/test_app.py
pytest test_app.py
```

### System Tests
Expand All @@ -82,5 +82,5 @@ export GOOGLE_CLOUD_PROJECT=<YOUR_PROJECT_ID>
export CLOUD_SQL_CONNECTION_NAME=<YOUR_CLOUD_SQL_CONNECTION_NAME>
export DB_PASSWORD=<POSTGRESQL_PASSWORD>
export IDP_KEY=<IDENTITY_PLATFORM_API_KEY> # See tutorial for creation of this key ("API_KEY")
pytest test/e2e_test.py
pytest e2e_test.py
```
4 changes: 2 additions & 2 deletions run/idp-sql/test/e2e_test.py → run/idp-sql/e2e_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def deployed_service() -> str:
"--project",
GOOGLE_CLOUD_PROJECT,
"--config",
"./test/e2e_test_setup.yaml",
"./e2e_test_setup.yaml",
"--substitutions",
]
+ substitutions
Expand Down Expand Up @@ -166,7 +166,7 @@ def deployed_service() -> str:
"--project",
GOOGLE_CLOUD_PROJECT,
"--config",
"./test/e2e_test_cleanup.yaml",
"./e2e_test_cleanup.yaml",
"--substitutions",
]
+ substitutions
Expand Down
8 changes: 4 additions & 4 deletions run/idp-sql/test/e2e_test_cleanup.yaml → run/idp-sql/e2e_test_cleanup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ steps:
args:
- '-ec'
- |
./test/retry.sh "gcloud run services describe ${_SERVICE} --region ${_REGION} --platform ${_PLATFORM}" \
./retry.sh "gcloud run services describe ${_SERVICE} --region ${_REGION} --platform ${_PLATFORM}" \
"gcloud run services delete ${_SERVICE} --region ${_REGION} --platform ${_PLATFORM} --quiet"

./test/retry.sh "gcloud secrets describe ${_SERVICE}-secrets" \
./retry.sh "gcloud secrets describe ${_SERVICE}-secrets" \
"gcloud secrets delete ${_SERVICE}-secrets --quiet --project $PROJECT_ID"

./test/retry.sh "gcloud container images describe gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION}" \
./retry.sh "gcloud container images describe gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION}" \
"gcloud container images delete gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION} --quiet"

WAIT=30 ./test/retry.sh "gcloud sql databases describe ${_DB_NAME} --instance ${_DB_INSTANCE} --project $PROJECT_ID" \
WAIT=30 ./retry.sh "gcloud sql databases describe ${_DB_NAME} --instance ${_DB_INSTANCE} --project $PROJECT_ID" \
"gcloud sql databases delete ${_DB_NAME} --instance ${_DB_INSTANCE} --quiet --project $PROJECT_ID"

substitutions:
Expand Down
10 changes: 5 additions & 5 deletions run/idp-sql/test/e2e_test_setup.yaml → run/idp-sql/e2e_test_setup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ steps:
args:
- '-c'
- |
WAIT=30 ./test/retry.sh "gcloud sql databases create ${_DB_NAME} \
WAIT=30 ./retry.sh "gcloud sql databases create ${_DB_NAME} \
--instance ${_DB_INSTANCE} \
--project $PROJECT_ID"

Expand All @@ -35,7 +35,7 @@ steps:
sed -i "s/\"DB_NAME\": \"postgres\"/\"DB_NAME\": \"${_DB_NAME}\"/" postgres-secrets.json
sed -i "s/\"DB_USER\": \"postgres\"/\"DB_USER\": \"${_DB_USER}\"/" postgres-secrets.json

./test/retry.sh "gcloud secrets create ${_SERVICE}-secrets \
./retry.sh "gcloud secrets create ${_SERVICE}-secrets \
--project $PROJECT_ID \
--replication-policy="automatic" \
--data-file=postgres-secrets.json" \
Expand All @@ -47,23 +47,23 @@ steps:
args:
- '-c'
- |
./test/retry.sh "docker build -t gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION} ."
./retry.sh "docker build -t gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION} ."

- id: 'Push Container Image'
name: 'gcr.io/cloud-builders/docker'
entrypoint: '/bin/bash'
args:
- '-c'
- |
./test/retry.sh "docker push gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION}"
./retry.sh "docker push gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION}"

- id: 'Deploy to Cloud Run'
name: 'gcr.io/cloud-builders/gcloud:latest'
entrypoint: /bin/bash
args:
- '-c'
- |
./test/retry.sh "gcloud beta run deploy ${_SERVICE} \
./retry.sh "gcloud beta run deploy ${_SERVICE} \
--project $PROJECT_ID \
--image gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION} \
--allow-unauthenticated \
Expand Down
6 changes: 4 additions & 2 deletions run/idp-sql/middleware.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,23 @@


from functools import wraps
from typing import Any, Callable, Dict
from typing import Callable, Dict, TypeVar

import firebase_admin
from firebase_admin import auth # noqa: F401
from flask import request, Response
import structlog


a = TypeVar("a")

default_app = firebase_admin.initialize_app()


# [START cloudrun_user_auth_jwt]
def jwt_authenticated(func: Callable[..., int]) -> Callable[..., int]:
@wraps(func)
def decorated_function(*args: Any, **kwargs: Any) -> Any:
def decorated_function(*args: a, **kwargs: a) -> a:
header = request.headers.get("Authorization", None)
if header:
token = header.split(" ")[1]
Expand Down
0 run/idp-sql/test/retry.sh → run/idp-sql/retry.sh
View file
Open in desktop
File renamed without changes.