Merge pull request #2190 from headlamp-k8s/testauth-fix

frontend: apiProxy: Pass in namespace to testAuth

Author: joaquimrocha

frontend/src/lib/k8s/apiProxy.test.ts

@@ -791,37 +791,54 @@ describe('apiProxy', () => {
 
   describe('testAuth', () => {
     const apiPath = '/apis/authorization.k8s.io/v1/selfsubjectrulesreviews';
-    const spec = { namespace: namespace };
+    const customNamespace = 'custom-namespace';
+    const specDefault = { namespace: namespace };
+    const specCustom = { namespace: customNamespace };
 
     beforeEach(() => {
       nock(baseApiUrl)
-        .persist()
-        .post(`/clusters/${clusterName}${apiPath}`, { spec })
+        .post(`/clusters/${clusterName}${apiPath}`, { spec: specDefault })
+        .reply(200, mockResponse);
+
+      nock(baseApiUrl)
+        .post(`/clusters/${clusterName}${apiPath}`, { spec: specCustom })
         .reply(200, mockResponse);
     });
 
     afterEach(() => {
       nock.cleanAll();
     });
 
-    it('Successfully handles authentication', async () => {
+    it('Successfully handles authentication with default namespace', async () => {
       const response = await apiProxy.testAuth(clusterName);
       expect(response).toEqual(mockResponse);
     });
 
+    it('Successfully handles authentication with custom namespace', async () => {
+      const response = await apiProxy.testAuth(clusterName, customNamespace);
+      expect(response).toEqual(mockResponse);
+    });
+
     it.each([
-      [401, errorResponse401],
-      [500, errorResponse500],
+      [401, errorResponse401, namespace],
+      [500, errorResponse500, namespace],
+      [401, errorResponse401, customNamespace],
+      [500, errorResponse500, customNamespace],
     ])(
       'Successfully handles authentication with error status %d',
-      async (statusCode, errorResponse) => {
+      async (statusCode, errorResponse, namespace) => {
         nock.cleanAll();
         nock(baseApiUrl)
-          .persist()
-          .post(`/clusters/${clusterName}${apiPath}`, { spec })
+          .post(`/clusters/${clusterName}${apiPath}`, { spec: specDefault })
           .reply(statusCode, { message: errorResponse.error });
 
-        await expect(apiProxy.testAuth(clusterName)).rejects.toThrow(errorResponse.error);
+        nock(baseApiUrl)
+          .post(`/clusters/${clusterName}${apiPath}`, { spec: specCustom })
+          .reply(statusCode, { message: errorResponse.error });
+
+        await expect(apiProxy.testAuth(clusterName, namespace)).rejects.toThrow(
+          errorResponse.error
+        );
       }
     );
   });

frontend/src/lib/k8s/apiProxy.ts

@@ -1641,8 +1641,8 @@ export async function metrics(
 //@todo: these need documenting.
 //@todo: these need return types.
 
-export async function testAuth(cluster = '') {
-  const spec = { namespace: 'default' };
+export async function testAuth(cluster = '', namespace = 'default') {
+  const spec = { namespace };
   const clusterName = cluster || getCluster();
 
   return post('/apis/authorization.k8s.io/v1/selfsubjectrulesreviews', { spec }, false, {