@databricks/sdk-core 0.1.0-dev.5 → 0.1.0-dev.7
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/dist/apierror/apierror.d.ts +3 -2
- package/dist/apierror/apierror.d.ts.map +1 -1
- package/dist/apierror/apierror.js +18 -59
- package/dist/apierror/apierror.js.map +1 -1
- package/dist/apierror/codes/codes.d.ts +25 -47
- package/dist/apierror/codes/codes.d.ts.map +1 -1
- package/dist/apierror/codes/codes.js +25 -74
- package/dist/apierror/codes/codes.js.map +1 -1
- package/dist/apierror/codes/index.d.ts +1 -1
- package/dist/apierror/codes/index.d.ts.map +1 -1
- package/dist/apierror/codes/index.js +1 -1
- package/dist/apierror/codes/index.js.map +1 -1
- package/dist/clientinfo/agent.d.ts +6 -8
- package/dist/clientinfo/agent.d.ts.map +1 -1
- package/dist/clientinfo/agent.js +31 -18
- package/dist/clientinfo/agent.js.map +1 -1
- package/dist/profiles/errors.d.ts +1 -1
- package/dist/profiles/errors.d.ts.map +1 -1
- package/dist/profiles/errors.js.map +1 -1
- package/dist/profiles/index.browser.d.ts +1 -1
- package/dist/profiles/index.d.ts +1 -1
- package/dist/profiles/profile.d.ts +22 -61
- package/dist/profiles/profile.d.ts.map +1 -1
- package/dist/profiles/profile.js +0 -218
- package/dist/profiles/profile.js.map +1 -1
- package/dist/profiles/resolve.d.ts +8 -7
- package/dist/profiles/resolve.d.ts.map +1 -1
- package/dist/profiles/resolve.js +14 -12
- package/dist/profiles/resolve.js.map +1 -1
- package/package.json +1 -2
- package/src/apierror/apierror.ts +0 -253
- package/src/apierror/codes/codes.ts +0 -189
- package/src/apierror/codes/index.ts +0 -7
- package/src/apierror/details.ts +0 -459
- package/src/apierror/index.ts +0 -24
- package/src/clientinfo/agent.ts +0 -125
- package/src/clientinfo/base.ts +0 -73
- package/src/clientinfo/clientinfo.ts +0 -129
- package/src/clientinfo/default.browser.ts +0 -24
- package/src/clientinfo/default.ts +0 -128
- package/src/clientinfo/index.browser.ts +0 -4
- package/src/clientinfo/index.ts +0 -4
- package/src/http/http.ts +0 -75
- package/src/http/index.ts +0 -8
- package/src/index.ts +0 -5
- package/src/logger/index.ts +0 -8
- package/src/logger/logger.ts +0 -99
- package/src/ops/execute.ts +0 -99
- package/src/ops/index.ts +0 -12
- package/src/ops/limiter.ts +0 -8
- package/src/ops/options.ts +0 -22
- package/src/ops/retrier.ts +0 -108
- package/src/profiles/errors.ts +0 -28
- package/src/profiles/index.browser.ts +0 -10
- package/src/profiles/index.ts +0 -15
- package/src/profiles/ini.ts +0 -126
- package/src/profiles/profile.ts +0 -467
- package/src/profiles/resolve.ts +0 -251
- package/src/profiles/secret.ts +0 -40
- package/src/wkt/fieldmask.ts +0 -89
- package/src/wkt/index.ts +0 -3
- package/src/wkt/value.ts +0 -19
package/dist/clientinfo/agent.js
CHANGED
|
@@ -9,12 +9,20 @@
|
|
|
9
9
|
*
|
|
10
10
|
* @module
|
|
11
11
|
*/
|
|
12
|
-
|
|
13
|
-
//
|
|
12
|
+
import { sanitize } from './clientinfo';
|
|
13
|
+
// Name of the agents.md standard env var.
|
|
14
14
|
const AGENT_ENV_VAR = 'AGENT';
|
|
15
|
-
//
|
|
16
|
-
//
|
|
17
|
-
//
|
|
15
|
+
// Name of the Vercel @vercel/detect-agent convention env var. It serves
|
|
16
|
+
// the same purpose as AGENT_ENV_VAR; agentEnvFallback consults it only when
|
|
17
|
+
// AGENT_ENV_VAR is unset or empty.
|
|
18
|
+
const AI_AGENT_ENV_VAR = 'AI_AGENT';
|
|
19
|
+
// Caps fallback values to keep the user-agent bounded. Explicit-matcher
|
|
20
|
+
// products are short by construction; only the fallback path can carry
|
|
21
|
+
// arbitrary lengths.
|
|
22
|
+
const MAX_AGENT_FALLBACK_LEN = 64;
|
|
23
|
+
// Canonical list of AI coding agents. Keep this list, and the AGENT /
|
|
24
|
+
// AI_AGENT fallback handling in agentEnvFallback, in sync with the Go,
|
|
25
|
+
// Java, and Python SDKs. Agents are listed alphabetically by product name.
|
|
18
26
|
const KNOWN_AGENTS = [
|
|
19
27
|
// The amp agent also sets AGENT=amp, handled by the central fallback.
|
|
20
28
|
{ envVar: 'AMP_CURRENT_THREAD_ID', product: 'amp' },
|
|
@@ -37,23 +45,29 @@ const KNOWN_AGENTS = [
|
|
|
37
45
|
{ envVar: 'VSCODE_AGENT', product: 'vscode-agent' },
|
|
38
46
|
{ envVar: 'WINDSURF_AGENT', product: 'windsurf' },
|
|
39
47
|
];
|
|
48
|
+
/**
|
|
49
|
+
* Returns a sanitized, length-capped name from `AGENT` or `AI_AGENT`,
|
|
50
|
+
* preferring `AGENT` when both are non-empty. Empty is treated as unset for
|
|
51
|
+
* both. The value is passed through rather than categorized so that new
|
|
52
|
+
* names are propagated without the need to update the list of known agents.
|
|
53
|
+
*/
|
|
40
54
|
function agentEnvFallback() {
|
|
41
|
-
|
|
55
|
+
let v = process.env[AGENT_ENV_VAR];
|
|
42
56
|
if (v === undefined || v === '') {
|
|
43
|
-
|
|
57
|
+
v = process.env[AI_AGENT_ENV_VAR];
|
|
44
58
|
}
|
|
45
|
-
if (
|
|
46
|
-
return
|
|
59
|
+
if (v === undefined || v === '') {
|
|
60
|
+
return '';
|
|
47
61
|
}
|
|
48
|
-
|
|
62
|
+
// slice is a no-op when the value is already within the cap.
|
|
63
|
+
return sanitize(v).slice(0, MAX_AGENT_FALLBACK_LEN);
|
|
49
64
|
}
|
|
50
65
|
/**
|
|
51
66
|
* Checks environment variables for known AI agents and returns the
|
|
52
67
|
* detected product name.
|
|
53
68
|
*
|
|
54
69
|
* Explicit product-specific env vars always take precedence over the
|
|
55
|
-
* generic
|
|
56
|
-
* fallback when no explicit matcher fires, so that an explicit signal
|
|
70
|
+
* generic `AGENT` and `AI_AGENT` env vars, so that an explicit signal
|
|
57
71
|
* (e.g. `CLAUDECODE=1`) always wins over a conflicting `AGENT=<name>`
|
|
58
72
|
* value.
|
|
59
73
|
*
|
|
@@ -64,8 +78,8 @@ function agentEnvFallback() {
|
|
|
64
78
|
* can be stacked when one agent invokes another as a subagent (e.g.
|
|
65
79
|
* Claude Code spawning a Cursor CLI subprocess), so the child process
|
|
66
80
|
* inherits env vars from multiple layers.
|
|
67
|
-
* -
|
|
68
|
-
*
|
|
81
|
+
* - A sanitized, length-capped value from `AGENT` or `AI_AGENT` when no
|
|
82
|
+
* known env var is set (see {@link agentEnvFallback}).
|
|
69
83
|
* - `""` when nothing is set.
|
|
70
84
|
*/
|
|
71
85
|
export function lookupAgentProvider() {
|
|
@@ -90,13 +104,12 @@ let cached;
|
|
|
90
104
|
* Returns one of:
|
|
91
105
|
*
|
|
92
106
|
* - The known product name when exactly one agent is detected via
|
|
93
|
-
* explicit env matchers
|
|
94
|
-
* name and no explicit matcher fired.
|
|
107
|
+
* explicit env matchers.
|
|
95
108
|
* - `"multiple"` when multiple explicit matchers fire for different
|
|
96
109
|
* agents (typically nested agents, e.g. Cursor CLI running as a
|
|
97
110
|
* Claude Code subagent).
|
|
98
|
-
* -
|
|
99
|
-
*
|
|
111
|
+
* - A sanitized, length-capped value from `AGENT` or `AI_AGENT` when no
|
|
112
|
+
* explicit matcher fired (see {@link agentEnvFallback}).
|
|
100
113
|
* - `""` when no agent is detected.
|
|
101
114
|
*/
|
|
102
115
|
export function agentProvider() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../src/clientinfo/agent.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;
|
|
1
|
+
{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../src/clientinfo/agent.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* @module
|
|
5
5
|
*/
|
|
6
6
|
/** Discriminant codes for {@link ProfileError}. */
|
|
7
|
-
export type ProfileErrorCode = 'CONFIG_FILE_NOT_FOUND' | 'PROFILE_NOT_FOUND' | 'EMPTY_PATH' | 'EMPTY_PROFILE' | 'INVALID_PROFILE_NAME';
|
|
7
|
+
export type ProfileErrorCode = 'CONFIG_FILE_NOT_FOUND' | 'PROFILE_NOT_FOUND' | 'EMPTY_PATH' | 'EMPTY_PROFILE' | 'INVALID_PROFILE_NAME' | 'CONFLICTING_OPTIONS';
|
|
8
8
|
/**
|
|
9
9
|
* Error thrown by profile operations.
|
|
10
10
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/profiles/errors.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,mDAAmD;AACnD,MAAM,MAAM,gBAAgB,GACxB,uBAAuB,GACvB,mBAAmB,GACnB,YAAY,GACZ,eAAe,GACf,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/profiles/errors.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,mDAAmD;AACnD,MAAM,MAAM,gBAAgB,GACxB,uBAAuB,GACvB,mBAAmB,GACnB,YAAY,GACZ,eAAe,GACf,sBAAsB,GACtB,qBAAqB,CAAC;AAE1B;;;;GAIG;AACH,qBAAa,YAAa,SAAQ,KAAK;IACrC,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;gBAEpB,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM;CAKpD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/profiles/errors.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/profiles/errors.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAWH;;;;GAIG;AACH,MAAM,OAAO,YAAa,SAAQ,KAAK;IAC5B,IAAI,CAAmB;IAEhC,YAAY,IAAsB,EAAE,OAAe;QACjD,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,cAAc,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CACF"}
|
|
@@ -5,6 +5,6 @@
|
|
|
5
5
|
*/
|
|
6
6
|
export { ProfileError } from './errors';
|
|
7
7
|
export type { ProfileErrorCode } from './errors';
|
|
8
|
-
export type { Profile,
|
|
8
|
+
export type { Profile, ProfileOptions } from './profile';
|
|
9
9
|
export { Secret } from './secret';
|
|
10
10
|
//# sourceMappingURL=index.browser.d.ts.map
|
package/dist/profiles/index.d.ts
CHANGED
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
*/
|
|
10
10
|
export { ProfileError } from './errors';
|
|
11
11
|
export type { ProfileErrorCode } from './errors';
|
|
12
|
-
export type { Profile,
|
|
12
|
+
export type { Profile, ProfileOptions } from './profile';
|
|
13
13
|
export { defaultConfigFile, listProfiles, resolve } from './resolve';
|
|
14
14
|
export { Secret } from './secret';
|
|
15
15
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -20,10 +20,6 @@ export interface Profile {
|
|
|
20
20
|
accountId?: string;
|
|
21
21
|
/** Personal access token for PAT authentication. */
|
|
22
22
|
token?: Secret;
|
|
23
|
-
/** Username for basic authentication. */
|
|
24
|
-
username?: string;
|
|
25
|
-
/** Password for basic authentication. */
|
|
26
|
-
password?: Secret;
|
|
27
23
|
/** Selects a specific auth method when multiple credentials are available. */
|
|
28
24
|
authType?: string;
|
|
29
25
|
/** OAuth client ID for M2M authentication. */
|
|
@@ -32,77 +28,42 @@ export interface Profile {
|
|
|
32
28
|
clientSecret?: Secret;
|
|
33
29
|
/** Path to the Databricks CLI binary (>= 0.100.0) for CLI-based auth. */
|
|
34
30
|
databricksCliPath?: string;
|
|
35
|
-
/** URL of a metadata service that provides authentication credentials. */
|
|
36
|
-
metadataServiceUrl?: Secret;
|
|
37
|
-
/** GitHub Actions URL for requesting an OIDC token. */
|
|
38
|
-
actionsIdTokenRequestUrl?: string;
|
|
39
|
-
/** Bearer token for the GitHub Actions OIDC provider. */
|
|
40
|
-
actionsIdTokenRequestToken?: Secret;
|
|
41
|
-
/** Name of an environment variable containing an OIDC ID token. */
|
|
42
|
-
oidcTokenEnv?: string;
|
|
43
|
-
/** Path to a file containing an OIDC ID token. */
|
|
44
|
-
oidcTokenFilePath?: string;
|
|
45
|
-
/** Audience for Workload Identity Federation ID token requests. */
|
|
46
|
-
tokenAudience?: string;
|
|
47
|
-
/** OpenID Connect discovery URL override. */
|
|
48
|
-
discoveryUrl?: string;
|
|
49
|
-
/** Azure AD application (client) ID. */
|
|
50
|
-
azureClientId?: string;
|
|
51
|
-
/** Azure AD client secret. */
|
|
52
|
-
azureClientSecret?: Secret;
|
|
53
|
-
/** Azure AD tenant ID. */
|
|
54
|
-
azureTenantId?: string;
|
|
55
|
-
/** Azure Resource Manager ID for an Azure Databricks workspace. */
|
|
56
|
-
azureResourceId?: string;
|
|
57
|
-
/** Azure cloud environment (PUBLIC, USGOVERNMENT, CHINA). */
|
|
58
|
-
azureEnvironment?: string;
|
|
59
|
-
/**
|
|
60
|
-
* Azure Login Application ID.
|
|
61
|
-
*
|
|
62
|
-
* @deprecated This field no longer has any effect.
|
|
63
|
-
*/
|
|
64
|
-
azureLoginAppId?: string;
|
|
65
|
-
/** Whether to use Azure Managed Service Identity authentication. */
|
|
66
|
-
azureUseMsi?: boolean;
|
|
67
|
-
/** GCP service account credentials JSON. */
|
|
68
|
-
googleCredentials?: Secret;
|
|
69
|
-
/** GCP service account email for Google ID-based authentication. */
|
|
70
|
-
googleServiceAccount?: string;
|
|
71
|
-
/** Default Databricks cluster ID for compute operations. */
|
|
72
|
-
clusterId?: string;
|
|
73
|
-
/** Default Databricks SQL warehouse ID. */
|
|
74
|
-
warehouseId?: string;
|
|
75
|
-
/** Default serverless compute resource ID. */
|
|
76
|
-
serverlessComputeId?: string;
|
|
77
31
|
/**
|
|
78
32
|
* INI keys not mapped to a known field. Only populated when loading from a
|
|
79
33
|
* config file; environment variables do not contribute to extra.
|
|
80
34
|
*/
|
|
81
35
|
extra?: Record<string, string>;
|
|
82
36
|
}
|
|
83
|
-
/**
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
37
|
+
/**
|
|
38
|
+
* Configures how a profile is resolved by {@link resolve}.
|
|
39
|
+
*
|
|
40
|
+
* Resolution is enabled by default: with no options, {@link resolve} reads the
|
|
41
|
+
* config file and overlays DATABRICKS_* environment variables on top. Each
|
|
42
|
+
* source can be disabled independently with {@link ProfileOptions.noProfile}
|
|
43
|
+
* and {@link ProfileOptions.disableEnv}.
|
|
44
|
+
*/
|
|
45
|
+
export interface ProfileOptions {
|
|
91
46
|
/**
|
|
92
47
|
* Profile name (INI section) to load. If not set, resolves from the
|
|
93
48
|
* DATABRICKS_CONFIG_PROFILE environment variable, then the default_profile
|
|
94
49
|
* key in the __settings__ section, then falls back to the DEFAULT section.
|
|
95
|
-
* Setting this implies withFile: true.
|
|
96
50
|
*/
|
|
97
51
|
profile?: string;
|
|
98
|
-
/** Whether to read from the config file. Default: true. */
|
|
99
|
-
withFile?: boolean;
|
|
100
52
|
/**
|
|
101
|
-
*
|
|
102
|
-
*
|
|
103
|
-
|
|
53
|
+
* Path to the databrickscfg file. If not set, reads DATABRICKS_CONFIG_FILE
|
|
54
|
+
* from the environment, falling back to ~/.databrickscfg.
|
|
55
|
+
*/
|
|
56
|
+
configFile?: string;
|
|
57
|
+
/**
|
|
58
|
+
* Disable reading the config file. Cannot be combined with
|
|
59
|
+
* {@link ProfileOptions.profile} or {@link ProfileOptions.configFile},
|
|
60
|
+
* which would have nothing to read.
|
|
61
|
+
*/
|
|
62
|
+
noProfile?: boolean;
|
|
63
|
+
/**
|
|
64
|
+
* Disable overlaying DATABRICKS_* environment variables.
|
|
104
65
|
*/
|
|
105
|
-
|
|
66
|
+
disableEnv?: boolean;
|
|
106
67
|
}
|
|
107
68
|
/**
|
|
108
69
|
* Reserved INI section name for SDK settings. It is never treated as a
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile.d.ts","sourceRoot":"","sources":["../../src/profiles/profile.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAEhC;;;;GAIG;AACH,MAAM,WAAW,OAAO;IACtB,uCAAuC;IACvC,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,yDAAyD;IACzD,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,wDAAwD;IACxD,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,8CAA8C;IAC9C,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,oDAAoD;IACpD,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,
|
|
1
|
+
{"version":3,"file":"profile.d.ts","sourceRoot":"","sources":["../../src/profiles/profile.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAEhC;;;;GAIG;AACH,MAAM,WAAW,OAAO;IACtB,uCAAuC;IACvC,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,yDAAyD;IACzD,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,wDAAwD;IACxD,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,8CAA8C;IAC9C,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,oDAAoD;IACpD,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,8EAA8E;IAC9E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,8CAA8C;IAC9C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,kDAAkD;IAClD,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,yEAAyE;IACzE,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;OAIG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;GAGG;AACH,eAAO,MAAM,gBAAgB,iBAAiB,CAAC;AAM/C;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,oDAAoD;IACpD,QAAQ,CAAC,KAAK,EAAE,MAAM,OAAO,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,8DAA8D;IAC9D,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACtD,oEAAoE;IACpE,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,MAAM,GAAG,SAAS,CAAC;CACxD;AAED;;GAEG;AACH,eAAO,MAAM,aAAa,EAAE,SAAS,WAAW,EAyE/C,CAAC"}
|
package/dist/profiles/profile.js
CHANGED
|
@@ -9,34 +9,9 @@ import { Secret } from './secret';
|
|
|
9
9
|
* profile.
|
|
10
10
|
*/
|
|
11
11
|
export const SETTINGS_SECTION = '__settings__';
|
|
12
|
-
/**
|
|
13
|
-
* Parses common boolean string representations (true/false, 1/0, t/f and
|
|
14
|
-
* their case variants).
|
|
15
|
-
*/
|
|
16
|
-
function parseBool(value) {
|
|
17
|
-
switch (value) {
|
|
18
|
-
case '1':
|
|
19
|
-
case 't':
|
|
20
|
-
case 'T':
|
|
21
|
-
case 'TRUE':
|
|
22
|
-
case 'true':
|
|
23
|
-
case 'True':
|
|
24
|
-
return true;
|
|
25
|
-
case '0':
|
|
26
|
-
case 'f':
|
|
27
|
-
case 'F':
|
|
28
|
-
case 'FALSE':
|
|
29
|
-
case 'false':
|
|
30
|
-
case 'False':
|
|
31
|
-
return false;
|
|
32
|
-
default:
|
|
33
|
-
throw new Error(`invalid boolean value: "${value}"`);
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
12
|
/**
|
|
37
13
|
* Declarative property mapping table for all known profile fields.
|
|
38
14
|
*/
|
|
39
|
-
// eslint-disable-next-line @typescript-eslint/no-deprecated -- The table includes azureLoginAppId for backward compatibility.
|
|
40
15
|
export const PROPERTY_DEFS = [
|
|
41
16
|
{
|
|
42
17
|
field: 'host',
|
|
@@ -74,24 +49,6 @@ export const PROPERTY_DEFS = [
|
|
|
74
49
|
},
|
|
75
50
|
get: (p) => p.token?.value,
|
|
76
51
|
},
|
|
77
|
-
{
|
|
78
|
-
field: 'username',
|
|
79
|
-
envVar: 'DATABRICKS_USERNAME',
|
|
80
|
-
iniKey: 'username',
|
|
81
|
-
set: (p, v) => {
|
|
82
|
-
p.username = v;
|
|
83
|
-
},
|
|
84
|
-
get: (p) => p.username,
|
|
85
|
-
},
|
|
86
|
-
{
|
|
87
|
-
field: 'password',
|
|
88
|
-
envVar: 'DATABRICKS_PASSWORD',
|
|
89
|
-
iniKey: 'password',
|
|
90
|
-
set: (p, v) => {
|
|
91
|
-
p.password = new Secret(v);
|
|
92
|
-
},
|
|
93
|
-
get: (p) => p.password?.value,
|
|
94
|
-
},
|
|
95
52
|
{
|
|
96
53
|
field: 'authType',
|
|
97
54
|
envVar: 'DATABRICKS_AUTH_TYPE',
|
|
@@ -128,180 +85,5 @@ export const PROPERTY_DEFS = [
|
|
|
128
85
|
},
|
|
129
86
|
get: (p) => p.databricksCliPath,
|
|
130
87
|
},
|
|
131
|
-
{
|
|
132
|
-
field: 'metadataServiceUrl',
|
|
133
|
-
envVar: 'DATABRICKS_METADATA_SERVICE_URL',
|
|
134
|
-
iniKey: 'metadata_service_url',
|
|
135
|
-
set: (p, v) => {
|
|
136
|
-
p.metadataServiceUrl = new Secret(v);
|
|
137
|
-
},
|
|
138
|
-
get: (p) => p.metadataServiceUrl?.value,
|
|
139
|
-
},
|
|
140
|
-
{
|
|
141
|
-
field: 'actionsIdTokenRequestUrl',
|
|
142
|
-
envVar: 'ACTIONS_ID_TOKEN_REQUEST_URL',
|
|
143
|
-
iniKey: 'actions_id_token_request_url',
|
|
144
|
-
set: (p, v) => {
|
|
145
|
-
p.actionsIdTokenRequestUrl = v;
|
|
146
|
-
},
|
|
147
|
-
get: (p) => p.actionsIdTokenRequestUrl,
|
|
148
|
-
},
|
|
149
|
-
{
|
|
150
|
-
field: 'actionsIdTokenRequestToken',
|
|
151
|
-
envVar: 'ACTIONS_ID_TOKEN_REQUEST_TOKEN',
|
|
152
|
-
iniKey: 'actions_id_token_request_token',
|
|
153
|
-
set: (p, v) => {
|
|
154
|
-
p.actionsIdTokenRequestToken = new Secret(v);
|
|
155
|
-
},
|
|
156
|
-
get: (p) => p.actionsIdTokenRequestToken?.value,
|
|
157
|
-
},
|
|
158
|
-
{
|
|
159
|
-
field: 'oidcTokenEnv',
|
|
160
|
-
envVar: 'DATABRICKS_OIDC_TOKEN_ENV',
|
|
161
|
-
iniKey: 'oidc_token_env',
|
|
162
|
-
set: (p, v) => {
|
|
163
|
-
p.oidcTokenEnv = v;
|
|
164
|
-
},
|
|
165
|
-
get: (p) => p.oidcTokenEnv,
|
|
166
|
-
},
|
|
167
|
-
// Intentional mismatch between envVar and iniKey for backward compatibility.
|
|
168
|
-
{
|
|
169
|
-
field: 'oidcTokenFilePath',
|
|
170
|
-
envVar: 'DATABRICKS_OIDC_TOKEN_FILEPATH',
|
|
171
|
-
iniKey: 'databricks_id_token_filepath',
|
|
172
|
-
set: (p, v) => {
|
|
173
|
-
p.oidcTokenFilePath = v;
|
|
174
|
-
},
|
|
175
|
-
get: (p) => p.oidcTokenFilePath,
|
|
176
|
-
},
|
|
177
|
-
// Intentional mismatch between envVar and iniKey for backward compatibility.
|
|
178
|
-
{
|
|
179
|
-
field: 'tokenAudience',
|
|
180
|
-
envVar: 'DATABRICKS_TOKEN_AUDIENCE',
|
|
181
|
-
iniKey: 'audience',
|
|
182
|
-
set: (p, v) => {
|
|
183
|
-
p.tokenAudience = v;
|
|
184
|
-
},
|
|
185
|
-
get: (p) => p.tokenAudience,
|
|
186
|
-
},
|
|
187
|
-
{
|
|
188
|
-
field: 'discoveryUrl',
|
|
189
|
-
envVar: 'DATABRICKS_DISCOVERY_URL',
|
|
190
|
-
iniKey: 'discovery_url',
|
|
191
|
-
set: (p, v) => {
|
|
192
|
-
p.discoveryUrl = v;
|
|
193
|
-
},
|
|
194
|
-
get: (p) => p.discoveryUrl,
|
|
195
|
-
},
|
|
196
|
-
{
|
|
197
|
-
field: 'azureClientId',
|
|
198
|
-
envVar: 'ARM_CLIENT_ID',
|
|
199
|
-
iniKey: 'azure_client_id',
|
|
200
|
-
set: (p, v) => {
|
|
201
|
-
p.azureClientId = v;
|
|
202
|
-
},
|
|
203
|
-
get: (p) => p.azureClientId,
|
|
204
|
-
},
|
|
205
|
-
{
|
|
206
|
-
field: 'azureClientSecret',
|
|
207
|
-
envVar: 'ARM_CLIENT_SECRET',
|
|
208
|
-
iniKey: 'azure_client_secret',
|
|
209
|
-
set: (p, v) => {
|
|
210
|
-
p.azureClientSecret = new Secret(v);
|
|
211
|
-
},
|
|
212
|
-
get: (p) => p.azureClientSecret?.value,
|
|
213
|
-
},
|
|
214
|
-
{
|
|
215
|
-
field: 'azureTenantId',
|
|
216
|
-
envVar: 'ARM_TENANT_ID',
|
|
217
|
-
iniKey: 'azure_tenant_id',
|
|
218
|
-
set: (p, v) => {
|
|
219
|
-
p.azureTenantId = v;
|
|
220
|
-
},
|
|
221
|
-
get: (p) => p.azureTenantId,
|
|
222
|
-
},
|
|
223
|
-
// Intentional mismatch between envVar and iniKey for backward compatibility.
|
|
224
|
-
{
|
|
225
|
-
field: 'azureResourceId',
|
|
226
|
-
envVar: 'DATABRICKS_AZURE_RESOURCE_ID',
|
|
227
|
-
iniKey: 'azure_workspace_resource_id',
|
|
228
|
-
set: (p, v) => {
|
|
229
|
-
p.azureResourceId = v;
|
|
230
|
-
},
|
|
231
|
-
get: (p) => p.azureResourceId,
|
|
232
|
-
},
|
|
233
|
-
{
|
|
234
|
-
field: 'azureEnvironment',
|
|
235
|
-
envVar: 'ARM_ENVIRONMENT',
|
|
236
|
-
iniKey: 'azure_environment',
|
|
237
|
-
set: (p, v) => {
|
|
238
|
-
p.azureEnvironment = v;
|
|
239
|
-
},
|
|
240
|
-
get: (p) => p.azureEnvironment,
|
|
241
|
-
},
|
|
242
|
-
{
|
|
243
|
-
field: 'azureLoginAppId',
|
|
244
|
-
envVar: 'DATABRICKS_AZURE_LOGIN_APP_ID',
|
|
245
|
-
iniKey: 'azure_login_app_id',
|
|
246
|
-
set: (p, v) => {
|
|
247
|
-
p.azureLoginAppId = v; // eslint-disable-line @typescript-eslint/no-deprecated
|
|
248
|
-
},
|
|
249
|
-
// eslint-disable-next-line @typescript-eslint/no-deprecated
|
|
250
|
-
get: (p) => p.azureLoginAppId,
|
|
251
|
-
},
|
|
252
|
-
{
|
|
253
|
-
field: 'azureUseMsi',
|
|
254
|
-
envVar: 'ARM_USE_MSI',
|
|
255
|
-
iniKey: 'azure_use_msi',
|
|
256
|
-
set: (p, v) => {
|
|
257
|
-
p.azureUseMsi = parseBool(v);
|
|
258
|
-
},
|
|
259
|
-
get: (p) => p.azureUseMsi === undefined ? undefined : String(p.azureUseMsi),
|
|
260
|
-
},
|
|
261
|
-
{
|
|
262
|
-
field: 'googleCredentials',
|
|
263
|
-
envVar: 'GOOGLE_CREDENTIALS',
|
|
264
|
-
iniKey: 'google_credentials',
|
|
265
|
-
set: (p, v) => {
|
|
266
|
-
p.googleCredentials = new Secret(v);
|
|
267
|
-
},
|
|
268
|
-
get: (p) => p.googleCredentials?.value,
|
|
269
|
-
},
|
|
270
|
-
{
|
|
271
|
-
field: 'googleServiceAccount',
|
|
272
|
-
envVar: 'DATABRICKS_GOOGLE_SERVICE_ACCOUNT',
|
|
273
|
-
iniKey: 'google_service_account',
|
|
274
|
-
set: (p, v) => {
|
|
275
|
-
p.googleServiceAccount = v;
|
|
276
|
-
},
|
|
277
|
-
get: (p) => p.googleServiceAccount,
|
|
278
|
-
},
|
|
279
|
-
{
|
|
280
|
-
field: 'clusterId',
|
|
281
|
-
envVar: 'DATABRICKS_CLUSTER_ID',
|
|
282
|
-
iniKey: 'cluster_id',
|
|
283
|
-
set: (p, v) => {
|
|
284
|
-
p.clusterId = v;
|
|
285
|
-
},
|
|
286
|
-
get: (p) => p.clusterId,
|
|
287
|
-
},
|
|
288
|
-
{
|
|
289
|
-
field: 'warehouseId',
|
|
290
|
-
envVar: 'DATABRICKS_WAREHOUSE_ID',
|
|
291
|
-
iniKey: 'warehouse_id',
|
|
292
|
-
set: (p, v) => {
|
|
293
|
-
p.warehouseId = v;
|
|
294
|
-
},
|
|
295
|
-
get: (p) => p.warehouseId,
|
|
296
|
-
},
|
|
297
|
-
{
|
|
298
|
-
field: 'serverlessComputeId',
|
|
299
|
-
envVar: 'DATABRICKS_SERVERLESS_COMPUTE_ID',
|
|
300
|
-
iniKey: 'serverless_compute_id',
|
|
301
|
-
set: (p, v) => {
|
|
302
|
-
p.serverlessComputeId = v;
|
|
303
|
-
},
|
|
304
|
-
get: (p) => p.serverlessComputeId,
|
|
305
|
-
},
|
|
306
88
|
];
|
|
307
89
|
//# sourceMappingURL=profile.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile.js","sourceRoot":"","sources":["../../src/profiles/profile.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"profile.js","sourceRoot":"","sources":["../../src/profiles/profile.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AA6EhC;;;GAGG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,cAAc,CAAC;AAsB/C;;GAEG;AACH,MAAM,CAAC,MAAM,aAAa,GAA2B;IACnD;QACE,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,iBAAiB;QACzB,MAAM,EAAE,MAAM;QACd,GAAG,EAAE,CAAC,CAAU,EAAE,CAAS,EAAQ,EAAE;YACnC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC;QACb,CAAC;QACD,GAAG,EAAE,CAAC,CAAU,EAAsB,EAAE,CAAC,CAAC,CAAC,IAAI;KAChD;IACD;QACE,KAAK,EAAE,aAAa;QACpB,MAAM,EAAE,yBAAyB;QACjC,MAAM,EAAE,cAAc;QACtB,GAAG,EAAE,CAAC,CAAU,EAAE,CAAS,EAAQ,EAAE;YACnC,CAAC,CAAC,WAAW,GAAG,CAAC,CAAC;QACpB,CAAC;QACD,GAAG,EAAE,CAAC,CAAU,EAAsB,EAAE,CAAC,CAAC,CAAC,WAAW;KACvD;IACD;QACE,KAAK,EAAE,WAAW;QAClB,MAAM,EAAE,uBAAuB;QAC/B,MAAM,EAAE,YAAY;QACpB,GAAG,EAAE,CAAC,CAAU,EAAE,CAAS,EAAQ,EAAE;YACnC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC;QAClB,CAAC;QACD,GAAG,EAAE,CAAC,CAAU,EAAsB,EAAE,CAAC,CAAC,CAAC,SAAS;KACrD;IACD;QACE,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,kBAAkB;QAC1B,MAAM,EAAE,OAAO;QACf,GAAG,EAAE,CAAC,CAAU,EAAE,CAAS,EAAQ,EAAE;YACnC,CAAC,CAAC,KAAK,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC;QAC1B,CAAC;QACD,GAAG,EAAE,CAAC,CAAU,EAAsB,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK;KACxD;IACD;QACE,KAAK,EAAE,UAAU;QACjB,MAAM,EAAE,sBAAsB;QAC9B,MAAM,EAAE,WAAW;QACnB,GAAG,EAAE,CAAC,CAAU,EAAE,CAAS,EAAQ,EAAE;YACnC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC;QACjB,CAAC;QACD,GAAG,EAAE,CAAC,CAAU,EAAsB,EAAE,CAAC,CAAC,CAAC,QAAQ;KACpD;IACD;QACE,KAAK,EAAE,UAAU;QACjB,MAAM,EAAE,sBAAsB;QAC9B,MAAM,EAAE,WAAW;QACnB,GAAG,EAAE,CAAC,CAAU,EAAE,CAAS,EAAQ,EAAE;YACnC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC;QACjB,CAAC;QACD,GAAG,EAAE,CAAC,CAAU,EAAsB,EAAE,CAAC,CAAC,CAAC,QAAQ;KACpD;IACD;QACE,KAAK,EAAE,cAAc;QACrB,MAAM,EAAE,0BAA0B;QAClC,MAAM,EAAE,eAAe;QACvB,GAAG,EAAE,CAAC,CAAU,EAAE,CAAS,EAAQ,EAAE;YACnC,CAAC,CAAC,YAAY,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC;QACjC,CAAC;QACD,GAAG,EAAE,CAAC,CAAU,EAAsB,EAAE,CAAC,CAAC,CAAC,YAAY,EAAE,KAAK;KAC/D;IACD;QACE,KAAK,EAAE,mBAAmB;QAC1B,MAAM,EAAE,qBAAqB;QAC7B,MAAM,EAAE,qBAAqB;QAC7B,GAAG,EAAE,CAAC,CAAU,EAAE,CAAS,EAAQ,EAAE;YACnC,CAAC,CAAC,iBAAiB,GAAG,CAAC,CAAC;QAC1B,CAAC;QACD,GAAG,EAAE,CAAC,CAAU,EAAsB,EAAE,CAAC,CAAC,CAAC,iBAAiB;KAC7D;CACF,CAAC"}
|
|
@@ -3,18 +3,19 @@
|
|
|
3
3
|
*
|
|
4
4
|
* @module
|
|
5
5
|
*/
|
|
6
|
-
import type { Profile,
|
|
6
|
+
import type { Profile, ProfileOptions } from './profile';
|
|
7
7
|
/**
|
|
8
8
|
* Creates a {@link Profile} from a databrickscfg file and/or environment
|
|
9
9
|
* variables.
|
|
10
10
|
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
13
|
-
*
|
|
14
|
-
*
|
|
15
|
-
*
|
|
11
|
+
* Both sources are read by default: the config file is loaded and DATABRICKS_*
|
|
12
|
+
* environment variables are overlaid on top (env takes precedence). This holds
|
|
13
|
+
* whether or not a specific {@link ProfileOptions.profile} or
|
|
14
|
+
* {@link ProfileOptions.configFile} is given. Disable the config file with
|
|
15
|
+
* {@link ProfileOptions.noProfile} and the environment overlay with
|
|
16
|
+
* {@link ProfileOptions.disableEnv}.
|
|
16
17
|
*/
|
|
17
|
-
export declare function resolve(options?:
|
|
18
|
+
export declare function resolve(options?: ProfileOptions): Promise<Profile>;
|
|
18
19
|
/**
|
|
19
20
|
* Returns the path to the default databrickscfg file. Reads
|
|
20
21
|
* DATABRICKS_CONFIG_FILE from the environment, falling back to
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/profiles/resolve.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAQH,OAAO,KAAK,EAAC,OAAO,EAAE,cAAc,EAAC,MAAM,WAAW,CAAC;AA8JvD
|
|
1
|
+
{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/profiles/resolve.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAQH,OAAO,KAAK,EAAC,OAAO,EAAE,cAAc,EAAC,MAAM,WAAW,CAAC;AA8JvD;;;;;;;;;;GAUG;AACH,wBAAsB,OAAO,CAAC,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,CA0BxE;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAM1C;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CA8BlE"}
|
package/dist/profiles/resolve.js
CHANGED
|
@@ -142,26 +142,28 @@ function loadEnv() {
|
|
|
142
142
|
* Creates a {@link Profile} from a databrickscfg file and/or environment
|
|
143
143
|
* variables.
|
|
144
144
|
*
|
|
145
|
-
*
|
|
146
|
-
*
|
|
147
|
-
*
|
|
148
|
-
*
|
|
149
|
-
*
|
|
145
|
+
* Both sources are read by default: the config file is loaded and DATABRICKS_*
|
|
146
|
+
* environment variables are overlaid on top (env takes precedence). This holds
|
|
147
|
+
* whether or not a specific {@link ProfileOptions.profile} or
|
|
148
|
+
* {@link ProfileOptions.configFile} is given. Disable the config file with
|
|
149
|
+
* {@link ProfileOptions.noProfile} and the environment overlay with
|
|
150
|
+
* {@link ProfileOptions.disableEnv}.
|
|
150
151
|
*/
|
|
151
152
|
export async function resolve(options) {
|
|
152
|
-
if (options?.
|
|
153
|
+
if (options?.configFile === '') {
|
|
153
154
|
throw new ProfileError('EMPTY_PATH', 'empty path');
|
|
154
155
|
}
|
|
155
156
|
if (options?.profile === '') {
|
|
156
157
|
throw new ProfileError('EMPTY_PROFILE', 'empty profile');
|
|
157
158
|
}
|
|
158
|
-
|
|
159
|
-
options.
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
const
|
|
159
|
+
if (options?.noProfile === true &&
|
|
160
|
+
(options.profile !== undefined || options.configFile !== undefined)) {
|
|
161
|
+
throw new ProfileError('CONFLICTING_OPTIONS', 'noProfile cannot be combined with profile or configFile');
|
|
162
|
+
}
|
|
163
|
+
const shouldReadFile = options?.noProfile !== true;
|
|
164
|
+
const shouldReadEnv = options?.disableEnv !== true;
|
|
163
165
|
const fileProfile = shouldReadFile
|
|
164
|
-
? await loadFile(options?.
|
|
166
|
+
? await loadFile(options?.configFile, options?.profile)
|
|
165
167
|
: {};
|
|
166
168
|
const envProfile = shouldReadEnv ? loadEnv() : {};
|
|
167
169
|
return { ...fileProfile, ...envProfile };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/profiles/resolve.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/profiles/resolve.ts"],"names":[],"mappings":"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"}
|