Merge pull request #3259 from uselagoon/remove-harbor-project-integra…

…tion chore: remove remaining harbor integration from core
uselagoon · Jun 27, 2024 · 081b1a2 · 081b1a2
2 parents 5637896 + 02dffe2
commit 081b1a2
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 831 deletions.
diff --git a/node-packages/commons/src/api.ts b/node-packages/commons/src/api.ts
@@ -1386,17 +1386,3 @@ export const getProblemsforProjectEnvironment = async (
   });
   return response.environmentByName.problems;
 };
-
-export const getProblemHarborScanMatches = () => graphqlapi.query(
-    `query getProblemHarborScanMatches {
-      allProblemHarborScanMatchers {
-        id
-        name
-        description
-        defaultLagoonProject
-        defaultLagoonEnvironment
-        defaultLagoonService
-        regex
-      }
-    }`
-);
diff --git a/node-packages/commons/src/harborApi.ts b/node-packages/commons/src/harborApi.ts
diff --git a/services/api/Dockerfile b/services/api/Dockerfile
@@ -33,9 +33,7 @@ ENV NODE_ENV=production \
     KEYCLOAK_ADMIN_PASSWORD=admin \
     ELASTICSEARCH_URL=http://logs-db-service:9200 \
     KEYCLOAK_API_CLIENT_SECRET=39d5282d-3684-4026-b4ed-04bbc034b61a \
-    HARBOR_ADMIN_PASSWORD=Harbor12345 \
-    REDIS_PASSWORD=admin \
-    HARBOR_API_VERSION=v2.0
+    REDIS_PASSWORD=admin
 
 # The API is not very resilient to sudden mariadb restarts which can happen when the api and mariadb are starting
 # at the same time. So we have a small entrypoint which waits for mariadb to be fully ready.

diff --git a/services/api/package.json b/services/api/package.json
@@ -15,7 +15,6 @@
     "sync:gitlab:all": "yarn run sync:gitlab:users && yarn run sync:gitlab:groups && yarn run sync:gitlab:projects",
     "sync:opendistro-security": "node --max-http-header-size=80000 dist/helpers/sync-groups-opendistro-security",
     "sync:bitbucket:repo-permissions": "node dist/bitbucket-sync/repo-permissions",
-    "sync:harbor:projects": "node dist/migrations/2-harbor/harborSync.js",
     "migrations:lagoon": "node dist/migrations/lagoon/migrations.js"
   },
   "keywords": [],

diff --git a/services/api/src/clients/harborClient.ts b/services/api/src/clients/harborClient.ts
diff --git a/services/api/src/migrations/2-harbor/harborSync.ts b/services/api/src/migrations/2-harbor/harborSync.ts
diff --git a/services/api/src/resolvers.js b/services/api/src/resolvers.js
@@ -10,9 +10,6 @@ const {
   deleteProblemsFromSource,
   addProblemsFromSource,
   getProblemSources,
-  getProblemHarborScanMatches,
-  addProblemHarborScanMatch,
-  deleteProblemHarborScanMatch
 } = require('./resources/problem/resolvers');
 
 const {
@@ -581,7 +578,6 @@ const resolvers = {
     allProblems: getAllProblems,
     allGroups: getAllGroups,
     allProjectsInGroup: getAllProjectsInGroup,
-    allProblemHarborScanMatchers: getProblemHarborScanMatches,
     allUsers: getAllUsers,
     allNotifications: getAllNotifications,
     userByEmail: getUserByEmail,
@@ -601,10 +597,8 @@ const resolvers = {
   },
   Mutation: {
     addProblem,
-    addProblemHarborScanMatch,
     deleteProblem,
     deleteProblemsFromSource,
-    deleteProblemHarborScanMatch,
     addFact,
     addFacts,
     addFactsByName,

diff --git a/services/api/src/resources/problem/resolvers.ts b/services/api/src/resources/problem/resolvers.ts
@@ -278,36 +278,3 @@ export const deleteProblemsFromSource: ResolverFn = async (
 
   return 'success';
 };
-
-export const getProblemHarborScanMatches: ResolverFn = async (
-  root,
-  args,
-  { sqlClientPool, hasPermission }
-) => {
-  throw new Error('Harbor-Trivy integration with core removed in Lagoon 2')
-};
-
-export const addProblemHarborScanMatch: ResolverFn = async (
-  root,
-  {
-    input: {
-      name,
-      description,
-      defaultLagoonProject,
-      defaultLagoonEnvironment,
-      defaultLagoonService,
-      regex
-    }
-  },
-  { sqlClientPool, hasPermission, userActivityLogger }
-) => {
-  throw new Error('Harbor-Trivy integration with core removed in Lagoon 2')
-};
-
-export const deleteProblemHarborScanMatch: ResolverFn = async (
-  root,
-  { input: { id } },
-  { sqlClientPool, hasPermission, userActivityLogger }
-) => {
-  throw new Error('Harbor-Trivy integration with core removed in Lagoon 2')
-};
diff --git a/services/api/src/resources/problem/sql.ts b/services/api/src/resources/problem/sql.ts
@@ -18,16 +18,6 @@ const standardEnvironmentReturn = {
   deleted: 'deleted'
 };
 
-const standardProblemHarborScanMatchReturn = {
-  id: 'id',
-  name: 'name',
-  description: 'description',
-  default_lagoon_project: 'defaultLagoonProject',
-  default_lagoon_environment: 'defaultLagoonEnvironment',
-  default_lagoon_service: 'defaultLagoonServiceName',
-  regex: 'regex'
-};
-
 export const Sql = {
   selectAllProblems: ({
     source = [],