Merge branch 'main' into fb/service-credentials

Author: rlindner81

CHANGELOG.md

@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## v0.11.2 - tbd
 
+### ADDED
+
+- svm: add client headers `Client-Name` and `Client-Version` for all calls to service-manager.
+
 ## v0.11.1 - 2025-12-10
 
 ### ADDED

src/submodules/serviceManager.js

@@ -5,6 +5,7 @@
  */
 "use strict";
 
+const packageInfo = require("../../package.json");
 const {
   parseIntWithFallback,
   compareFor,
@@ -107,7 +108,17 @@ const _serviceManagerRequest = async (context, reqOptions = {}) => {
   } = await context.getHdiInfo();
   const url = credentials.sm_url;
   const auth = { token: await context.getCachedUaaTokenFromCredentials(credentials) };
-  const response = await request({ url, auth, ...reqOptions });
+  const response = await request({
+    url,
+    auth,
+    ...reqOptions,
+    headers: {
+      // NOTE: service-manager uses this client information for better consumption reporting and rate-limiting
+      "Client-Name": packageInfo.name,
+      "Client-Version": packageInfo.version,
+      ...reqOptions?.headers,
+    },
+  });
 
   if (reqOptions.method) {
     return response;

test/submodules/serviceManager.test.js

@@ -1,5 +1,6 @@
 "use strict";
 
+const packageInfo = require("../../package.json");
 const mockRequest = require("../../src/shared/request");
 jest.mock("../../src/shared/request", () => {
   const { RETRY_MODE } = jest.requireActual("../../src/shared/request");
@@ -120,6 +121,29 @@ describe("svm tests", () => {
     mockRequest.request.mockClear();
   });
 
+  describe("svm basics", () => {
+    test("client headers", async () => {
+      mockRequest.request.mockReturnValueOnce(mockOfferingResponse);
+      mockRequest.request.mockReturnValueOnce(mockPlanResponse);
+      mockRequest.request.mockReturnValueOnce(mockInstanceResponse(6));
+      mockRequest.request.mockReturnValueOnce({
+        json: () => ({
+          items: [mockBindingFactory(2), mockBindingFactory(5)],
+        }),
+      });
+
+      await expect(svm.serviceManagerList(mockContext, [], [false, false])).resolves.toBeDefined();
+
+      expect(mockRequest.request.mock.calls).toMatchObject(
+        mockRequest.request.mock.calls.map(() => [
+          {
+            headers: { "Client-Name": packageInfo.name, "Client-Version": packageInfo.version },
+          },
+        ])
+      );
+    });
+  });
+
   describe("svm repair bindings", () => {
     test("all-services", async () => {
       mockRequest.request.mockReturnValueOnce(mockOfferingResponse);