fix: 5xx errors (#2025)

Co-authored-by: Cihanoglu, Ferruh <[email protected]>

Author: CasLubbers

src/cmd/bootstrap.ts

@@ -117,8 +117,8 @@ export const bootstrapSops = async (
       }
     }
     // now do a round of encryption and decryption to make sure we have all the files in place for later
-    await deps.encrypt()
-    await deps.decrypt()
+    await deps.encrypt(envDir)
+    await deps.decrypt(envDir)
   }
 }
 

src/cmd/validate-values.ts

@@ -19,7 +19,7 @@ export const validateValues = async (envDir = env.ENV_DIR): Promise<void> => {
   // TODO: Make this return true or error tree
   // Create an end point function (when running otomi validate-values) to print current messages.
   const argv: HelmArguments = getParsedArgs()
-  d.log('Values validation STARTED')
+  d.log('Values validation STARTED on ', envDir)
 
   if (argv.l || argv.label) {
     const labelOpts = [...new Set([...(argv.l ?? []), ...(argv.label ?? [])])]

src/common/crypt.ts

@@ -42,9 +42,10 @@ const preCrypt = async (path): Promise<void> => {
 
 const getAllSecretFiles = async (path) => {
   const d = terminal(`common:crypt:getAllSecretFiles`)
-  const files = (await readdirRecurse(`${path}/env`, { skipHidden: true }))
-    .filter((file) => file.endsWith('.yaml') && file.includes('/secrets.'))
-    .map((file) => file.replace(`${path}/`, ''))
+  const files = (await readdirRecurse(`${path}/env`, { skipHidden: true })).filter(
+    (file) => file.endsWith('.yaml') && file.includes('/secrets.'),
+  )
+
   d.debug('getAllSecretFiles: ', files)
   return files
 }
@@ -92,8 +93,6 @@ const runOnSecretFiles = async (path: string, crypt: CR, filesArgs: string[] = [
   const d = terminal(`common:crypt:runOnSecretFiles`)
   let files: string[] = filesArgs
 
-  cd(path)
-
   if (files.length === 0) {
     files = await getAllSecretFiles(path)
   }

src/server.ts

@@ -3,7 +3,6 @@ import $RefParser, { JSONSchema } from '@apidevtools/json-schema-ref-parser'
 import express, { Request, Response } from 'express'
 import { Server } from 'http'
 import { bootstrapSops } from 'src/cmd/bootstrap'
-import { validateValues } from 'src/cmd/validate-values'
 import { decrypt, encrypt } from 'src/common/crypt'
 import { terminal } from 'src/common/debug'
 import { hfValues } from './common/hf'
@@ -25,12 +24,13 @@ app.get('/', async (req: Request, res: Response): Promise<Response<any>> => {
 
 type QueryParams = {
   envDir: string
+  files?: string[]
 }
 
 app.get('/init', async (req: Request, res: Response) => {
   const { envDir } = req.query as QueryParams
   try {
-    d.log('Request to initialize values repo')
+    d.log('Request to initialize values repo on', envDir)
     await decrypt(envDir)
     res.status(200).send('ok')
   } catch (error) {
@@ -40,21 +40,20 @@ app.get('/init', async (req: Request, res: Response) => {
 })
 
 app.get('/prepare', async (req: Request, res: Response) => {
-  const { envDir } = req.query as QueryParams
+  const { envDir, files } = req.query as QueryParams
   try {
-    d.log('Request to prepare values repo')
+    d.log('Request to prepare values repo on', envDir)
     await bootstrapSops(envDir)
     await setValuesFile(envDir)
     // Encrypt ensures that a brand new secret file is encrypted in place
-    await encrypt(envDir)
+    await encrypt(envDir, ...(files ?? []))
     // Decrypt ensures that a brand new encrypted secret file is decrypted to the .dec file
-    await decrypt(envDir)
-    await validateValues(envDir)
+    await decrypt(envDir, ...(files ?? []))
     res.status(200).send('ok')
   } catch (error) {
     const err = `${error}`
     let status = 500
-    d.error(err)
+    d.error(`Request to prepare values went wrong: ${err}`)
     if (err.includes('Values validation FAILED')) {
       status = 422
     }