Skip to content

fix: revert remove team password generation #720

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
ferruhcihan merged 2 commits into from
May 9, 2025
Merged

fix: revert remove team password generation #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f813bf6
fix: revert remove team password generation
ferruhcihan May 8, 2025
55d1098
fix: save team for v2 endpoints
ferruhcihan May 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
2 changes: 1 addition & 1 deletion src/git.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ export class Git {
secretJsonPaths.forEach((objectPath) => {
const val = get(config, objectPath)
if (val) {
set(secretData, objectPath, val)
set(secretData, fileMap.v2 ? objectPath.replace('.spec', '') : objectPath, val)
unset(plainData, objectPath)
}
})
Expand Down
21 changes: 20 additions & 1 deletion src/otomi-stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,13 @@ export default class OtomiStack {
cleanSecretPaths.push(p)
} else {
teams.forEach((teamId: string) => {
if (p.indexOf(teamProp) === 0) cleanSecretPaths.push(p.replace(teamProp, `teamConfig.${teamId}`))
if (p.indexOf(teamProp) === 0)
cleanSecretPaths.push(
p
.replace(teamProp, `teamConfig.${teamId}`)
// add spec to the path for v2 endpoints
.replace(`teamConfig.${teamId}.settings`, `teamConfig.${teamId}.settings.spec`),
)
})
}
})
Expand Down Expand Up @@ -680,6 +686,19 @@ export default class OtomiStack {
async createAplTeam(data: AplTeamSettingsRequest, deploy = true): Promise<AplTeamSettingsResponse> {
const teamName = data.metadata.name

if (isEmpty(data.spec.password)) {
debug(`creating password for team '${teamName}'`)
// eslint-disable-next-line no-param-reassign
data.spec.password = generatePassword({
length: 16,
numbers: true,
symbols: false,
lowercase: true,
uppercase: true,
strict: true,
})
}

const teamConfig = this.repoService.createTeamConfig(data)
const team = teamConfig.settings
const apps = getAppList()
Expand Down
Loading