From 84cdb92346785ceffda429fa64e35d7a6bce94cf Mon Sep 17 00:00:00 2001
From: Calvin Lee <cjlee@ualberta.ca>
Date: Tue, 30 Apr 2024 13:20:34 -0600
Subject: [PATCH] integration support for harness - fixed comments p2

Signed-off-by: Calvin Lee <cjlee@ualberta.ca>
---
 packages/integration/package.json             |  1 -
 packages/integration/src/harness/core.test.ts | 16 ++++++++--------
 packages/integration/src/harness/core.ts      |  4 ----
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/packages/integration/package.json b/packages/integration/package.json
index b57b94f982..bbd0eecbe7 100644
--- a/packages/integration/package.json
+++ b/packages/integration/package.json
@@ -50,7 +50,6 @@
   "devDependencies": {
     "@backstage/cli": "workspace:^",
     "@backstage/config-loader": "workspace:^",
-    "@backstage/test-utils": "workspace:^",
     "@types/luxon": "^3.0.0",
     "msw": "^1.0.0"
   },
diff --git a/packages/integration/src/harness/core.test.ts b/packages/integration/src/harness/core.test.ts
index abfbb5d4c2..d3d402806a 100644
--- a/packages/integration/src/harness/core.test.ts
+++ b/packages/integration/src/harness/core.test.ts
@@ -15,7 +15,7 @@
  */
 
 import { setupServer } from 'msw/node';
-import { setupRequestMockHandlers } from '@backstage/test-utils';
+import { setupRequestMockHandlers } from '../helpers';
 import { HarnessIntegrationConfig } from './config';
 import {
   getHarnessEditContentsUrl,
@@ -59,26 +59,26 @@ describe('Harness code core', () => {
     });
   });
 
-  describe('getGerritRequestOptions', () => {
+  describe('getHarnessRequestOptions', () => {
     it('adds token header when only a token is specified', () => {
       const authRequest: HarnessIntegrationConfig = {
-        host: 'gerrit.com',
+        host: 'app.harness.io',
         token: 'P',
       };
       const anonymousRequest: HarnessIntegrationConfig = {
-        host: 'gerrit.com',
+        host: 'app.harness.io',
       };
       expect(
         (getHarnessRequestOptions(authRequest).headers as any).Authorization,
       ).toEqual('Bearer P');
-      expect(
-        getHarnessRequestOptions(anonymousRequest).headers,
-      ).toBeUndefined();
+      expect(getHarnessRequestOptions(anonymousRequest).headers).toStrictEqual(
+        {},
+      );
     });
 
     it('adds basic auth when apikey and token are specified', () => {
       const authRequest: HarnessIntegrationConfig = {
-        host: 'gerrit.com',
+        host: 'app.harness.io',
         token: 'P',
         apiKey: 'a',
       };
diff --git a/packages/integration/src/harness/core.ts b/packages/integration/src/harness/core.ts
index 8eba850ec2..3a61905e27 100644
--- a/packages/integration/src/harness/core.ts
+++ b/packages/integration/src/harness/core.ts
@@ -120,10 +120,6 @@ export function getHarnessRequestOptions(config: HarnessIntegrationConfig): {
   const headers: Record<string, string> = {};
   const { token, apiKey } = config;
 
-  if (!token) {
-    return headers;
-  }
-
   if (apiKey) {
     headers['x-api-key'] = apiKey;
   } else if (token) {