@dbx-tools/appkit 0.6.82 → 0.6.86
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +6 -9
- package/index.ts +3 -3
- package/lib/index.d.ts +3 -3
- package/lib/index.js +3 -3
- package/lib/src/{config.d.ts → bundle.d.ts} +40 -17
- package/lib/src/bundle.js +359 -0
- package/lib/src/databricks.d.ts +1 -16
- package/lib/src/databricks.js +3 -20
- package/lib/src/identity.d.ts +1 -2
- package/lib/src/identity.js +5 -4
- package/lib/src/lakebase-resolver.d.ts +1 -1
- package/lib/src/lakebase-resolver.js +7 -7
- package/lib/src/provision.js +3 -3
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/src/{config.ts → bundle.ts} +55 -107
- package/src/databricks.ts +2 -21
- package/src/identity.ts +5 -4
- package/src/lakebase-resolver.ts +10 -6
- package/src/provision.ts +2 -3
- package/lib/src/config.js +0 -403
package/lib/src/provision.js
CHANGED
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
* @module
|
|
22
22
|
*/
|
|
23
23
|
import { createLakebasePool, getWorkspaceClient, ValidationError } from "@databricks/appkit";
|
|
24
|
+
import { config } from "@dbx-tools/core";
|
|
24
25
|
import { error, log } from "@dbx-tools/shared-core";
|
|
25
|
-
import { isAppEnv } from "./databricks.js";
|
|
26
26
|
const defaultLogger = log.logger("provision");
|
|
27
27
|
/** AppKit persistent-cache schema (see AppKit's `PersistentStorage`). */
|
|
28
28
|
const CACHE_SCHEMA = "appkit";
|
|
@@ -89,7 +89,7 @@ export function cacheGrantStatements(role) {
|
|
|
89
89
|
* await provision.provisionCacheSchema("app-service-principal@databricks.com");
|
|
90
90
|
*/
|
|
91
91
|
export async function provisionCacheSchema(role, logger = defaultLogger) {
|
|
92
|
-
if (
|
|
92
|
+
if (config.isDatabricksAppEnv()) {
|
|
93
93
|
logger.debug("autopg: skip cache provisioning (inside a Databricks App)");
|
|
94
94
|
return;
|
|
95
95
|
}
|
|
@@ -130,4 +130,4 @@ export async function provisionCacheSchema(role, logger = defaultLogger) {
|
|
|
130
130
|
await pool.end().catch(() => { });
|
|
131
131
|
}
|
|
132
132
|
}
|
|
133
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"provision.js","sourceRoot":"","sources":["../../src/provision.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC7F,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,wBAAwB,CAAC;AAEpD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;AAE9C,yEAAyE;AACzE,MAAM,YAAY,GAAG,QAAQ,CAAC;AAE9B;;;GAGG;AACH,MAAM,YAAY,GAAG,2BAA2B,CAAC;AAEjD;;;;GAIG;AACH,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAClC,MAAM,oBAAoB,GAAG,MAAM,CAAC;AAEpC;;;;;;GAMG;AACH,SAAS,UAAU,CAAC,KAAa;IAC/B,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC;AAC1C,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,oBAAoB,CAAC,IAAY;IAC/C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7B,MAAM,eAAe,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,EAAE,sBAAsB,CAAC,CAAC;IAC3E,CAAC;IACD,MAAM,MAAM,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;IACxC,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAChC,OAAO;QACL,iCAAiC,MAAM,OAAO,MAAM,EAAE;QACtD,gDAAgD,MAAM,OAAO,MAAM,EAAE;QACrE,mDAAmD,MAAM,OAAO,MAAM,EAAE;QACxE,sCAAsC,MAAM,2BAA2B,MAAM,EAAE;QAC/E,sCAAsC,MAAM,8BAA8B,MAAM,EAAE;KACnF,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,IAAwB,EACxB,SAAqB,aAAa;IAElC,IAAI,QAAQ,EAAE,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,2DAA2D,CAAC,CAAC;QAC1E,OAAO;IACT,CAAC;IACD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;QACnF,OAAO;IACT,CAAC;IACD,gEAAgE;IAChE,2EAA2E;IAC3E,8EAA8E;IAC9E,6EAA6E;IAC7E,0EAA0E;IAC1E,iFAAiF;IACjF,MAAM,IAAI,GAAG,kBAAkB,CAAC;QAC9B,IAAI,EAAE,IAAI;QACV,eAAe,EAAE,kBAAkB,CAAC,EAAE,CAAC;QACvC,uBAAuB,EAAE,kBAAkB;QAC3C,iBAAiB,EAAE,oBAAoB;KACxC,CAAC,CAAC;IACH,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAC5B,kEAAkE,EAClE,CAAC,YAAY,CAAC,CACf,CAAC;QACF,IAAI,KAAK,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YACzB,MAAM,CAAC,KAAK,CAAC,iDAAiD,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;YAC1F,OAAO;QACT,CAAC;QACD,KAAK,MAAM,GAAG,IAAI,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7C,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,8BAA8B,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9E,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,IAAI,CAAC,gDAAgD,EAAE;YAC5D,MAAM,EAAE,YAAY;YACpB,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC;SAC/B,CAAC,CAAC;IACL,CAAC;YAAS,CAAC;QACT,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IACnC,CAAC;AACH,CAAC","sourcesContent":["/**\n * Lakebase cache-schema grant fix-up.\n *\n * AppKit's persistent cache (`CacheManager` -> `PersistentStorage`) uses a\n * schema `appkit` and a table `appkit.appkit_cache_entries`. When the connecting\n * Databricks identity lacks privileges on that schema, the cache migration\n * throws, and because AppKit is typically run with `cache.strictPersistence:\n * true`, the cache is silently switched to a disabled in-memory stub - so every\n * persistent read (chart long-poll, history, etc.) misses and 404s.\n *\n * This grants the connecting role full rights on the cache schema, but only when\n * the schema ALREADY EXISTS - it never creates the schema itself. Run from a\n * LOCAL identity that owns the schema (or holds grant option on it); it is\n * skipped inside a Databricks App, where the app SP cannot grant and its\n * Postgres role does not exist until its first connection.\n *\n * Must run AFTER {@link applyLakebaseToEnv} has written the resolved connection\n * to `process.env` (so `createLakebasePool` picks up host / database / endpoint)\n * and BEFORE `createApp` initializes the cache.\n *\n * @module\n */\n\nimport { createLakebasePool, getWorkspaceClient, ValidationError } from \"@databricks/appkit\";\nimport { error, log } from \"@dbx-tools/shared-core\";\n\nimport { isAppEnv } from \"./databricks.ts\";\n\nconst defaultLogger = log.logger(\"provision\");\n\n/** AppKit persistent-cache schema (see AppKit's `PersistentStorage`). */\nconst CACHE_SCHEMA = \"appkit\";\n\n/**\n * Characters a Lakebase Postgres role can legitimately contain: workspace\n * identities are emails, service principals are UUIDs.\n */\nconst ROLE_PATTERN = /^[A-Za-z0-9._@+-]{1,255}$/;\n\n/**\n * Provisioning runs at boot as the local developer identity, before any plugin\n * exists, so it is outside AppKit's interceptor chain and inherits no timeout\n * from it. Both bounds are explicit for that reason.\n */\nconst CONNECT_TIMEOUT_MS = 10_000;\nconst STATEMENT_TIMEOUT_MS = 15_000;\n\n/**\n * Quote a Postgres identifier: wrap in double quotes and double any embedded\n * quote. Schema and role names are identifiers, and Postgres does not accept a\n * bind parameter in an identifier position, so quoting is the only defense\n * available for these statements. Lakebase role names are usually emails\n * (`user@host`), which must be quoted to be a valid identifier at all.\n */\nfunction quoteIdent(ident: string): string {\n  return `\"${ident.replace(/\"/g, '\"\"')}\"`;\n}\n\n/**\n * Idempotent grants that make the (already-existing) AppKit cache schema fully\n * usable by `role`. The `ALTER DEFAULT PRIVILEGES` lines cover the cache table\n * whenever the schema owner creates it later.\n *\n * Throws a {@link ValidationError} when `role` is not a plausible Postgres role\n * name, since the value lands in an identifier position.\n */\nexport function cacheGrantStatements(role: string): readonly string[] {\n  if (!ROLE_PATTERN.test(role)) {\n    throw ValidationError.invalidValue(\"role\", role, \"a Postgres role name\");\n  }\n  const schema = quoteIdent(CACHE_SCHEMA);\n  const target = quoteIdent(role);\n  return [\n    `GRANT USAGE, CREATE ON SCHEMA ${schema} TO ${target}`,\n    `GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA ${schema} TO ${target}`,\n    `GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA ${schema} TO ${target}`,\n    `ALTER DEFAULT PRIVILEGES IN SCHEMA ${schema} GRANT ALL ON TABLES TO ${target}`,\n    `ALTER DEFAULT PRIVILEGES IN SCHEMA ${schema} GRANT ALL ON SEQUENCES TO ${target}`,\n  ];\n}\n\n/**\n * Grant `role` rights on the AppKit cache schema, but only when that schema\n * already exists.\n *\n * No-ops inside a Databricks App env, when `role` is undefined, or when the\n * schema is absent. Best-effort otherwise: any failure (e.g. the local identity\n * doesn't own the schema) is logged and swallowed so it never blocks startup -\n * a disabled cache is degraded, not fatal.\n *\n * @param role - Postgres role to grant to and connect as (the resolved\n *   workspace-client identity); skips when undefined.\n * @param logger - Logger to report progress on. Defaults to this module's.\n *\n * @example\n * import { provision } from \"@dbx-tools/appkit\";\n *\n * await provision.provisionCacheSchema(\"app-service-principal@databricks.com\");\n */\nexport async function provisionCacheSchema(\n  role: string | undefined,\n  logger: log.Logger = defaultLogger,\n): Promise<void> {\n  if (isAppEnv()) {\n    logger.debug(\"autopg: skip cache provisioning (inside a Databricks App)\");\n    return;\n  }\n  if (!role) {\n    logger.warn(\"autopg: skip cache provisioning (could not resolve connecting role)\");\n    return;\n  }\n  // Pass `user` explicitly: autopg resolves the connection target\n  // (host/database/endpoint) but not the identity, so `createLakebasePool`'s\n  // synchronous username lookup would otherwise throw. `getWorkspaceClient({})`\n  // returns a fresh default-auth client - literally `new WorkspaceClient({})`,\n  // but built against the SDK version AppKit's `createLakebasePool` expects\n  // (importing the SDK class directly here pulls a newer, type-incompatible copy).\n  const pool = createLakebasePool({\n    user: role,\n    workspaceClient: getWorkspaceClient({}),\n    connectionTimeoutMillis: CONNECT_TIMEOUT_MS,\n    statement_timeout: STATEMENT_TIMEOUT_MS,\n  });\n  try {\n    const found = await pool.query(\n      \"SELECT 1 FROM information_schema.schemata WHERE schema_name = $1\",\n      [CACHE_SCHEMA],\n    );\n    if (found.rowCount === 0) {\n      logger.debug(\"autopg: skip cache provisioning (schema absent)\", { schema: CACHE_SCHEMA });\n      return;\n    }\n    for (const sql of cacheGrantStatements(role)) {\n      await pool.query(sql);\n    }\n    logger.info(\"autopg: granted cache schema\", { schema: CACHE_SCHEMA, role });\n  } catch (err) {\n    logger.warn(\"autopg: cache provisioning failed (continuing)\", {\n      schema: CACHE_SCHEMA,\n      error: error.errorMessage(err),\n    });\n  } finally {\n    await pool.end().catch(() => {});\n  }\n}\n"]}
|
|
133
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"provision.js","sourceRoot":"","sources":["../../src/provision.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC7F,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,wBAAwB,CAAC;AAEpD,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;AAE9C,yEAAyE;AACzE,MAAM,YAAY,GAAG,QAAQ,CAAC;AAE9B;;;GAGG;AACH,MAAM,YAAY,GAAG,2BAA2B,CAAC;AAEjD;;;;GAIG;AACH,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAClC,MAAM,oBAAoB,GAAG,MAAM,CAAC;AAEpC;;;;;;GAMG;AACH,SAAS,UAAU,CAAC,KAAa;IAC/B,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC;AAC1C,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,oBAAoB,CAAC,IAAY;IAC/C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7B,MAAM,eAAe,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,EAAE,sBAAsB,CAAC,CAAC;IAC3E,CAAC;IACD,MAAM,MAAM,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;IACxC,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAChC,OAAO;QACL,iCAAiC,MAAM,OAAO,MAAM,EAAE;QACtD,gDAAgD,MAAM,OAAO,MAAM,EAAE;QACrE,mDAAmD,MAAM,OAAO,MAAM,EAAE;QACxE,sCAAsC,MAAM,2BAA2B,MAAM,EAAE;QAC/E,sCAAsC,MAAM,8BAA8B,MAAM,EAAE;KACnF,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,IAAwB,EACxB,SAAqB,aAAa;IAElC,IAAI,MAAM,CAAC,kBAAkB,EAAE,EAAE,CAAC;QAChC,MAAM,CAAC,KAAK,CAAC,2DAA2D,CAAC,CAAC;QAC1E,OAAO;IACT,CAAC;IACD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;QACnF,OAAO;IACT,CAAC;IACD,gEAAgE;IAChE,2EAA2E;IAC3E,8EAA8E;IAC9E,6EAA6E;IAC7E,0EAA0E;IAC1E,iFAAiF;IACjF,MAAM,IAAI,GAAG,kBAAkB,CAAC;QAC9B,IAAI,EAAE,IAAI;QACV,eAAe,EAAE,kBAAkB,CAAC,EAAE,CAAC;QACvC,uBAAuB,EAAE,kBAAkB;QAC3C,iBAAiB,EAAE,oBAAoB;KACxC,CAAC,CAAC;IACH,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAC5B,kEAAkE,EAClE,CAAC,YAAY,CAAC,CACf,CAAC;QACF,IAAI,KAAK,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YACzB,MAAM,CAAC,KAAK,CAAC,iDAAiD,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;YAC1F,OAAO;QACT,CAAC;QACD,KAAK,MAAM,GAAG,IAAI,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7C,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,8BAA8B,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9E,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,IAAI,CAAC,gDAAgD,EAAE;YAC5D,MAAM,EAAE,YAAY;YACpB,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC;SAC/B,CAAC,CAAC;IACL,CAAC;YAAS,CAAC;QACT,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IACnC,CAAC;AACH,CAAC","sourcesContent":["/**\n * Lakebase cache-schema grant fix-up.\n *\n * AppKit's persistent cache (`CacheManager` -> `PersistentStorage`) uses a\n * schema `appkit` and a table `appkit.appkit_cache_entries`. When the connecting\n * Databricks identity lacks privileges on that schema, the cache migration\n * throws, and because AppKit is typically run with `cache.strictPersistence:\n * true`, the cache is silently switched to a disabled in-memory stub - so every\n * persistent read (chart long-poll, history, etc.) misses and 404s.\n *\n * This grants the connecting role full rights on the cache schema, but only when\n * the schema ALREADY EXISTS - it never creates the schema itself. Run from a\n * LOCAL identity that owns the schema (or holds grant option on it); it is\n * skipped inside a Databricks App, where the app SP cannot grant and its\n * Postgres role does not exist until its first connection.\n *\n * Must run AFTER {@link applyLakebaseToEnv} has written the resolved connection\n * to `process.env` (so `createLakebasePool` picks up host / database / endpoint)\n * and BEFORE `createApp` initializes the cache.\n *\n * @module\n */\n\nimport { createLakebasePool, getWorkspaceClient, ValidationError } from \"@databricks/appkit\";\nimport { config } from \"@dbx-tools/core\";\nimport { error, log } from \"@dbx-tools/shared-core\";\n\nconst defaultLogger = log.logger(\"provision\");\n\n/** AppKit persistent-cache schema (see AppKit's `PersistentStorage`). */\nconst CACHE_SCHEMA = \"appkit\";\n\n/**\n * Characters a Lakebase Postgres role can legitimately contain: workspace\n * identities are emails, service principals are UUIDs.\n */\nconst ROLE_PATTERN = /^[A-Za-z0-9._@+-]{1,255}$/;\n\n/**\n * Provisioning runs at boot as the local developer identity, before any plugin\n * exists, so it is outside AppKit's interceptor chain and inherits no timeout\n * from it. Both bounds are explicit for that reason.\n */\nconst CONNECT_TIMEOUT_MS = 10_000;\nconst STATEMENT_TIMEOUT_MS = 15_000;\n\n/**\n * Quote a Postgres identifier: wrap in double quotes and double any embedded\n * quote. Schema and role names are identifiers, and Postgres does not accept a\n * bind parameter in an identifier position, so quoting is the only defense\n * available for these statements. Lakebase role names are usually emails\n * (`user@host`), which must be quoted to be a valid identifier at all.\n */\nfunction quoteIdent(ident: string): string {\n  return `\"${ident.replace(/\"/g, '\"\"')}\"`;\n}\n\n/**\n * Idempotent grants that make the (already-existing) AppKit cache schema fully\n * usable by `role`. The `ALTER DEFAULT PRIVILEGES` lines cover the cache table\n * whenever the schema owner creates it later.\n *\n * Throws a {@link ValidationError} when `role` is not a plausible Postgres role\n * name, since the value lands in an identifier position.\n */\nexport function cacheGrantStatements(role: string): readonly string[] {\n  if (!ROLE_PATTERN.test(role)) {\n    throw ValidationError.invalidValue(\"role\", role, \"a Postgres role name\");\n  }\n  const schema = quoteIdent(CACHE_SCHEMA);\n  const target = quoteIdent(role);\n  return [\n    `GRANT USAGE, CREATE ON SCHEMA ${schema} TO ${target}`,\n    `GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA ${schema} TO ${target}`,\n    `GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA ${schema} TO ${target}`,\n    `ALTER DEFAULT PRIVILEGES IN SCHEMA ${schema} GRANT ALL ON TABLES TO ${target}`,\n    `ALTER DEFAULT PRIVILEGES IN SCHEMA ${schema} GRANT ALL ON SEQUENCES TO ${target}`,\n  ];\n}\n\n/**\n * Grant `role` rights on the AppKit cache schema, but only when that schema\n * already exists.\n *\n * No-ops inside a Databricks App env, when `role` is undefined, or when the\n * schema is absent. Best-effort otherwise: any failure (e.g. the local identity\n * doesn't own the schema) is logged and swallowed so it never blocks startup -\n * a disabled cache is degraded, not fatal.\n *\n * @param role - Postgres role to grant to and connect as (the resolved\n *   workspace-client identity); skips when undefined.\n * @param logger - Logger to report progress on. Defaults to this module's.\n *\n * @example\n * import { provision } from \"@dbx-tools/appkit\";\n *\n * await provision.provisionCacheSchema(\"app-service-principal@databricks.com\");\n */\nexport async function provisionCacheSchema(\n  role: string | undefined,\n  logger: log.Logger = defaultLogger,\n): Promise<void> {\n  if (config.isDatabricksAppEnv()) {\n    logger.debug(\"autopg: skip cache provisioning (inside a Databricks App)\");\n    return;\n  }\n  if (!role) {\n    logger.warn(\"autopg: skip cache provisioning (could not resolve connecting role)\");\n    return;\n  }\n  // Pass `user` explicitly: autopg resolves the connection target\n  // (host/database/endpoint) but not the identity, so `createLakebasePool`'s\n  // synchronous username lookup would otherwise throw. `getWorkspaceClient({})`\n  // returns a fresh default-auth client - literally `new WorkspaceClient({})`,\n  // but built against the SDK version AppKit's `createLakebasePool` expects\n  // (importing the SDK class directly here pulls a newer, type-incompatible copy).\n  const pool = createLakebasePool({\n    user: role,\n    workspaceClient: getWorkspaceClient({}),\n    connectionTimeoutMillis: CONNECT_TIMEOUT_MS,\n    statement_timeout: STATEMENT_TIMEOUT_MS,\n  });\n  try {\n    const found = await pool.query(\n      \"SELECT 1 FROM information_schema.schemata WHERE schema_name = $1\",\n      [CACHE_SCHEMA],\n    );\n    if (found.rowCount === 0) {\n      logger.debug(\"autopg: skip cache provisioning (schema absent)\", { schema: CACHE_SCHEMA });\n      return;\n    }\n    for (const sql of cacheGrantStatements(role)) {\n      await pool.query(sql);\n    }\n    logger.info(\"autopg: granted cache schema\", { schema: CACHE_SCHEMA, role });\n  } catch (err) {\n    logger.warn(\"autopg: cache provisioning failed (continuing)\", {\n      schema: CACHE_SCHEMA,\n      error: error.errorMessage(err),\n    });\n  } finally {\n    await pool.end().catch(() => {});\n  }\n}\n"]}
|
package/lib/tsconfig.tsbuildinfo
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"root":["../src/_cache-storage.ts","../src/appkit.ts","../src/
|
|
1
|
+
{"root":["../src/_cache-storage.ts","../src/appkit.ts","../src/bundle.ts","../src/databricks.ts","../src/identity.ts","../src/interceptor.ts","../src/lakebase-resolver.ts","../src/pgaddress.ts","../src/plugin.ts","../src/provision.ts","../index.ts"],"version":"5.9.3"}
|
package/package.json
CHANGED
|
@@ -28,8 +28,8 @@
|
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
30
|
"@databricks/sdk-experimental": "^0.17.0",
|
|
31
|
-
"@dbx-tools/core": "0.6.
|
|
32
|
-
"@dbx-tools/shared-core": "0.6.
|
|
31
|
+
"@dbx-tools/core": "0.6.86",
|
|
32
|
+
"@dbx-tools/shared-core": "0.6.86",
|
|
33
33
|
"yaml": "^2.9.0",
|
|
34
34
|
"zod": "4.3.6"
|
|
35
35
|
},
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
"./package.json": "./package.json"
|
|
48
48
|
}
|
|
49
49
|
},
|
|
50
|
-
"version": "0.6.
|
|
50
|
+
"version": "0.6.86",
|
|
51
51
|
"types": "./lib/index.d.ts",
|
|
52
52
|
"type": "module",
|
|
53
53
|
"exports": {
|
|
@@ -1,38 +1,40 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
3
|
-
*
|
|
2
|
+
* DATABRICKS-APP configuration resolution: the bundle and `app.yaml` vocabulary.
|
|
3
|
+
*
|
|
4
|
+
* node-core's `config` module owns the generic lookup - environment, `.env`,
|
|
5
|
+
* `databricks bundle validate` - and knows nothing about what a bundle resource
|
|
6
|
+
* IS. That last part is this module: `sql_warehouse`, `genie_space`, and
|
|
7
|
+
* `postgres` are Databricks-App concepts, and an `app.yaml` / bundle
|
|
8
|
+
* `value_from` entry is a REFERENCE to one of them whose real value is the
|
|
9
|
+
* warehouse id or Genie space id sitting on the named resource. So this module
|
|
10
|
+
* extends node-core's resource schema, adds `app.yaml` (which the bundle CLI
|
|
11
|
+
* never sees), and resolves those references.
|
|
4
12
|
*
|
|
5
13
|
* Default sources: `explicit`, then `env`, then Databricks App `config.env`
|
|
6
14
|
* (from {@link bundle}) and hard-coded `app.yaml` env entries (from
|
|
7
15
|
* {@link appYaml}). Opt in to `cli` when a dev command wants flag overrides.
|
|
8
16
|
*
|
|
9
|
-
* Server-only
|
|
10
|
-
*
|
|
17
|
+
* Server-only, and Databricks-app specific, so it lives in node-appkit rather
|
|
18
|
+
* than node-core.
|
|
11
19
|
*
|
|
12
20
|
* @module
|
|
13
21
|
*/
|
|
14
22
|
|
|
15
|
-
import { spawnSync } from "node:child_process";
|
|
16
23
|
import { readFile } from "node:fs/promises";
|
|
17
|
-
import {
|
|
24
|
+
import { resolve } from "node:path";
|
|
18
25
|
import { ValidationError } from "@databricks/appkit";
|
|
19
|
-
import { file, project } from "@dbx-tools/core";
|
|
20
|
-
import {
|
|
26
|
+
import { config as coreConfig, file, project } from "@dbx-tools/core";
|
|
27
|
+
import { context, object, log, string } from "@dbx-tools/shared-core";
|
|
21
28
|
import { parse as parseYamlText } from "yaml";
|
|
22
29
|
import { z } from "zod";
|
|
23
30
|
|
|
24
|
-
import { isAppEnv } from "./databricks.ts";
|
|
25
|
-
|
|
26
31
|
const logger = log.logger("config");
|
|
27
32
|
|
|
28
33
|
/** Parsed payload from `databricks bundle validate --output json`. */
|
|
29
34
|
export type BundleValidateJson = Record<string, unknown>;
|
|
30
35
|
|
|
31
36
|
/** A config file discovered on disk with its parsed contents. */
|
|
32
|
-
export
|
|
33
|
-
path: string;
|
|
34
|
-
data: Record<string, unknown>;
|
|
35
|
-
}
|
|
37
|
+
export type ConfigFile = coreConfig.ConfigFile;
|
|
36
38
|
|
|
37
39
|
/** Supported configuration sources, consulted in array order. */
|
|
38
40
|
export type ConfigSource = "explicit" | "cli" | "env" | "bundle";
|
|
@@ -41,36 +43,19 @@ const defaultConfigSources: ConfigSource[] = ["explicit", "env", "bundle"];
|
|
|
41
43
|
|
|
42
44
|
const APP_YAML_NAMES = ["app.yaml", "app.yml"] as const;
|
|
43
45
|
|
|
44
|
-
const
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
.string()
|
|
48
|
-
.transform((value) => value.trim())
|
|
49
|
-
.pipe(z.string().min(1));
|
|
50
|
-
|
|
51
|
-
const bundleAppEnvEntrySchema = z.object({
|
|
52
|
-
name: normalizedString.optional(),
|
|
53
|
-
value: z.string().optional(),
|
|
54
|
-
value_from: normalizedString.optional(),
|
|
55
|
-
});
|
|
56
|
-
|
|
57
|
-
const bundleAppResourceSchema = z.object({
|
|
58
|
-
name: normalizedString.optional(),
|
|
59
|
-
sql_warehouse: z.object({ id: normalizedString.optional() }).optional(),
|
|
60
|
-
genie_space: z.object({ space_id: normalizedString.optional() }).optional(),
|
|
46
|
+
export const bundleAppResourceSchema = coreConfig.bundleResourceSchema.extend({
|
|
47
|
+
sql_warehouse: z.object({ id: coreConfig.bundleValue.optional() }).optional(),
|
|
48
|
+
genie_space: z.object({ space_id: coreConfig.bundleValue.optional() }).optional(),
|
|
61
49
|
postgres: z
|
|
62
50
|
.object({
|
|
63
|
-
database:
|
|
64
|
-
branch:
|
|
65
|
-
endpoint:
|
|
51
|
+
database: coreConfig.bundleValue.optional(),
|
|
52
|
+
branch: coreConfig.bundleValue.optional(),
|
|
53
|
+
endpoint: coreConfig.bundleValue.optional(),
|
|
66
54
|
})
|
|
67
55
|
.optional(),
|
|
68
56
|
});
|
|
69
57
|
|
|
70
|
-
const bundleAppSchema =
|
|
71
|
-
name: normalizedString.optional(),
|
|
72
|
-
source_code_path: z.string().optional(),
|
|
73
|
-
config: z.object({ env: z.array(bundleAppEnvEntrySchema).optional() }).optional(),
|
|
58
|
+
const bundleAppSchema = coreConfig.bundleAppSchema.extend({
|
|
74
59
|
resources: z.array(bundleAppResourceSchema).optional(),
|
|
75
60
|
});
|
|
76
61
|
|
|
@@ -78,22 +63,21 @@ const bundleValidateAppsSchema = z.object({
|
|
|
78
63
|
resources: z.object({ apps: z.record(z.string(), bundleAppSchema).optional() }).optional(),
|
|
79
64
|
});
|
|
80
65
|
|
|
81
|
-
const appYamlEnvEntrySchema =
|
|
82
|
-
name:
|
|
83
|
-
|
|
84
|
-
valueFrom: normalizedString.optional(),
|
|
66
|
+
const appYamlEnvEntrySchema = coreConfig.bundleEnvEntrySchema.omit({ value_from: true }).extend({
|
|
67
|
+
name: coreConfig.bundleValue,
|
|
68
|
+
valueFrom: coreConfig.bundleValue.optional(),
|
|
85
69
|
});
|
|
86
70
|
|
|
87
|
-
const appYamlResourceSchema =
|
|
88
|
-
.
|
|
89
|
-
name:
|
|
90
|
-
sql_warehouse: z.object({ id:
|
|
91
|
-
genie_space: z.object({ space_id:
|
|
71
|
+
const appYamlResourceSchema = coreConfig.bundleResourceSchema
|
|
72
|
+
.extend({
|
|
73
|
+
name: coreConfig.bundleValue,
|
|
74
|
+
sql_warehouse: z.object({ id: coreConfig.bundleValue.optional() }).optional(),
|
|
75
|
+
genie_space: z.object({ space_id: coreConfig.bundleValue.optional() }).optional(),
|
|
92
76
|
postgres: z
|
|
93
77
|
.object({
|
|
94
|
-
database:
|
|
95
|
-
branch:
|
|
96
|
-
endpoint:
|
|
78
|
+
database: coreConfig.bundleValue.optional(),
|
|
79
|
+
branch: coreConfig.bundleValue.optional(),
|
|
80
|
+
endpoint: coreConfig.bundleValue.optional(),
|
|
97
81
|
})
|
|
98
82
|
.optional(),
|
|
99
83
|
})
|
|
@@ -125,9 +109,6 @@ export interface ResolveConfigValueOptions {
|
|
|
125
109
|
cli?: Record<string, ConfigMapValue>;
|
|
126
110
|
}
|
|
127
111
|
|
|
128
|
-
const bundleDefault = functionModule.memoize(() => loadBundle(process.cwd()));
|
|
129
|
-
const appYamlDefault = functionModule.memoize(() => loadAppYaml(process.cwd()));
|
|
130
|
-
|
|
131
112
|
function envKeysForName(name: string): object.Sequence<string> {
|
|
132
113
|
const trimmed = name.trim();
|
|
133
114
|
if (!trimmed) {
|
|
@@ -231,8 +212,9 @@ export function flattenAppYamlEnv(data: unknown): Record<string, string> {
|
|
|
231
212
|
|
|
232
213
|
const out: Record<string, string> = {};
|
|
233
214
|
for (const entry of parsed.data.env) {
|
|
234
|
-
|
|
235
|
-
|
|
215
|
+
const value = coreConfig.bundleValue.safeParse(entry.value);
|
|
216
|
+
if (value.success) {
|
|
217
|
+
out[entry.name] = value.data;
|
|
236
218
|
continue;
|
|
237
219
|
}
|
|
238
220
|
if (!entry.valueFrom) continue;
|
|
@@ -268,8 +250,9 @@ export function flattenAppEnv(data: unknown): Record<string, string> {
|
|
|
268
250
|
const out: Record<string, string> = {};
|
|
269
251
|
for (const entry of app.config.env) {
|
|
270
252
|
if (!entry.name) continue;
|
|
271
|
-
|
|
272
|
-
|
|
253
|
+
const value = coreConfig.bundleValue.safeParse(entry.value);
|
|
254
|
+
if (value.success) {
|
|
255
|
+
out[entry.name] = value.data;
|
|
273
256
|
continue;
|
|
274
257
|
}
|
|
275
258
|
if (!entry.value_from) continue;
|
|
@@ -279,42 +262,6 @@ export function flattenAppEnv(data: unknown): Record<string, string> {
|
|
|
279
262
|
return out;
|
|
280
263
|
}
|
|
281
264
|
|
|
282
|
-
function validateBundle(root: string): BundleValidateJson | undefined {
|
|
283
|
-
const key = root;
|
|
284
|
-
if (bundleValidateCache.has(key)) {
|
|
285
|
-
return bundleValidateCache.get(key);
|
|
286
|
-
}
|
|
287
|
-
|
|
288
|
-
const args = ["bundle", "validate", "--output", "json"];
|
|
289
|
-
try {
|
|
290
|
-
const proc = spawnSync("databricks", args, {
|
|
291
|
-
cwd: root,
|
|
292
|
-
encoding: "utf8",
|
|
293
|
-
stdio: ["ignore", "pipe", "pipe"],
|
|
294
|
-
});
|
|
295
|
-
const text = proc.stdout?.trim();
|
|
296
|
-
if (!text) {
|
|
297
|
-
bundleValidateCache.set(key, undefined);
|
|
298
|
-
return undefined;
|
|
299
|
-
}
|
|
300
|
-
const data = json.parse<BundleValidateJson>(text);
|
|
301
|
-
bundleValidateCache.set(key, data);
|
|
302
|
-
return data;
|
|
303
|
-
} catch {
|
|
304
|
-
bundleValidateCache.set(key, undefined);
|
|
305
|
-
return undefined;
|
|
306
|
-
}
|
|
307
|
-
}
|
|
308
|
-
|
|
309
|
-
async function loadBundle(cwd: string): Promise<ConfigFile | undefined> {
|
|
310
|
-
const configFile = resolveConfigFile(cwd, "databricks.yml");
|
|
311
|
-
if (configFile) {
|
|
312
|
-
const data = validateBundle(dirname(configFile));
|
|
313
|
-
if (data) return { path: configFile, data };
|
|
314
|
-
}
|
|
315
|
-
return undefined;
|
|
316
|
-
}
|
|
317
|
-
|
|
318
265
|
async function loadAppYaml(cwd: string): Promise<ConfigFile | undefined> {
|
|
319
266
|
for (const fileName of APP_YAML_NAMES) {
|
|
320
267
|
const configFile = resolveConfigFile(cwd, fileName);
|
|
@@ -334,7 +281,7 @@ async function loadAppYaml(cwd: string): Promise<ConfigFile | undefined> {
|
|
|
334
281
|
}
|
|
335
282
|
|
|
336
283
|
function resolveConfigFile(cwd: string, configFile: string): string | undefined {
|
|
337
|
-
if (
|
|
284
|
+
if (coreConfig.isDatabricksAppEnv()) return undefined;
|
|
338
285
|
for (const rootDir of project.resolveProjectRoots(cwd)) {
|
|
339
286
|
const bundlePath = resolve(rootDir, configFile);
|
|
340
287
|
if (file.statSync(bundlePath)?.isFile()) return bundlePath;
|
|
@@ -343,23 +290,24 @@ function resolveConfigFile(cwd: string, configFile: string): string | undefined
|
|
|
343
290
|
}
|
|
344
291
|
|
|
345
292
|
/**
|
|
346
|
-
*
|
|
347
|
-
*
|
|
348
|
-
*
|
|
293
|
+
* The validated bundle for `cwd` - {@link coreConfig.bundleFile}, which caches it
|
|
294
|
+
* per working directory. Returns `undefined` inside a Databricks App, where the
|
|
295
|
+
* platform has already turned `config.env` into real environment variables and
|
|
296
|
+
* there is no bundle to validate.
|
|
349
297
|
*/
|
|
350
298
|
export function bundle(cwd?: string): Promise<ConfigFile | undefined> {
|
|
351
|
-
|
|
352
|
-
return cwd && resolve(cwd) !== process.cwd() ? loadBundle(cwd) : bundleDefault();
|
|
299
|
+
return Promise.resolve(coreConfig.isDatabricksAppEnv() ? undefined : coreConfig.bundleFile(cwd));
|
|
353
300
|
}
|
|
354
301
|
|
|
355
302
|
/**
|
|
356
|
-
* Locate and parse `app.yaml` / `app.yml` from the bundle or project root.
|
|
357
|
-
*
|
|
358
|
-
*
|
|
303
|
+
* Locate and parse `app.yaml` / `app.yml` from the bundle or project root.
|
|
304
|
+
* Cached per working directory through {@link context.cached}, so a `cwd` change
|
|
305
|
+
* re-reads instead of returning another project's file. Returns `undefined`
|
|
306
|
+
* inside a Databricks App.
|
|
359
307
|
*/
|
|
360
308
|
export function appYaml(cwd?: string): Promise<ConfigFile | undefined> {
|
|
361
|
-
if (
|
|
362
|
-
return
|
|
309
|
+
if (coreConfig.isDatabricksAppEnv()) return Promise.resolve(undefined);
|
|
310
|
+
return context.cached(["appkit", "appYaml"], (resolved) => loadAppYaml(resolved ?? "."), cwd);
|
|
363
311
|
}
|
|
364
312
|
|
|
365
313
|
/**
|
|
@@ -415,11 +363,11 @@ function resolveSources(options: ResolveConfigValueOptions): ConfigSource[] {
|
|
|
415
363
|
* whatever the Databricks App / bundle definition supplies.
|
|
416
364
|
*
|
|
417
365
|
* @example
|
|
418
|
-
* import {
|
|
366
|
+
* import { bundle } from "@dbx-tools/appkit";
|
|
419
367
|
*
|
|
420
|
-
* const warehouseId = await
|
|
368
|
+
* const warehouseId = await bundle.resolveConfigValue("DATABRICKS_WAREHOUSE_ID", {
|
|
421
369
|
* cli: { DATABRICKS_WAREHOUSE_ID: flags.warehouse },
|
|
422
|
-
* sources:
|
|
370
|
+
* sources: bundle.withCliSources(),
|
|
423
371
|
* });
|
|
424
372
|
*/
|
|
425
373
|
export async function resolveConfigValue(
|
package/src/databricks.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Generic Databricks SDK glue (no AppKit): adapt WHATWG cancellation
|
|
3
3
|
* (`AbortSignal` / `AbortController`) into the SDK's `Context` /
|
|
4
4
|
* `CancellationToken` shapes so a single `AbortController` can drive every
|
|
5
|
-
* in-flight SDK call
|
|
5
|
+
* in-flight SDK call.
|
|
6
6
|
*
|
|
7
7
|
* Server-only: leans on the Databricks SDK `Context`. Lives in node-appkit so
|
|
8
8
|
* the browser-safe shared-core stays SDK-free.
|
|
@@ -12,26 +12,7 @@
|
|
|
12
12
|
|
|
13
13
|
import type { CancellationToken } from "@databricks/sdk-experimental";
|
|
14
14
|
import { Context } from "@databricks/sdk-experimental";
|
|
15
|
-
import { async
|
|
16
|
-
|
|
17
|
-
/** Highest valid TCP port number. */
|
|
18
|
-
export const MAX_TCP_PORT = envUtil.MAX_TCP_PORT;
|
|
19
|
-
|
|
20
|
-
/**
|
|
21
|
-
* Detect the Databricks App runtime from environment shape: requires a
|
|
22
|
-
* non-empty `DATABRICKS_APP_NAME`, a `DATABRICKS_HOST` that parses as an
|
|
23
|
-
* `http`/`https` URL, and a `DATABRICKS_APP_PORT` that is a valid TCP port.
|
|
24
|
-
* Reads `process.env` when no `env` is passed.
|
|
25
|
-
*
|
|
26
|
-
* @example
|
|
27
|
-
* import { databricks } from "@dbx-tools/appkit";
|
|
28
|
-
*
|
|
29
|
-
* // Skip bundle / app.yaml discovery when the app is already deployed.
|
|
30
|
-
* const local = !databricks.isAppEnv();
|
|
31
|
-
*/
|
|
32
|
-
export function isAppEnv(env: Record<string, string | undefined> = process.env): boolean {
|
|
33
|
-
return envUtil.isAppEnv(env);
|
|
34
|
-
}
|
|
15
|
+
import { async } from "@dbx-tools/shared-core";
|
|
35
16
|
|
|
36
17
|
/** Either an SDK `Context` or a WHATWG `AbortSignal`. */
|
|
37
18
|
export type ContextLike = Context | AbortSignal;
|
package/src/identity.ts
CHANGED
|
@@ -53,7 +53,8 @@
|
|
|
53
53
|
*/
|
|
54
54
|
|
|
55
55
|
import { ConfigurationError } from "@databricks/appkit";
|
|
56
|
-
import {
|
|
56
|
+
import { config } from "@dbx-tools/core";
|
|
57
|
+
import { string, token } from "@dbx-tools/shared-core";
|
|
57
58
|
|
|
58
59
|
/**
|
|
59
60
|
* Header the Databricks Apps front door forwards the caller's OBO token on.
|
|
@@ -100,11 +101,11 @@ export interface HeaderBearing {
|
|
|
100
101
|
*/
|
|
101
102
|
export function resolveIdentityMode(
|
|
102
103
|
configured: string | undefined,
|
|
103
|
-
envKeys:
|
|
104
|
+
envKeys: string | readonly string[],
|
|
104
105
|
field = "identity",
|
|
105
106
|
): IdentityMode {
|
|
106
|
-
const raw =
|
|
107
|
-
if (raw ===
|
|
107
|
+
const raw = config.string(configured, envKeys, config.ENV_ONLY);
|
|
108
|
+
if (raw === undefined) return DEFAULT_IDENTITY_MODE;
|
|
108
109
|
const mode = raw.toLowerCase() as IdentityMode;
|
|
109
110
|
if (!IDENTITY_MODES.includes(mode)) {
|
|
110
111
|
const names = typeof envKeys === "string" ? envKeys : envKeys.join(" / ");
|
package/src/lakebase-resolver.ts
CHANGED
|
@@ -42,12 +42,12 @@ import {
|
|
|
42
42
|
getWorkspaceClient,
|
|
43
43
|
ValidationError,
|
|
44
44
|
} from "@databricks/appkit";
|
|
45
|
-
import { project } from "@dbx-tools/core";
|
|
45
|
+
import { config as coreConfig, project } from "@dbx-tools/core";
|
|
46
46
|
import { async, log, object, string } from "@dbx-tools/shared-core";
|
|
47
47
|
import { z } from "zod";
|
|
48
|
-
import { resolveConfigValue } from "./
|
|
48
|
+
import { resolveConfigValue } from "./bundle.ts";
|
|
49
49
|
|
|
50
|
-
import {
|
|
50
|
+
import { toContext } from "./databricks.ts";
|
|
51
51
|
import {
|
|
52
52
|
parseAddress,
|
|
53
53
|
parseResourcePath,
|
|
@@ -195,7 +195,7 @@ const operationSchema = z.object({
|
|
|
195
195
|
type Operation = z.infer<typeof operationSchema>;
|
|
196
196
|
|
|
197
197
|
/** `PGPORT` must land inside the TCP port range. */
|
|
198
|
-
const portSchema = z.coerce.number().int().min(1).max(MAX_TCP_PORT);
|
|
198
|
+
const portSchema = z.coerce.number().int().min(1).max(coreConfig.MAX_TCP_PORT);
|
|
199
199
|
|
|
200
200
|
const sslModeSchema = z.enum(SSL_MODES);
|
|
201
201
|
|
|
@@ -208,7 +208,11 @@ export function parsePort(value: string | number | undefined): number | undefine
|
|
|
208
208
|
if (value === undefined || value === "") return undefined;
|
|
209
209
|
const parsed = portSchema.safeParse(value);
|
|
210
210
|
if (!parsed.success) {
|
|
211
|
-
throw ValidationError.invalidValue(
|
|
211
|
+
throw ValidationError.invalidValue(
|
|
212
|
+
"PGPORT",
|
|
213
|
+
value,
|
|
214
|
+
`a TCP port between 1 and ${coreConfig.MAX_TCP_PORT}`,
|
|
215
|
+
);
|
|
212
216
|
}
|
|
213
217
|
return parsed.data;
|
|
214
218
|
}
|
|
@@ -251,7 +255,7 @@ export function pollDelay(attempt: number, baseMs: number, signal?: AbortSignal)
|
|
|
251
255
|
* Pull resolver inputs from `process.env`, parse the address blob, and
|
|
252
256
|
* layer explicit config on top with this precedence:
|
|
253
257
|
*
|
|
254
|
-
* `config.<field>` > `
|
|
258
|
+
* `config.<field>` > `bundle.resolveConfigValue` (`env`, then bundle
|
|
255
259
|
* validate JSON) > whatever {@link parseAddress} recovered from the
|
|
256
260
|
* `endpoint` / `LAKEBASE_ENDPOINT` blob.
|
|
257
261
|
*
|
package/src/provision.ts
CHANGED
|
@@ -22,10 +22,9 @@
|
|
|
22
22
|
*/
|
|
23
23
|
|
|
24
24
|
import { createLakebasePool, getWorkspaceClient, ValidationError } from "@databricks/appkit";
|
|
25
|
+
import { config } from "@dbx-tools/core";
|
|
25
26
|
import { error, log } from "@dbx-tools/shared-core";
|
|
26
27
|
|
|
27
|
-
import { isAppEnv } from "./databricks.ts";
|
|
28
|
-
|
|
29
28
|
const defaultLogger = log.logger("provision");
|
|
30
29
|
|
|
31
30
|
/** AppKit persistent-cache schema (see AppKit's `PersistentStorage`). */
|
|
@@ -101,7 +100,7 @@ export async function provisionCacheSchema(
|
|
|
101
100
|
role: string | undefined,
|
|
102
101
|
logger: log.Logger = defaultLogger,
|
|
103
102
|
): Promise<void> {
|
|
104
|
-
if (
|
|
103
|
+
if (config.isDatabricksAppEnv()) {
|
|
105
104
|
logger.debug("autopg: skip cache provisioning (inside a Databricks App)");
|
|
106
105
|
return;
|
|
107
106
|
}
|