Merge pull request #13192 from Budibase/BUDI-8046/scim-logger

SCIM logger
This commit is contained in:
Adria Navarro 2024-03-07 14:30:09 +01:00 committed by GitHub
commit 97778a2b45
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 18 additions and 1 deletions

View File

@ -5,3 +5,4 @@ export * as writethrough from "./writethrough"
export * as invite from "./invite" export * as invite from "./invite"
export * as passwordReset from "./passwordReset" export * as passwordReset from "./passwordReset"
export * from "./generic" export * from "./generic"
export * as docWritethrough from "./docWritethrough"

View File

@ -57,6 +57,9 @@ export const StaticDatabases = {
AUDIT_LOGS: { AUDIT_LOGS: {
name: "audit-logs", name: "audit-logs",
}, },
SCIM_LOGS: {
name: "scim-logs",
},
} }
export const APP_PREFIX = prefixed(DocumentType.APP) export const APP_PREFIX = prefixed(DocumentType.APP)

View File

@ -35,6 +35,17 @@ export function getAuditLogDBName(tenantId?: string) {
} }
} }
export function getScimDBName(tenantId?: string) {
if (!tenantId) {
tenantId = getTenantId()
}
if (tenantId === DEFAULT_TENANT_ID) {
return StaticDatabases.SCIM_LOGS.name
} else {
return `${tenantId}${SEPARATOR}${StaticDatabases.SCIM_LOGS.name}`
}
}
export function baseGlobalDBName(tenantId: string | undefined | null) { export function baseGlobalDBName(tenantId: string | undefined | null) {
if (!tenantId || tenantId === DEFAULT_TENANT_ID) { if (!tenantId || tenantId === DEFAULT_TENANT_ID) {
return StaticDatabases.GLOBAL.name return StaticDatabases.GLOBAL.name

View File

@ -186,6 +186,7 @@ const environment = {
environment[key] = value environment[key] = value
}, },
ROLLING_LOG_MAX_SIZE: process.env.ROLLING_LOG_MAX_SIZE || "10M", ROLLING_LOG_MAX_SIZE: process.env.ROLLING_LOG_MAX_SIZE || "10M",
DISABLE_SCIM_CALLS: process.env.DISABLE_SCIM_CALLS,
} }
// clean up any environment variable edge cases // clean up any environment variable edge cases

@ -1 +1 @@
Subproject commit 2b322d0f4b71ba96664d383b94c30445ead7ac5b Subproject commit 80a4d8ff998895fc298ee510158a82ce7daebc67

View File

@ -38,6 +38,7 @@ export enum DocumentType {
AUTOMATION_METADATA = "meta_au", AUTOMATION_METADATA = "meta_au",
AUDIT_LOG = "al", AUDIT_LOG = "al",
APP_MIGRATION_METADATA = "_design/migrations", APP_MIGRATION_METADATA = "_design/migrations",
SCIM_LOG = "scimlog",
} }
// these are the core documents that make up the data, design // these are the core documents that make up the data, design