launchpad-reviewers team mailing list archive

[Simone Pelosi <mp+462260@xxxxxxxxxxxxxxxxxx>]

Simone Pelosi has proposed merging ~pelpsi/launchpad:fetch-service-revocation-endpoint-fix into launchpad:master.

Commit message:
Fix revocation endpoint
    
fetch_service_control_endpoint already has the following structure:
http://host:port/session


Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~pelpsi/launchpad/+git/launchpad/+merge/462260
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~pelpsi/launchpad:fetch-service-revocation-endpoint-fix into launchpad:master.

diff --git a/lib/lp/buildmaster/builderproxy.py b/lib/lp/buildmaster/builderproxy.py
index 75e049f..a747b61 100644
--- a/lib/lp/buildmaster/builderproxy.py
+++ b/lib/lp/buildmaster/builderproxy.py
@@ -77,7 +77,7 @@ class BuilderProxyMixin:
                     port=_get_proxy_config("fetch_service_port"),
                 )
             )
-            args["revocation_endpoint"] = "{endpoint}/session/{id}".format(
+            args["revocation_endpoint"] = "{endpoint}/{id}".format(
                 endpoint=_get_proxy_config("fetch_service_control_endpoint"),
                 id=session["id"],
             )
diff --git a/lib/lp/buildmaster/tests/fetchservice.py b/lib/lp/buildmaster/tests/fetchservice.py
index ea70651..dd21e27 100644
--- a/lib/lp/buildmaster/tests/fetchservice.py
+++ b/lib/lp/buildmaster/tests/fetchservice.py
@@ -117,7 +117,7 @@ class RevocationEndpointMatcher(Equals):
 
     def __init__(self, session_id):
         super().__init__(
-            "{endpoint}/session/{session_id}".format(
+            "{endpoint}/{session_id}".format(
                 endpoint=config.builddmaster.fetch_service_control_endpoint,
                 session_id=session_id,
             )