Merge ~lloydwaltersj/maas:incorrect-api-link into maas:master

Proposed by Jack Lloyd-Walters
Status: Merged
Approved by: Jack Lloyd-Walters
Approved revision: d47d1e662b4097debc208cab4f14ea0f14fd12f1
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~lloydwaltersj/maas:incorrect-api-link
Merge into: maas:master
Diff against target: 13 lines (+1/-1)
1 file modified
src/maasserver/api/doc_oapi.py (+1/-1)
Reviewer Review Type Date Requested Status
Alexsander de Souza Approve
MAAS Lander Approve
Review via email: mp+427547@code.launchpad.net

Commit message

Remove `//` from the api url

To post a comment you must log in.
Revision history for this message
Jack Lloyd-Walters (lloydwaltersj) wrote :

I'm not sure if there's a more preferred way to do this, this just works for now

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b incorrect-api-link lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: d47d1e662b4097debc208cab4f14ea0f14fd12f1

review: Approve
Revision history for this message
Alexsander de Souza (alexsander-souza) wrote :

I think this is fine. It's stated in the API_URL_PREFIX definition that it MUST end with a slash

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/api/doc_oapi.py b/src/maasserver/api/doc_oapi.py
2index 941196e..271000b 100644
3--- a/src/maasserver/api/doc_oapi.py
4+++ b/src/maasserver/api/doc_oapi.py
5@@ -63,7 +63,7 @@ def get_api_landing_page():
6 "title": "this document",
7 },
8 {
9- "path": f"{settings.API_URL_PREFIX}/openapi.yaml",
10+ "path": f"{settings.API_URL_PREFIX}openapi.yaml",
11 "rel": "service-desc",
12 "type": "application/openapi+yaml",
13 "title": "the API definition",

Subscribers

People subscribed via source and target branches