Skip to content

fix: re-encrypting values #871

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
CasLubbers merged 2 commits into from
Dec 15, 2025
Merged

fix: re-encrypting values #871

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
910b26f
fix: re-encrypting values
CasLubbers Dec 15, 2025
81f6182
Merge remote-tracking branch 'origin/main' into fix-re-encrypt
svcAPLBot Dec 15, 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
32 changes: 17 additions & 15 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, User as k8sUser, KubeConfig, V1ObjectReference } from '@kubernetes/client-node'
import { CoreV1Api, KubeConfig, User as k8sUser, V1ObjectReference } from '@kubernetes/client-node'
import Debug from 'debug'

import { getRegions, ObjectStorageKeyRegions } from '@linode/api-v4'
Expand Down Expand Up @@ -508,7 +508,9 @@ export default class OtomiStack {
this.fileStore.set(filePath, aplObject)

await this.saveSettings()
await this.doDeployment({ filePath, content: aplObject })
await this.doDeployment({ filePath, content: aplObject }, true, [
`${this.getRepoPath()}/env/settings/secrets.${settingId}.yaml`,
])
return settings
}

Expand Down Expand Up @@ -603,7 +605,7 @@ export default class OtomiStack {
this.fileStore.set(filePath, aplApp)

await this.saveAdminApp(app)
await this.doDeployment({ filePath, content: aplApp })
await this.doDeployment({ filePath, content: aplApp }, true, [`${this.getRepoPath()}/env/apps/secrets.${id}.yaml`])
return this.getApp(id)
}

Expand Down Expand Up @@ -636,7 +638,7 @@ export default class OtomiStack {
if (aplRecords.length === 0) {
throw new Error(`Failed toggling apps ${ids.toString()}`)
}
await this.doDeployments(aplRecords)
await this.doDeployments(aplRecords, false)
}

getTeams(): Array<Team> {
Expand Down Expand Up @@ -933,7 +935,7 @@ export default class OtomiStack {

async deleteNetpol(teamId: string, name: string): Promise<void> {
const filePath = await this.deleteTeamConfigItem('AplTeamNetworkControl', teamId, name)
await this.doDeleteDeployment([filePath], false)
await this.doDeleteDeployment([filePath])
}

getAllUsers(sessionUser: SessionUser): Array<User> {
Expand Down Expand Up @@ -1039,7 +1041,7 @@ export default class OtomiStack {
}

await this.deleteUserFile(id)
await this.doDeleteDeployment([filePath], false)
await this.doDeleteDeployment([filePath])
}

private canTeamAdminUpdateUserTeams(sessionUser: SessionUser, existingUser: User, updatedUserTeams: string[]) {
Expand Down Expand Up @@ -1197,7 +1199,7 @@ export default class OtomiStack {

async deleteCodeRepo(teamId: string, name: string): Promise<void> {
const filePath = await this.deleteTeamConfigItem('AplTeamCodeRepo', teamId, name)
await this.doDeleteDeployment([filePath], false)
await this.doDeleteDeployment([filePath])
}

async getRepoBranches(codeRepoName: string, teamId: string): Promise<string[]> {
Expand Down Expand Up @@ -1376,7 +1378,7 @@ export default class OtomiStack {

async deleteBuild(teamId: string, name: string): Promise<void> {
const filePath = await this.deleteTeamConfigItem('AplTeamBuild', teamId, name)
await this.doDeleteDeployment([filePath], false)
await this.doDeleteDeployment([filePath])
}

getTeamPolicies(teamId: string): Policies {
Expand Down Expand Up @@ -1710,7 +1712,7 @@ export default class OtomiStack {

async deleteWorkload(teamId: string, name: string): Promise<void> {
const filePath = await this.deleteTeamWorkload('AplTeamWorkload', teamId, name)
await this.doDeleteDeployment([filePath], false)
await this.doDeleteDeployment([filePath])
}

async editWorkloadValues(teamId: string, name: string, data: WorkloadValues): Promise<WorkloadValues> {
Expand Down Expand Up @@ -1812,7 +1814,7 @@ export default class OtomiStack {

async deleteService(teamId: string, name: string): Promise<void> {
const filePath = await this.deleteTeamConfigItem('AplTeamService', teamId, name)
await this.doDeleteDeployment([filePath], false)
await this.doDeleteDeployment([filePath])
}

checkPublicUrlInUse(teamId: string, service: AplServiceRequest): void {
Expand Down Expand Up @@ -1880,12 +1882,12 @@ export default class OtomiStack {
}
}

async doDeleteDeployment(filePaths: string[], encryptSecrets = true, files?: string[]): Promise<void> {
async doDeleteDeployment(filePaths: string[]): Promise<void> {
const rootStack = await getSessionStack()

try {
// Commit and push Git changes
await this.git.save(this.editor!, encryptSecrets, files)
await this.git.save(this.editor!, false)
// Pull the latest changes to ensure we have the most recent state
await rootStack.git.git.pull()

Expand Down Expand Up @@ -2137,7 +2139,7 @@ export default class OtomiStack {
async deleteSealedSecret(teamId: string, name: string): Promise<void> {
const filePath = this.fileStore.deleteTeamResource('AplTeamSecret', teamId, name)
await this.git.removeFile(filePath)
await this.doDeleteDeployment([filePath], false)
await this.doDeleteDeployment([filePath])
}

async getSealedSecret(teamId: string, name: string): Promise<SealedSecret> {
Expand Down Expand Up @@ -2220,7 +2222,7 @@ export default class OtomiStack {
const databasePath = getTeamDatabaseValuesFilePath(teamId, `${name}.yaml`)
await this.git.removeFile(relativePath)
await this.git.removeFile(databasePath)
await this.doDeleteDeployment([filePath], false)
await this.doDeleteDeployment([filePath])
}

async getAplKnowledgeBase(teamId: string, name: string): Promise<AplKnowledgeBaseResponse> {
Expand Down Expand Up @@ -2285,7 +2287,7 @@ export default class OtomiStack {
const filePath = this.fileStore.deleteTeamResource('AkamaiAgent', teamId, name)

await this.git.removeFile(filePath)
await this.doDeleteDeployment([filePath], false)
await this.doDeleteDeployment([filePath])
}

getAplAgent(teamId: string, name: string): AplAgentResponse {
Expand Down
Loading