From 285d1f0d8da3faf5ee4ea7e527df16e1203d261d Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Mon, 19 May 2025 10:19:01 -0400 Subject: [PATCH] Update environment defaults (#816) ## Description: Update environment defaults. ## Please complete the following: - [x] I have added screenshots for all UI updates - [ ] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced - [x] I understand that submitting code with bugs that could have been caught through manual testing blocks releases and new features for all contributors Co-authored-by: Scott Anderson <662325+scottanderson@users.noreply.github.com> --- src/core/configuration/DefaultConfig.ts | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/core/configuration/DefaultConfig.ts b/src/core/configuration/DefaultConfig.ts index 87860555d..eca34f10b 100644 --- a/src/core/configuration/DefaultConfig.ts +++ b/src/core/configuration/DefaultConfig.ts @@ -57,47 +57,49 @@ export abstract class DefaultServerConfig implements ServerConfig { return this.publicKey; } otelEnabled(): boolean { - return Boolean( - this.otelEndpoint() && this.otelUsername() && this.otelPassword(), + return ( + Boolean(this.otelEndpoint()) && + Boolean(this.otelUsername()) && + Boolean(this.otelPassword()) ); } otelEndpoint(): string { - return process.env.OTEL_ENDPOINT ?? "undefined"; + return process.env.OTEL_ENDPOINT ?? ""; } otelUsername(): string { - return process.env.OTEL_USERNAME ?? "undefined"; + return process.env.OTEL_USERNAME ?? ""; } otelPassword(): string { - return process.env.OTEL_PASSWORD ?? "undefined"; + return process.env.OTEL_PASSWORD ?? ""; } region(): string { if (this.env() === GameEnv.Dev) { return "dev"; } - return process.env.REGION ?? "undefined"; + return process.env.REGION ?? ""; } gitCommit(): string { - return process.env.GIT_COMMIT ?? "undefined"; + return process.env.GIT_COMMIT ?? ""; } r2Endpoint(): string { return `https://${process.env.CF_ACCOUNT_ID}.r2.cloudflarestorage.com`; } r2AccessKey(): string { - return process.env.R2_ACCESS_KEY ?? "undefined"; + return process.env.R2_ACCESS_KEY ?? ""; } r2SecretKey(): string { - return process.env.R2_SECRET_KEY ?? "undefined"; + return process.env.R2_SECRET_KEY ?? ""; } r2Bucket(): string { - return process.env.R2_BUCKET ?? "undefined"; + return process.env.R2_BUCKET ?? ""; } adminHeader(): string { return "x-admin-key"; } adminToken(): string { - return process.env.ADMIN_TOKEN ?? "undefined"; + return process.env.ADMIN_TOKEN ?? "dummy-admin-token"; } abstract numWorkers(): number; abstract env(): GameEnv;