Skip to content

Commit c9a6cf3

Browse files
geroplroboquat
authored andcommitted
[server] Fix temporary config validation
1 parent 9fd31ef commit c9a6cf3

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

chart/templates/server-configmap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,5 @@ data:
7272
"codeSync": {{ $comp.codeSync | toJson }},
7373
"enablePayment": {{ $comp.enablePayment }},
7474
"insecureNoDomain": {{ $comp.insecureNoDomain }},
75-
"chargebeeProviderOptionsFile": {{ $comp.chargebeeProviderOptionsFile }}
75+
"chargebeeProviderOptionsFile": {{ $comp.chargebeeProviderOptionsFile | quote }}
7676
}

components/server/src/config.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,20 @@ export namespace ConfigEnv {
224224
const n = deepCopySorted(_n);
225225
const o = deepCopySorted(_o);
226226

227+
// Changed
228+
if (o.githubApp?.enabled === false && n.githubApp?.enabled === false) {
229+
delete (o as any).githubApp;
230+
delete (n as any).githubApp;
231+
}
232+
if (n.githubApp) {
233+
delete (n as any).githubApp.certSecretName;
234+
}
235+
236+
delete (n as any).chargebeeProviderOptionsFile;
237+
if (o.devBranch === "") {
238+
delete (o as any).devBranch;
239+
}
240+
227241
// Unique
228242
delete (n as any).workspaceGarbageCollection.startDate;
229243
delete (o as any).workspaceGarbageCollection.startDate;

0 commit comments

Comments
 (0)