MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove global audit logs SQS flag.

This commit is contained in:
Sam Rose 2024-08-15 15:37:51 +01:00
parent dc28b7e133
commit 06a7801d8c
No known key found for this signature in database
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/backend-core/src/features/index.ts
View File

@ -136,10 +136,9 @@ export class FlagSet<V extends Flag<any>, T extends { [key: string]: V }> {
return cachedFlags return cachedFlags
} }
const currentContext = context.getCurrentContext()
const tags: Record<string, any> = {} const tags: Record<string, any> = {}
const flagValues = this.defaults() const flagValues = this.defaults()
const currentTenantId = currentContext?.tenantId const currentTenantId = context.getTenantId()
const specificallySetFalse = new Set<string>() const specificallySetFalse = new Set<string>()
const split = (env.TENANT_FEATURE_FLAGS || "") const split = (env.TENANT_FEATURE_FLAGS || "")

2
packages/pro

@ -1 +1 @@
Subproject commit 5678433b7cfb3f121fbf837a0d6ddeeee054a7ed Subproject commit d4f83bf74a80a3e8a1e0c29aa1adc7231fe76d49

7
packages/worker/src/api/routes/global/tests/auditLogs.spec.ts
View File

@ -1,7 +1,6 @@
import { mocks, structures } from "@budibase/backend-core/tests" import { mocks, structures } from "@budibase/backend-core/tests"
import { context, events } from "@budibase/backend-core" import { context, events, setEnv as setCoreEnv } from "@budibase/backend-core"
import { Event, IdentityType } from "@budibase/types" import { Event, IdentityType } from "@budibase/types"
import { auditLogs } from "@budibase/pro"
import { TestConfiguration } from "../../../../tests" import { TestConfiguration } from "../../../../tests"
mocks.licenses.useAuditLogs() mocks.licenses.useAuditLogs()
@ -15,15 +14,17 @@ const APP_ID = "app_1"
describe.each(["lucene", "sql"])("/api/global/auditlogs (%s)", method => { describe.each(["lucene", "sql"])("/api/global/auditlogs (%s)", method => {
const config = new TestConfiguration() const config = new TestConfiguration()
let envCleanup: (() => void) | undefined
beforeAll(async () => { beforeAll(async () => {
if (method === "sql") { if (method === "sql") {
auditLogs.useSQLSearch() envCleanup = setCoreEnv({ TENANT_FEATURE_FLAGS: "*:SQS" })
} }
await config.beforeAll() await config.beforeAll()
}) })
afterAll(async () => { afterAll(async () => {
envCleanup?.()
await config.afterAll() await config.afterAll()
}) })

4
packages/worker/src/index.ts
View File

@ -101,10 +101,6 @@ export default server.listen(parseInt(env.PORT || "4002"), async () => {
// configure events to use the pro audit log write // configure events to use the pro audit log write
// can't integrate directly into backend-core due to cyclic issues // can't integrate directly into backend-core due to cyclic issues
await events.processors.init(proSdk.auditLogs.write) await events.processors.init(proSdk.auditLogs.write)
if (await features.flags.isEnabled("SQS")) {
sdk.auditLogs.useSQLSearch()
}
}) })
process.on("uncaughtException", err => { process.on("uncaughtException", err => {