Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
chore: tiny code fix (#20723)
ecmadaobd86f5ab90e4
diff --git a/backend/component/secret/vault.go b/backend/component/secret/vault.goindex 81d2f9284a..3421d30f93 100644--- a/backend/component/secret/vault.go+++ b/backend/component/secret/vault.go@@ -69,14 +69,9 @@ func getVaultClient(ctx context.Context, externalSecret *storepb.DataSourceExterif role == nil {return nil, errors.Errorf("approle is invalid")}- appRoleSecret := &approle.SecretID{}- switch role.Type {- case storepb.DataSourceExternalSecret_AppRoleAuthOption_PLAIN:- appRoleSecret.FromString = role.SecretId- case storepb.DataSourceExternalSecret_AppRoleAuthOption_ENVIRONMENT:- appRoleSecret.FromEnv = role.SecretId- default:- return nil, errors.Errorf("unsupported app role auth type: %v", role.Type)+ appRoleSecret, err := resolveVaultAppRoleSecretID(role)+ if err != nil {+ return nil, err}opts := []approle.LoginOption{}@@ -108,6 +103,19 @@ func getVaultClient(ctx context.Context, externalSecret *storepb.DataSourceExterreturn client, nil}+func resolveVaultAppRoleSecretID(role *storepb.DataSourceExternalSecret_AppRoleAuthOption) (*approle.SecretID, error) {+ appRoleSecret := &approle.SecretID{}+ switch role.GetType() {+ case storepb.DataSourceExternalSecret_AppRoleAuthOption_SECRET_TYPE_UNSPECIFIED, storepb.DataSourceExternalSecret_AppRoleAuthOption_PLAIN:+ appRoleSecret.FromString = role.GetSecretId()+ case storepb.DataSourceExternalSecret_AppRoleAuthOption_ENVIRONMENT:+ appRoleSecret.FromEnv = role.GetSecretId()+ default:+ return nil, errors.Errorf("unsupported app role auth type: %v", role.GetType())+ }+ return appRoleSecret, nil+}+// resolveVaultToken resolves the Vault token from the external secret config.// The token field is interpreted according to TokenType: the literal token// (PLAIN), an environment variable name (ENVIRONMENT), or a file path (FILE).diff --git a/backend/component/secret/vault_test.go b/backend/component/secret/vault_test.goindex ad9e57501f..7c48e99fd3 100644--- a/backend/component/secret/vault_test.go+++ b/backend/component/secret/vault_test.go@@ -75,3 +75,32 @@ func TestResolveVaultToken(t *testing.T) {require.Error(t, err)})}++func TestResolveVaultAppRoleSecretID(t *testing.T) {+ t.Run("plain", func(t *testing.T) {+ got, err := resolveVaultAppRoleSecretID(&storepb.DataSourceExternalSecret_AppRoleAuthOption{+ SecretId: "plain-secret-id",+ Type: storepb.DataSourceExternalSecret_AppRoleAuthOption_PLAIN,+ })+ require.NoError(t, err)+ require.Equal(t, "plain-secret-id", got.FromString)+ })++ t.Run("unspecified defaults to plain", func(t *testing.T) {+ got, err := resolveVaultAppRoleSecretID(&storepb.DataSourceExternalSecret_AppRoleAuthOption{+ SecretId: "plain-secret-id",+ Type: storepb.DataSourceExternalSecret_AppRoleAuthOption_SECRET_TYPE_UNSPECIFIED,+ })+ require.NoError(t, err)+ require.Equal(t, "plain-secret-id", got.FromString)+ })++ t.Run("environment", func(t *testing.T) {+ got, err := resolveVaultAppRoleSecretID(&storepb.DataSourceExternalSecret_AppRoleAuthOption{+ SecretId: "BB_TEST_VAULT_APP_ROLE_SECRET_ID",+ Type: storepb.DataSourceExternalSecret_AppRoleAuthOption_ENVIRONMENT,+ })+ require.NoError(t, err)+ require.Equal(t, "BB_TEST_VAULT_APP_ROLE_SECRET_ID", got.FromEnv)+ })+}diff --git a/frontend/src/react/components/sql-editor/SchemaPane/hover-state.test.tsx b/frontend/src/react/components/sql-editor/SchemaPane/hover-state.test.tsxnew file mode 100644index 0000000000..014c2b7e57--- /dev/null+++ b/frontend/src/react/components/sql-editor/SchemaPane/hover-state.test.tsx@@ -0,0 +1,80 @@+import { act } from "react";+import { createRoot, type Root } from "react-dom/client";+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";+import {+ type HoverStateContextValue,+ HoverStateProvider,+ useHoverState,+} from "./hover-state";++(+ globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }+).IS_REACT_ACT_ENVIRONMENT = true;++function Probe({+ handleRef,+}: {+ handleRef: { current: HoverStateContextValue | null };+}) {+ handleRef.current = useHoverState();+ return null;+}++let container: HTMLDivElement;+let root: Root;+let handle: { current: HoverStateContextValue | null };++function mount() {+ container = document.createElement("div");+ document.body.appendChild(container);+ root = createRoot(container);+ handle = { current: null };+ act(() => {+ root.render(+ <HoverStateProvider>+ <Probe handleRef={handle} />+ </HoverStateProvider>+ );+ });+}++function unmount() {+ act(() => {+ root.unmount();+ });+ container.remove();+}++describe("HoverStateProvider", () => {+ beforeEach(() => {+ vi.useFakeTimers();+ mount();+ });++ afterEach(() => {+ unmount();+ vi.useRealTimers();+ });++ test("clears hover state when the cursor leaves the browser window", () => {+ act(() => {+ handle.current!.update(+ { database: "instances/i/databases/db", table: "users" },+ "before",+ 0+ );+ });+ expect(handle.current!.state).toEqual({+ database: "instances/i/databases/db",+ table: "users",+ });++ act(() => {+ window.dispatchEvent(+ new MouseEvent("mouseout", { bubbles: true, relatedTarget: null })+ );+ });++ expect(handle.current!.state).toBeUndefined();+ });+});diff --git a/frontend/src/react/components/sql-editor/SchemaPane/hover-state.tsx b/frontend/src/react/components/sql-editor/SchemaPane/hover-state.tsxindex 79b8662bd1..82c1f8593b 100644--- a/frontend/src/react/components/sql-editor/SchemaPane/hover-state.tsx+++ b/frontend/src/react/components/sql-editor/SchemaPane/hover-state.tsx@@ -3,6 +3,7 @@ import {type ReactNode,useCallback,useContext,+ useEffect,useMemo,useState,} from "react";@@ -61,6 +62,17 @@ export function HoverStateProvider({ children }: { children: ReactNode }) {setPositionState(next);}, []);+ useEffect(() => {+ const handleWindowMouseOut = (event: MouseEvent) => {+ if (event.relatedTarget) return;+ update(undefined, "after", 0);+ };+ window.addEventListener("mouseout", handleWindowMouseOut);+ return () => {+ window.removeEventListener("mouseout", handleWindowMouseOut);+ };+ }, [update]);+const value = useMemo<HoverStateContextValue>(() => ({ state, position, setPosition, update, cancel }),[state, position, setPosition, update, cancel]