Merge remote-tracking branch 'origin/main' into dependabot/npm_and_yarn/eslint-10.2.1

Author: svcAPLBot

src/api/v1/createWorkloadCatalog.ts

@@ -9,8 +9,8 @@ import { OpenApiRequestExt } from 'src/otomi-models'
 import { default as OtomiStack, rootPath } from 'src/otomi-stack'
 import { API_NAMESPACE, cleanEnv, EDITOR_INACTIVITY_TIMEOUT } from 'src/validators'
 import { v4 as uuidv4 } from 'uuid'
-import { getSanitizedErrorMessage } from '../utils'
 import { setApiStatusInConfigMap } from '../k8s-operations'
+import { getSanitizedErrorMessage } from '../utils'
 
 const debug = Debug('otomi:session')
 const env = cleanEnv({
@@ -121,7 +121,7 @@ export function sessionMiddleware(server: http.Server): RequestHandler {
 
     if (['post', 'put', 'delete'].includes(req.method.toLowerCase())) {
       // in the workloadCatalog endpoint(s), don't need to create a session
-      if (req.path === '/v1/workloadCatalog' || req.path === '/v1/createWorkloadCatalog') return next()
+      if (req.path === '/v1/workloadCatalog') return next()
 
       // Block all write operations when the API is locked (git migration completed)
       if (readOnlyStack?.locked) throw new ApiLockedError()

src/api/v1/helmChartContent.ts

@@ -2331,58 +2331,6 @@ paths:
               schema:
                 type: object
 
-  '/v1/helmChartContent':
-    get:
-      operationId: getHelmChartContent
-      x-eov-operation-handler: v1/helmChartContent
-      x-aclSchema: Workload
-      parameters:
-        - name: url
-          in: query
-          description: URL of the helm chart
-          schema:
-            type: string
-      responses:
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '200':
-          description: Successfully obtained helm chart content
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  values:
-                    type: object
-                  error:
-                    type: string
-  '/v1/createWorkloadCatalog':
-    post:
-      operationId: createWorkloadCatalog
-      x-eov-operation-handler: v1/createWorkloadCatalog
-      x-aclSchema: Workload
-      description: Create workload catalog from a repository
-      requestBody:
-        content:
-          application/json:
-            schema:
-              type: object
-        description: Workload catalog object that contains updated values
-        required: true
-      responses:
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '200':
-          description: Successfully updated a team workload catalog
-          content:
-            application/json:
-              schema:
-                type: object
-
   '/v1/teams/{teamId}/workloads':
     parameters:
       - $ref: '#/components/parameters/teamParams'

src/middleware/session.ts

@@ -1,4 +1,4 @@
-import { CoreV1Api, KubeConfig, User as k8sUser, V1ObjectReference } from '@kubernetes/client-node'
+import { CoreV1Api, User as k8sUser, KubeConfig, V1ObjectReference } from '@kubernetes/client-node'
 import Debug from 'debug'
 
 import { getRegions, ObjectStorageKeyRegions, Region, ResourcePage } from '@linode/api-v4'
@@ -163,14 +163,7 @@ import {
   userSecretDataToUser,
 } from './utils/userUtils'
 import { defineClusterId, ObjectStorageClient } from './utils/wizardUtils'
-import {
-  fetchChartYaml,
-  fetchWorkloadCatalog,
-  isInteralGiteaURL,
-  NewHelmChartValues,
-  sparseCloneChart,
-  validateGitUrl,
-} from './utils/workloadUtils'
+import { fetchWorkloadCatalog, isInteralGiteaURL, validateGitUrl } from './utils/workloadUtils'
 
 interface ExcludedApp extends App {
   managed: boolean
@@ -1952,41 +1945,6 @@ export default class OtomiStack {
     }
   }
 
-  async getHelmChartContent(url: string): Promise<any> {
-    return await fetchChartYaml(url)
-  }
-
-  async createWorkloadCatalog(body: NewHelmChartValues): Promise<boolean> {
-    const { gitRepositoryUrl, chartTargetDirName, chartIcon, allowTeams } = body
-
-    const uuid = uuidv4()
-    const localHelmChartsDir = `/tmp/otomi/charts/${uuid}`
-    const helmChartCatalogUrl = env.HELM_CHART_CATALOG
-    const { user, email } = this.git
-    const { cluster } = await this.getSettings(['cluster'])
-
-    try {
-      await sparseCloneChart(
-        gitRepositoryUrl,
-        localHelmChartsDir,
-        helmChartCatalogUrl,
-        user,
-        email,
-        chartTargetDirName,
-        chartIcon,
-        allowTeams,
-        cluster?.domainSuffix,
-      )
-      return true
-    } catch (error) {
-      debug('Error adding new Helm chart to catalog')
-      return false
-    } finally {
-      // Clean up: if the temporary directory exists, remove it.
-      if (existsSync(localHelmChartsDir)) rmSync(localHelmChartsDir, { recursive: true, force: true })
-    }
-  }
-
   getTeamWorkloads(teamId: string): Workload[] {
     return this.getTeamAplWorkloads(teamId).map(
       (workload) => omit(getV1ObjectFromApl(workload), ['values']) as Workload,