fix: empty env variables should be ignored (#2040)
* fix: empty env variables should be ignored * fix: e2e test fails because of empty env variable values
This commit is contained in:
@@ -35,4 +35,5 @@ export const env = createEnv({
|
|||||||
// NEXT_PUBLIC_CLIENTVAR: process.env.NEXT_PUBLIC_CLIENTVAR,
|
// NEXT_PUBLIC_CLIENTVAR: process.env.NEXT_PUBLIC_CLIENTVAR,
|
||||||
},
|
},
|
||||||
skipValidation: shouldSkipEnvValidation(),
|
skipValidation: shouldSkipEnvValidation(),
|
||||||
|
emptyStringAsUndefined: true,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -49,9 +49,9 @@ describe("Onboarding", () => {
|
|||||||
environment: {
|
environment: {
|
||||||
AUTH_PROVIDERS: "ldap",
|
AUTH_PROVIDERS: "ldap",
|
||||||
AUTH_LDAP_URI: "ldap://host.docker.internal:3890",
|
AUTH_LDAP_URI: "ldap://host.docker.internal:3890",
|
||||||
AUTH_LDAP_BASE: "",
|
AUTH_LDAP_BASE: "not-used",
|
||||||
AUTH_LDAP_BIND_DN: "",
|
AUTH_LDAP_BIND_DN: "not-used",
|
||||||
AUTH_LDAP_BIND_PASSWORD: "",
|
AUTH_LDAP_BIND_PASSWORD: "not-used",
|
||||||
},
|
},
|
||||||
mounts: {
|
mounts: {
|
||||||
"/appdata": localMountPath,
|
"/appdata": localMountPath,
|
||||||
|
|||||||
@@ -86,4 +86,5 @@ export const env = createEnv({
|
|||||||
AUTH_OIDC_NAME_ATTRIBUTE_OVERWRITE: process.env.AUTH_OIDC_NAME_ATTRIBUTE_OVERWRITE,
|
AUTH_OIDC_NAME_ATTRIBUTE_OVERWRITE: process.env.AUTH_OIDC_NAME_ATTRIBUTE_OVERWRITE,
|
||||||
},
|
},
|
||||||
skipValidation,
|
skipValidation,
|
||||||
|
emptyStringAsUndefined: true,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -26,4 +26,5 @@ export const env = createEnv({
|
|||||||
SECRET_ENCRYPTION_KEY: process.env.SECRET_ENCRYPTION_KEY,
|
SECRET_ENCRYPTION_KEY: process.env.SECRET_ENCRYPTION_KEY,
|
||||||
},
|
},
|
||||||
skipValidation: shouldSkipEnvValidation(),
|
skipValidation: shouldSkipEnvValidation(),
|
||||||
|
emptyStringAsUndefined: true,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -27,7 +27,11 @@ export const env = createEnv({
|
|||||||
.default(drivers.betterSqlite3),
|
.default(drivers.betterSqlite3),
|
||||||
...(urlRequired
|
...(urlRequired
|
||||||
? {
|
? {
|
||||||
DB_URL: z.string(),
|
DB_URL:
|
||||||
|
// Fallback to the default sqlite file path in production
|
||||||
|
process.env.NODE_ENV === "production" && isDriver("better-sqlite3")
|
||||||
|
? z.string().default("/appdata/db/db.sqlite")
|
||||||
|
: z.string().nonempty(),
|
||||||
}
|
}
|
||||||
: {}),
|
: {}),
|
||||||
...(hostRequired
|
...(hostRequired
|
||||||
@@ -58,4 +62,5 @@ export const env = createEnv({
|
|||||||
DB_PORT: process.env.DB_PORT,
|
DB_PORT: process.env.DB_PORT,
|
||||||
},
|
},
|
||||||
skipValidation: shouldSkipEnvValidation(),
|
skipValidation: shouldSkipEnvValidation(),
|
||||||
|
emptyStringAsUndefined: true,
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user