From 6a55450b68679c7e25d4020744193997a1f383a1 Mon Sep 17 00:00:00 2001 From: Dylan McReynolds Date: Tue, 1 Feb 2022 14:28:31 -0800 Subject: [PATCH 1/3] root url --- splash/api/main.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/splash/api/main.py b/splash/api/main.py index 5a684af..9f2f94e 100644 --- a/splash/api/main.py +++ b/splash/api/main.py @@ -40,9 +40,9 @@ def init_logging(): app = FastAPI( - openapi_url="/api/v1/openapi.json", - docs_url="/api/docs", - redoc_url="/api/redoc", + openapi_url="/splash/api/v1/openapi.json", + docs_url="/splash/api/docs", + redoc_url="/splash/api/redoc", # swagger_ui_oauth2_redirect_url="/api/docs/oauth2-redirect" ) @@ -81,49 +81,49 @@ async def handle_wrong_etag(response, exc): ) -@app.get("/api/v1/settings") +@app.get("/splash/api/v1/settings") async def get_settings(): return {"google_client_id": ConfigStore.GOOGLE_CLIENT_ID} app.include_router( auth_router, - prefix="/api/v1/idtokensignin", + prefix="/splash/api/v1/idtokensignin", tags=["tokens"], responses={404: {"description": "Not found"}}, ) app.include_router( users_router, - prefix="/api/v1/users", + prefix="/splash/api/v1/users", tags=["users"], responses={404: {"description": "Not found"}}, ) app.include_router( pages_router, - prefix="/api/v1/pages", + prefix="/splash/api/v1/pages", tags=["pages"], responses={404: {"description": "Not found"}}, ) app.include_router( runs_router, - prefix="/api/v1/runs", + prefix="/splash/api/v1/runs", tags=["runs"], responses={404: {"description": "Not found"}}, ) app.include_router( teams_router, - prefix="/api/v1/teams", + prefix="/splash/api/v1/teams", tags=["teams"], responses={404: {"description": "Not found"}}, ) app.include_router( references_router, - prefix="/api/v1/references", + prefix="/splash/api/v1/references", tags=["references"], responses={404: {"description": "Not found"}}, ) From 8b9e63099f56bf12fcfef697b0145dab3e791fdc Mon Sep 17 00:00:00 2001 From: Dylan McReynolds Date: Tue, 1 Feb 2022 14:34:38 -0800 Subject: [PATCH 2/3] fix tests --- splash/test/fixtures/add.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/splash/test/fixtures/add.py b/splash/test/fixtures/add.py index 98cc873..0f31de5 100644 --- a/splash/test/fixtures/add.py +++ b/splash/test/fixtures/add.py @@ -21,7 +21,7 @@ from splash.api.main import app -API_URL_ROOT = "/api/v1" +API_URL_ROOT = "/splash/api/v1" os.environ["TOKEN_SECRET_KEY"] = "the_question_to_the_life_the_universe_and_everything" os.environ["GOOGLE_CLIENT_ID"] = "Gollum" os.environ["GOOGLE_CLIENT_SECRET"] = "the_one_ring" From bcdb873a834f6543fe1c13bcd37e025843063f9f Mon Sep 17 00:00:00 2001 From: Dylan McReynolds Date: Tue, 1 Feb 2022 14:39:05 -0800 Subject: [PATCH 3/3] build images on PR --- .github/workflows/python-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 582bcb2..39d6fc3 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -49,7 +49,7 @@ jobs: contents: read packages: write # Only run when we are pushing to the repo's master branch - if: ${{ github.event_name == 'push' }} + # if: ${{ github.event_name == 'push' }} steps: - name: Checkout repository uses: actions/checkout@v2