Merge ~ines-almeida/launchpad:fetch-service-add-get-data-endpoint into launchpad:master

[Ines Almeida]

Send end_session_endpoint to build manager when using fetch service

The fetch service will require 2 endpoints: one for revoking the token (as the old builder proxy did) and one for ending the session and gathering the data - that we are adding in this MP

2786cfb... by Ines Almeida on 2024-03-27

tests: small fix to test matchers import

1129639... by Ines Almeida on 2024-03-27

test: update regex fetch service matchers to check begining and end of line

Unmerged commits

1129639... by Ines Almeida on 2024-03-27

test: update regex fetch service matchers to check begining and end of line

	docs:0 (build)
	lint:0 (build)
	mypy:0 (build)

1 → 3 of 3 results

First • Previous • Next • Last

2786cfb... by Ines Almeida on 2024-03-27

tests: small fix to test matchers import

	docs:0 (build)
	lint:0 (build)
	mypy:0 (build)

1 → 3 of 3 results

First • Previous • Next • Last

320b0a5... by Ines Almeida on 2024-03-26

Send end_session_endpoint to build manager when using fetch service

The fetch service will require 2 endpoints: one for revoking the token (as the old builder proxy did) and one for ending the session and gathering the data - that we are adding in this MP

	docs:0 (build)
	lint:0 (build)
	mypy:0 (build)

1 → 3 of 3 results

First • Previous • Next • Last

diff --git a/lib/lp/buildmaster/builderproxy.py b/lib/lp/buildmaster/builderproxy.py
index 3375042..9309246 100644
--- a/lib/lp/buildmaster/builderproxy.py
+++ b/lib/lp/buildmaster/builderproxy.py
@@ -77,10 +77,10 @@ class BuilderProxyMixin:
                     port=_get_proxy_config("fetch_service_port"),
                 )
             )
-            args["revocation_endpoint"] = "{endpoint}/{session_id}".format(
-                endpoint=_get_proxy_config("fetch_service_control_endpoint"),
-                session_id=session["id"],
-            )
+            endpoint = _get_proxy_config("fetch_service_control_endpoint")
+            session_id = session["id"]
+            args["revocation_endpoint"] = f"{endpoint}/{session_id}/token"
+            args["end_session_endpoint"] = f"{endpoint}/{session_id}"
 
     @defer.inlineCallbacks
     def _requestProxyToken(self):
diff --git a/lib/lp/buildmaster/interfaces/buildfarmjobbehaviour.py b/lib/lp/buildmaster/interfaces/buildfarmjobbehaviour.py
index 6a808b3..2afb876 100644
--- a/lib/lp/buildmaster/interfaces/buildfarmjobbehaviour.py
+++ b/lib/lp/buildmaster/interfaces/buildfarmjobbehaviour.py
@@ -128,6 +128,10 @@ class BuildArgs(TypedDict, total=False):
     # The URL for revoking proxy authorization tokens [charm, ci, oci,
     # snap].
     revocation_endpoint: str
+    # The URL for ending a fetch service session (separate from the
+    # 'revocation_endpoint, as is certain cases want to revoke the token before
+    # closing the session)
+    end_session_endpoint: str
     # If True, scan job output for malware [ci].
     scan_malware: bool
     # A dictionary of secrets to pass to the CI build runner [ci].
diff --git a/lib/lp/buildmaster/tests/fetchservice.py b/lib/lp/buildmaster/tests/fetchservice.py
index 3fd879c..c5864c0 100644
--- a/lib/lp/buildmaster/tests/fetchservice.py
+++ b/lib/lp/buildmaster/tests/fetchservice.py
@@ -9,7 +9,12 @@ from textwrap import dedent
 from urllib.parse import urlsplit
 
 import fixtures
-from testtools.matchers import Equals, HasLength, MatchesStructure
+from testtools.matchers import (
+    Equals,
+    HasLength,
+    MatchesRegex,
+    MatchesStructure,
+)
 from twisted.internet import defer, endpoints, reactor
 from twisted.python.compat import nativeString
 from twisted.web import resource, server
@@ -110,15 +115,25 @@ class FetchServiceURLMatcher(MatchesStructure):
         super().match(urlsplit(matchee))
 
 
-class RevocationEndpointMatcher(Equals):
+class FetchServiceRevocationEndpointMatcher(MatchesRegex):
     """Check that a string is a valid endpoint for fetch
     service session revocation.
+
+    Expected type: {endpoint}/{session_id:any digit}/{token}
     """
 
-    def __init__(self, session_id):
-        super().__init__(
-            "{endpoint}/{session_id}".format(
-                endpoint=config.builddmaster.fetch_service_control_endpoint,
-                session_id=session_id,
-            )
-        )
+    def __init__(self):
+        endpoint = config.builddmaster.fetch_service_control_endpoint
+        super().__init__(r"^%s/\d/token$" % (endpoint))
+
+
+class FetchServiceEndSessionEndpointMatcher(MatchesRegex):
+    """Check that a string is a valid endpoint for the fetch service session
+    closing.
+
+    Expected type: {endpoint}/{session_id:any digit}
+    """
+
+    def __init__(self):
+        endpoint = config.builddmaster.fetch_service_control_endpoint
+        super().__init__(r"^%s/\d$" % (endpoint))
diff --git a/lib/lp/snappy/tests/test_snapbuildbehaviour.py b/lib/lp/snappy/tests/test_snapbuildbehaviour.py
index 2ccc18d..0218ee3 100644
--- a/lib/lp/snappy/tests/test_snapbuildbehaviour.py
+++ b/lib/lp/snappy/tests/test_snapbuildbehaviour.py
@@ -52,6 +52,8 @@ from lp.buildmaster.tests.builderproxy import (
     RevocationEndpointMatcher,
 )
 from lp.buildmaster.tests.fetchservice import (
+    FetchServiceEndSessionEndpointMatcher,
+    FetchServiceRevocationEndpointMatcher,
     InProcessFetchServiceAuthAPIFixture,
 )
 from lp.buildmaster.tests.mock_workers import (
@@ -287,7 +289,8 @@ class TestAsyncSnapBuildBehaviourFetchService(
         configuration.
 
         If `fetch_service_host` is not provided the function will return
-        without populating `proxy_url` and `revocation_endpoint`.
+        without populating `proxy_url`, `revocation_endpoint` and
+        `end_session_endpoint`.
         """
         self.pushConfig("builddmaster", fetch_service_host=None)
         self.useFixture(
@@ -301,6 +304,7 @@ class TestAsyncSnapBuildBehaviourFetchService(
         self.assertEqual([], self.fetch_service_api.sessions.requests)
         self.assertNotIn("proxy_url", args)
         self.assertNotIn("revocation_endpoint", args)
+        self.assertNotIn("end_session_endpoint", args)
 
     @defer.inlineCallbacks
     def test_requestFetchServiceSession_no_secret(self):
@@ -330,7 +334,8 @@ class TestAsyncSnapBuildBehaviourFetchService(
         """Create a snap build request with a successful fetch service
         configuration.
 
-        `proxy_url` and `revocation_endpoint` are correctly populated.
+        `proxy_url`, `revocation_endpoint` and `end_session_endpoint` are
+        correctly populated.
         """
         self.useFixture(
             FeatureFixture({SNAP_USE_FETCH_SERVICE_FEATURE_FLAG: "on"})
@@ -379,6 +384,15 @@ class TestAsyncSnapBuildBehaviourFetchService(
         )
         self.assertIn("proxy_url", args)
         self.assertIn("revocation_endpoint", args)
+        self.assertThat(
+            args["revocation_endpoint"],
+            FetchServiceRevocationEndpointMatcher(),
+        )
+        self.assertIn("end_session_endpoint", args)
+        self.assertThat(
+            args["end_session_endpoint"],
+            FetchServiceEndSessionEndpointMatcher(),
+        )
 
     @defer.inlineCallbacks
     def test_requestFetchServiceSession_flag_off(self):
@@ -465,6 +479,7 @@ class TestAsyncSnapBuildBehaviourBuilderProxy(
         self.assertEqual([], self.proxy_api.tokens.requests)
         self.assertNotIn("proxy_url", args)
         self.assertNotIn("revocation_endpoint", args)
+        self.assertNotIn("end_session_endpoint", args)
 
     @defer.inlineCallbacks
     def test_requestProxyToken_no_secret(self):
@@ -1321,6 +1336,7 @@ class TestAsyncSnapBuildBehaviourBuilderProxy(
             args = yield job.extraBuildArgs()
         self.assertNotIn("proxy_url", args)
         self.assertNotIn("revocation_endpoint", args)
+        self.assertNotIn("revocation_endpoint", args)
 
     @defer.inlineCallbacks
     def test_extraBuildArgs_build_source_tarball(self):