feat: remove v1/otomi/values endpoint and tools sidecar dependencies (#997)

Co-authored-by: svcAPLBot <174728082+svcAPLBot@users.noreply.github.com>

Author: ferruhcihan

bin/dc.sh

@@ -12,9 +12,7 @@ sub_help () {
     echo
     echo "Commands:"
     echo "   help               This help message"
-    echo "   up                 Start standalone docker-compose version of web without dependent services $info"
-    echo "   up-all             Start docker-compose version of web with dependent services $info"
-    echo "   up-deps            Start docker-compose version of only dependent services $info"
+    echo "   up                 Start docker-compose version of web $info"
     echo "   down               Stop and clean docker-compose containers"
 }
 
@@ -23,18 +21,8 @@ sub_up () {
     docker-compose -f docker-compose.yml up ${1}
 }
 
-sub_up-all () {
-    local files='-f docker-compose.yml -f docker-compose-deps.yml'
-
-    docker-compose $files up ${1}
-}
-
-sub_up-deps () {
-    docker-compose -f docker-compose-deps.yml up ${1}
-}
-
 sub_down () {
-    docker-compose -f docker-compose.yml -f docker-compose-deps.yml down --remove-orphans -v
+    docker-compose -f docker-compose.yml down --remove-orphans -v
 }
 
 case $command in

docker-compose-deps.yml

@@ -18,7 +18,6 @@ services:
       - /tmp:/tmp:rw
     working_dir: /app
     environment:
-      TOOLS_HOST: tools
       HOME: /app
     env_file:
       - .env

docker-compose.yml

@@ -184,23 +184,6 @@ describe('API authz tests', () => {
     await agent.post('/v1/teams').send(data).set('Authorization', `Bearer ${platformAdminToken}`).expect(200)
   })
 
-  test('platform admin can get all values', async () => {
-    jest.spyOn(otomiStack, 'getValues').mockResolvedValue({})
-    await agent.get('/v1/otomi/values').set('Authorization', `Bearer ${platformAdminToken}`).expect(200)
-  })
-
-  test('team member cannot get all values', async () => {
-    await agent.get('/v1/otomi/values').set('Authorization', `Bearer ${teamMemberToken}`).expect(403)
-  })
-
-  test('authenticated user cannot get all values', async () => {
-    await agent.get('/v1/otomi/values').set('Authorization', `Bearer ${userToken}`).expect(403)
-  })
-
-  test('unauthenticated user cannot get all values', async () => {
-    await agent.get('/v1/otomi/values').expect(401)
-  })
-
   test('platform admin can see values from an app', async () => {
     const values = { shown: true } as App['values']
     jest.spyOn(otomiStack, 'getApp').mockImplementation(() => ({ id: 'adminapp', values }))

src/api.authz.test.ts

@@ -1,11 +1,3 @@
-import { TOOLS_HOST, cleanEnv } from './validators'
-
-const env = cleanEnv({
-  TOOLS_HOST,
-})
-
-export const BASEURL = `http://${env.TOOLS_HOST}:17771`
-
 export const APL_SECRETS_NAMESPACE = 'apl-secrets'
 export const APL_USERS_NAMESPACE = 'apl-users'
 export const PLATFORM_SECRETS_NAME = 'otomi-secrets'

src/api/v1/otomi/values.ts

@@ -1,4 +1,3 @@
-import axios, { AxiosResponse } from 'axios'
 import Debug from 'debug'
 import diff from 'deep-diff'
 import { rmSync } from 'fs'
@@ -16,10 +15,8 @@ import {
   GIT_PUSH_RETRIES,
   GIT_REPO_URL,
   GIT_USER,
-  TOOLS_HOST,
 } from 'src/validators'
 import { parse as parseYaml, stringify as stringifyYaml } from 'yaml'
-import { BASEURL } from './constants'
 import { GitPullError } from './error'
 import { Core } from './otomi-models'
 import { getSanitizedErrorMessage, removeBlankAttributes, sanitizeGitPassword } from './utils'
@@ -33,12 +30,8 @@ const env = cleanEnv({
   GIT_REPO_URL,
   GIT_USER,
   GIT_PUSH_RETRIES,
-  TOOLS_HOST,
 })
 
-const baseUrl = BASEURL
-const valuesUrl = `${baseUrl}/otomi/values`
-
 const getProtocol = (url): string => (url && url.includes('://') ? url.split('://')[0] : 'http')
 
 const getUrl = (url): string => (!url || url.includes('://') ? url : `${getProtocol(url)}://${url}`)
@@ -92,12 +85,6 @@ export class Git {
     return getProtocol(this.url)
   }
 
-  async requestValues(params): Promise<AxiosResponse> {
-    debug(`Tools: requesting "otomi/values" ${this.path}`)
-    const res = await axios.get(valuesUrl, { params: { envDir: this.path, ...params } })
-    return res
-  }
-
   async addConfig(): Promise<void> {
     debug(`Adding git config`)
     await this.git.addConfig('user.name', this.user)

src/constants.ts

@@ -14,37 +14,6 @@ externalDocs:
 
 # -------------------------------------------- Paths
 paths:
-  /v1/otomi/values:
-    get:
-      operationId: getValues
-      x-eov-operation-handler: v1/otomi/values
-      description: Get otomi values
-      x-aclSchema: OtomiCliValues
-      parameters:
-        - name: filesOnly
-          in: query
-          description: IDs of settings to return
-          schema:
-            type: string
-            enum: ['true', 'false']
-        - name: excludeSecrets
-          in: query
-          schema:
-            type: string
-            enum: ['true', 'false']
-        - name: withWorkloadValues
-          in: query
-          schema:
-            type: string
-            enum: ['true', 'false']
-      responses:
-        '200':
-          description: Successfully obtained otomi values
-          content:
-            application/yaml:
-              schema:
-                $ref: '#/components/schemas/OtomiCliValues'
-
   /v1/teams:
     get:
       operationId: getTeams
@@ -3562,8 +3531,6 @@ components:
       $ref: 'error.yaml#/OpenApiValidationError'
     OtomiStackError:
       $ref: 'error.yaml#/OtomiStackError'
-    OtomiCliValues:
-      $ref: 'otomi/cli.yaml#/OtomiCliValues'
     Policy:
       $ref: 'policies.yaml#/Policy'
     Policies:

src/git.ts

@@ -111,7 +111,6 @@ import {
   OBJ_STORAGE_APPS,
   OBJECT_STORAGE_UI_EXCLUSIONS,
   PREINSTALLED_EXCLUDED_APPS,
-  TOOLS_HOST,
   VERSIONS,
 } from 'src/validators'
 import { v4 as uuidv4 } from 'uuid'
@@ -186,7 +185,6 @@ const env = cleanEnv({
   GIT_REPO_URL,
   GIT_USER,
   HELM_CHART_CATALOG,
-  TOOLS_HOST,
   VERSIONS,
   PREINSTALLED_EXCLUDED_APPS,
   HIDDEN_APPS,
@@ -274,10 +272,6 @@ export default class OtomiStack {
     return getAppList()
   }
 
-  async getValues(query): Promise<Record<string, any>> {
-    return (await this.git.requestValues(query)).data
-  }
-
   getRepoPath() {
     if (env.isTest || this.sessionId === undefined) return env.GIT_LOCAL_PATH
     return `${rootPath}/${this.sessionId}`