Skip to content

fix: revert structural change of app values on toggle #863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merll merged 3 commits into from
Dec 8, 2025
Merged

fix: revert structural change of app values on toggle #863

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7254aa3
fix: revert structural change of app values on toggle
merll Dec 8, 2025
e2981b4
fix: order of arguments
merll Dec 8, 2025
8931ddf
feat: simplify app toggle functionallity
j-zimnowoda Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions src/otomi-stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 } from '@linode/api-v4'
Expand All @@ -17,9 +17,9 @@ import {
PublicUrlExists,
ValidationError,
} from 'src/error'
import getRepo, { getWorktreeRepo, Git } from 'src/git'
import { FileStore } from 'src/fileStore/file-store'
import { getSettingsFileMaps } from 'src/fileStore/file-map'
import { FileStore } from 'src/fileStore/file-store'
import getRepo, { getWorktreeRepo, Git } from 'src/git'
import { cleanSession, getSessionStack } from 'src/middleware'
import {
AplAgentRequest,
Expand Down Expand Up @@ -109,6 +109,7 @@ import { v4 as uuidv4 } from 'uuid'
import { parse as parseYaml, stringify as stringifyYaml } from 'yaml'
import { getAIModels } from './ai/aiModelHandler'
import { DatabaseCR } from './ai/DatabaseCR'
import { getResourceFilePath, getSecretFilePath } from './fileStore/file-map'
import {
apply,
checkPodExists,
Expand All @@ -132,7 +133,6 @@ import { getSealedSecretsPEM, sealedSecretManifest } from './utils/sealedSecretU
import { getKeycloakUsers, isValidUsername } from './utils/userUtils'
import { ObjectStorageClient } from './utils/wizardUtils'
import { fetchChartYaml, fetchWorkloadCatalog, NewHelmChartValues, sparseCloneChart } from './utils/workloadUtils'
import { getResourceFilePath, getSecretFilePath } from './fileStore/file-map'

interface ExcludedApp extends App {
managed: boolean
Expand Down Expand Up @@ -616,15 +616,13 @@ export default class OtomiStack {
const orig = this.getApp(id)
if (orig && this.canToggleApp(id)) {
const filePath = getResourceFilePath('AplApp', id)
const aplApp = toPlatformObject('AplApp', id, {
...orig,
enabled,
values: { ...orig.values, enabled },
})
this.fileStore.set(filePath, aplApp)

const app = { ...orig, enabled }
await this.saveAdminApp(app)
const aplApp = this.fileStore.get(filePath)
if (!aplApp) {
throw new NotExistError(`App ${id} not found`)
}
set(aplApp, 'spec.enabled', enabled)

await this.saveAppToggle(aplApp)
return { filePath, content: aplApp } as AplRecord
}
return undefined
Expand Down Expand Up @@ -2391,6 +2389,11 @@ export default class OtomiStack {

return { filePath, content: aplObject }
}
async saveAppToggle(app: AplObject): Promise<void> {
const globalPaths = getSecretPaths()
const appSecretPaths = this.extractAppSecretPaths(app.metadata.name, globalPaths)
await this.saveWithSecrets(app, appSecretPaths)
}

async saveAdminApp(app: App, secretPaths?: string[]): Promise<void> {
const { id, enabled, values, rawValues } = app
Expand Down
Loading