feat(nacos): namespace production protection and sidebar visibility
This commit is contained in:
25 files changed
+492
-26
No files matched your search
@@ -63,4 +63,12 @@ describe("Nacos connection dialog layout", () => {
|
||||
expect(source).toContain("api.nacosListNamespaces(draftId)");
|
||||
expect(source).toContain("showVisibleNacosNamespacesDialog");
|
||||
});
|
||||
|
||||
it("uses namespaces when scoping Nacos production safeguards", () => {
|
||||
expect(source).toContain('form.value.db_type === "nacos"');
|
||||
expect(source).toContain("production.allNamespaces");
|
||||
expect(source).toContain("production.namespacePickerTitle");
|
||||
expect(source).toContain("api.nacosListNamespaces(connectionId)");
|
||||
expect(source).toContain("nacosNamespaceIdentity(name)");
|
||||
});
|
||||
});
|
||||
@@ -1,5 +1,6 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { filterNacosNamespacesForSidebar, normalizeNacosNamespaceSelection, normalizeNacosNamespacesForDisplay } from "@/lib/nacos/nacosNamespaceVisibility";
|
||||
import { nacosVisibleNamespaceSummary } from "@/lib/sidebar/sidebarVisibleFilterSummary";
|
||||
|
||||
const namespaces = [
|
||||
{ namespace: "", namespaceShowName: "public" },
|
||||
@@ -30,4 +31,13 @@ describe("filterNacosNamespacesForSidebar", () => {
|
||||
const duplicatePublic = [namespaces[0], { namespace: "public", namespaceShowName: "public" }, namespaces[1]];
|
||||
expect(normalizeNacosNamespacesForDisplay(duplicatePublic)).toEqual([duplicatePublic[1], duplicatePublic[2]]);
|
||||
});
|
||||
|
||||
it("counts a legacy public selection as visible for a Nacos 3 endpoint", () => {
|
||||
expect(nacosVisibleNamespaceSummary({ visible_databases: ["", "prod"] }, ["public", "dev", "prod"])).toEqual({
|
||||
mode: "namespace",
|
||||
isActive: true,
|
||||
selected: 2,
|
||||
total: 3,
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -40,6 +40,12 @@ describe("production SQL safety", () => {
|
||||
expect(productionContextForDatabase(connection(), "staging").active).toBe(false);
|
||||
});
|
||||
|
||||
it("treats Nacos public and empty namespace IDs as the same protected namespace", () => {
|
||||
const nacos = connection({ db_type: "nacos", production_databases: [""] });
|
||||
expect(productionContextForDatabase(nacos, "public")).toMatchObject({ active: true, reason: "database", databases: ["public"] });
|
||||
expect(productionContextForDatabase(nacos, "")).toMatchObject({ active: true, reason: "database", databases: ["public"] });
|
||||
});
|
||||
|
||||
it("detects a write after a USE production switch despite comments", () => {
|
||||
const assessment = assessProductionSql("-- install\nUSE `prod_app`; /* migration */ DELETE FROM users", connection(), "staging");
|
||||
expect(assessment).toMatchObject({ active: true, isMutation: true, databases: ["prod_app"] });
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import type { ConnectionConfig, DatabaseType } from "@/types/database";
|
||||
import { nacosNamespaceIdentity } from "@/lib/nacos/nacosNamespaceVisibility";
|
||||
import { classifySqlRisk, isSqlRiskMutation } from "@/lib/sql/sqlRisk";
|
||||
|
||||
export type ProductionContextReason = "connection" | "database" | "sql_target";
|
||||
@@ -93,6 +94,9 @@ export function normalizeProductionDatabase(value: string | undefined | null): s
|
||||
|
||||
export function productionDatabases(connection: ConnectionConfig | undefined): string[] {
|
||||
if (!connection?.production_databases?.length) return [];
|
||||
if (connection.db_type === "nacos") {
|
||||
return [...new Set(connection.production_databases.map(nacosNamespaceIdentity))];
|
||||
}
|
||||
return [...new Set(connection.production_databases.map(normalizeProductionDatabase).filter(Boolean))];
|
||||
}
|
||||
|
||||
@@ -100,10 +104,10 @@ export function productionContextForDatabase(connection: ConnectionConfig | unde
|
||||
if (!connection) return { active: false, databases: [] };
|
||||
if (connection.is_production) return { active: true, reason: "connection", databases: [] };
|
||||
|
||||
const normalizedDatabase = normalizeProductionDatabase(database);
|
||||
const normalizedDatabase = connection.db_type === "nacos" ? nacosNamespaceIdentity(String(database ?? "")) : normalizeProductionDatabase(database);
|
||||
const marked = productionDatabases(connection);
|
||||
if (normalizedDatabase && marked.includes(normalizedDatabase)) {
|
||||
return { active: true, reason: "database", databases: [String(database)] };
|
||||
return { active: true, reason: "database", databases: [connection.db_type === "nacos" ? normalizedDatabase : String(database)] };
|
||||
}
|
||||
return { active: false, databases: [] };
|
||||
}
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
import type { ConnectionConfig } from "@/types/database";
|
||||
import { connectionUsesVisibleSchemaFilter, filterDatabaseNamesForVisiblePicker, filterSchemaNamesForVisiblePicker, normalizeVisibleDatabaseSelection } from "@/lib/database/visibleDatabases";
|
||||
import { nacosNamespaceIdentity } from "@/lib/nacos/nacosNamespaceVisibility";
|
||||
|
||||
type SidebarVisibleFilterConnection = Pick<ConnectionConfig, "database" | "db_type" | "driver_profile" | "show_system_schemas" | "username" | "visible_databases" | "visible_schemas">;
|
||||
|
||||
export type SidebarVisibleFilterSummary = {
|
||||
mode: "database" | "schema";
|
||||
mode: "database" | "schema" | "namespace";
|
||||
isActive: boolean;
|
||||
selected: number | null;
|
||||
total: number | null;
|
||||
@@ -40,3 +41,17 @@ export function sidebarVisibleFilterSummary(connection: SidebarVisibleFilterConn
|
||||
total,
|
||||
};
|
||||
}
|
||||
|
||||
export function nacosVisibleNamespaceSummary(connection: Pick<ConnectionConfig, "visible_databases">, namespaceIds?: readonly string[]): SidebarVisibleFilterSummary {
|
||||
if (!namespaceIds) return { mode: "namespace", isActive: false, selected: null, total: null };
|
||||
|
||||
const identities = [...new Set(namespaceIds.map(nacosNamespaceIdentity))];
|
||||
const total = identities.length;
|
||||
if (!Array.isArray(connection.visible_databases)) {
|
||||
return { mode: "namespace", isActive: false, selected: total, total };
|
||||
}
|
||||
|
||||
const selected = new Set(connection.visible_databases.map(nacosNamespaceIdentity));
|
||||
const selectedCount = identities.filter((identity) => selected.has(identity)).length;
|
||||
return { mode: "namespace", isActive: selectedCount < total, selected: selectedCount, total };
|
||||
}
|
||||
Reference in new issue
Block a user