@microsoft/managed-apps-cli 0.9.2 → 0.11.0
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 +18 -342
- package/dist/ArgumentProvider.d.ts.map +1 -1
- package/dist/ArgumentProvider.js +8 -1
- package/dist/ArgumentProvider.js.map +1 -1
- package/dist/Authentication/NodeMsalAuthenticationProvider.js +20 -1
- package/dist/Authentication/NodeMsalAuthenticationProvider.js.map +1 -1
- package/dist/Cli.d.ts.map +1 -1
- package/dist/Cli.js +15 -3
- package/dist/Cli.js.map +1 -1
- package/dist/Constants/CommandRegistry.d.ts +1 -2
- package/dist/Constants/CommandRegistry.d.ts.map +1 -1
- package/dist/Constants/CommandRegistry.js +26 -45
- package/dist/Constants/CommandRegistry.js.map +1 -1
- package/dist/Constants/HelpStrings.d.ts +12 -8
- package/dist/Constants/HelpStrings.d.ts.map +1 -1
- package/dist/Constants/HelpStrings.js +98 -80
- package/dist/Constants/HelpStrings.js.map +1 -1
- package/dist/Errors/GitHubErrorMap.d.ts +43 -14
- package/dist/Errors/GitHubErrorMap.d.ts.map +1 -1
- package/dist/Errors/GitHubErrorMap.js +189 -147
- package/dist/Errors/GitHubErrorMap.js.map +1 -1
- package/dist/Logger/CliLogger.d.ts +2 -0
- package/dist/Logger/CliLogger.d.ts.map +1 -1
- package/dist/Logger/CliLogger.js +12 -3
- package/dist/Logger/CliLogger.js.map +1 -1
- package/dist/Logger/ConsoleWriter.d.ts +2 -0
- package/dist/Logger/ConsoleWriter.d.ts.map +1 -1
- package/dist/Logger/ConsoleWriter.js +17 -7
- package/dist/Logger/ConsoleWriter.js.map +1 -1
- package/dist/Types/Argument.types.d.ts +1 -0
- package/dist/Types/Argument.types.d.ts.map +1 -1
- package/dist/Types/Command.types.d.ts +6 -0
- package/dist/Types/Command.types.d.ts.map +1 -1
- package/dist/Types/Command.types.js +8 -0
- package/dist/Types/Command.types.js.map +1 -1
- package/dist/Utils/BuildVerbDescriptionTable.d.ts.map +1 -1
- package/dist/Utils/BuildVerbDescriptionTable.js +6 -2
- package/dist/Utils/BuildVerbDescriptionTable.js.map +1 -1
- package/dist/Utils/ConnectorIds.d.ts +12 -0
- package/dist/Utils/ConnectorIds.d.ts.map +1 -0
- package/dist/Utils/ConnectorIds.js +20 -0
- package/dist/Utils/ConnectorIds.js.map +1 -0
- package/dist/Utils/DcfRecovery.d.ts +7 -7
- package/dist/Utils/DcfRecovery.d.ts.map +1 -1
- package/dist/Utils/DcfRecovery.js +17 -37
- package/dist/Utils/DcfRecovery.js.map +1 -1
- package/dist/Utils/DownloadTemplate.d.ts +45 -0
- package/dist/Utils/DownloadTemplate.d.ts.map +1 -0
- package/dist/Utils/DownloadTemplate.js +161 -0
- package/dist/Utils/DownloadTemplate.js.map +1 -0
- package/dist/Utils/EnvVars.d.ts +1 -1
- package/dist/Utils/EnvVars.d.ts.map +1 -1
- package/dist/Utils/EnvVars.js.map +1 -1
- package/dist/Utils/EnvironmentRoutingUtils.d.ts +20 -1
- package/dist/Utils/EnvironmentRoutingUtils.d.ts.map +1 -1
- package/dist/Utils/EnvironmentRoutingUtils.js +78 -3
- package/dist/Utils/EnvironmentRoutingUtils.js.map +1 -1
- package/dist/Utils/GitErrorClassifier.d.ts +40 -0
- package/dist/Utils/GitErrorClassifier.d.ts.map +1 -0
- package/dist/Utils/GitErrorClassifier.js +120 -0
- package/dist/Utils/GitErrorClassifier.js.map +1 -0
- package/dist/Utils/GitRunner.d.ts +107 -0
- package/dist/Utils/GitRunner.d.ts.map +1 -0
- package/dist/Utils/GitRunner.js +89 -0
- package/dist/Utils/GitRunner.js.map +1 -0
- package/dist/Utils/GitUtils.d.ts +12 -0
- package/dist/Utils/GitUtils.d.ts.map +1 -1
- package/dist/Utils/GitUtils.js +83 -20
- package/dist/Utils/GitUtils.js.map +1 -1
- package/dist/Utils/GitVersionChecker.d.ts +38 -0
- package/dist/Utils/GitVersionChecker.d.ts.map +1 -0
- package/dist/Utils/GitVersionChecker.js +64 -0
- package/dist/Utils/GitVersionChecker.js.map +1 -0
- package/dist/Utils/MaafAppConfig.d.ts +22 -0
- package/dist/Utils/MaafAppConfig.d.ts.map +1 -0
- package/dist/Utils/MaafAppConfig.js +32 -0
- package/dist/Utils/MaafAppConfig.js.map +1 -0
- package/dist/Utils/NodeVersionChecker.d.ts +3 -6
- package/dist/Utils/NodeVersionChecker.d.ts.map +1 -1
- package/dist/Utils/NodeVersionChecker.js +9 -26
- package/dist/Utils/NodeVersionChecker.js.map +1 -1
- package/dist/Utils/Paging.d.ts +6 -0
- package/dist/Utils/Paging.d.ts.map +1 -1
- package/dist/Utils/Paging.js +36 -1
- package/dist/Utils/Paging.js.map +1 -1
- package/dist/Utils/PinCli.d.ts +28 -0
- package/dist/Utils/PinCli.d.ts.map +1 -0
- package/dist/Utils/PinCli.js +58 -0
- package/dist/Utils/PinCli.js.map +1 -0
- package/dist/Utils/RepoDetails.d.ts +29 -0
- package/dist/Utils/RepoDetails.d.ts.map +1 -0
- package/dist/Utils/RepoDetails.js +37 -0
- package/dist/Utils/RepoDetails.js.map +1 -0
- package/dist/Utils/RepoOption.d.ts +35 -0
- package/dist/Utils/RepoOption.d.ts.map +1 -0
- package/dist/Utils/RepoOption.js +36 -0
- package/dist/Utils/RepoOption.js.map +1 -0
- package/dist/Utils/ResolveCommand.d.ts.map +1 -1
- package/dist/Utils/ResolveCommand.js +6 -4
- package/dist/Utils/ResolveCommand.js.map +1 -1
- package/dist/Utils/Spinner.d.ts.map +1 -1
- package/dist/Utils/Spinner.js +3 -0
- package/dist/Utils/Spinner.js.map +1 -1
- package/dist/Verbs/AddAction.js +6 -6
- package/dist/Verbs/AddAction.js.map +1 -1
- package/dist/Verbs/AddConnector.d.ts +6 -4
- package/dist/Verbs/AddConnector.d.ts.map +1 -1
- package/dist/Verbs/AddConnector.js +54 -14
- package/dist/Verbs/AddConnector.js.map +1 -1
- package/dist/Verbs/AddConnectorFlows.d.ts +29 -16
- package/dist/Verbs/AddConnectorFlows.d.ts.map +1 -1
- package/dist/Verbs/AddConnectorFlows.js +73 -25
- package/dist/Verbs/AddConnectorFlows.js.map +1 -1
- package/dist/Verbs/AddDataSource.d.ts +3 -4
- package/dist/Verbs/AddDataSource.d.ts.map +1 -1
- package/dist/Verbs/AddDataSource.js +9 -20
- package/dist/Verbs/AddDataSource.js.map +1 -1
- package/dist/Verbs/AddTable.js +7 -7
- package/dist/Verbs/AddTable.js.map +1 -1
- package/dist/Verbs/AuthStatus.d.ts.map +1 -1
- package/dist/Verbs/AuthStatus.js +7 -4
- package/dist/Verbs/AuthStatus.js.map +1 -1
- package/dist/Verbs/BuildMaafApp.js +1 -1
- package/dist/Verbs/BuildMaafApp.js.map +1 -1
- package/dist/Verbs/ConnectorHelpers.d.ts +5 -4
- package/dist/Verbs/ConnectorHelpers.d.ts.map +1 -1
- package/dist/Verbs/ConnectorHelpers.js +14 -9
- package/dist/Verbs/ConnectorHelpers.js.map +1 -1
- package/dist/Verbs/CreateMaafApp.d.ts +25 -42
- package/dist/Verbs/CreateMaafApp.d.ts.map +1 -1
- package/dist/Verbs/CreateMaafApp.js +346 -268
- package/dist/Verbs/CreateMaafApp.js.map +1 -1
- package/dist/Verbs/DeployMaafApp.d.ts.map +1 -1
- package/dist/Verbs/DeployMaafApp.js +4 -4
- package/dist/Verbs/DeployMaafApp.js.map +1 -1
- package/dist/Verbs/Dev.js +1 -1
- package/dist/Verbs/Dev.js.map +1 -1
- package/dist/Verbs/GetMaafApp.d.ts.map +1 -1
- package/dist/Verbs/GetMaafApp.js +10 -0
- package/dist/Verbs/GetMaafApp.js.map +1 -1
- package/dist/Verbs/GetMaafBuildStatus.d.ts.map +1 -1
- package/dist/Verbs/GetMaafBuildStatus.js +52 -3
- package/dist/Verbs/GetMaafBuildStatus.js.map +1 -1
- package/dist/Verbs/GetSettings.js +1 -1
- package/dist/Verbs/GetSettings.js.map +1 -1
- package/dist/Verbs/Init.d.ts.map +1 -1
- package/dist/Verbs/Init.js +183 -60
- package/dist/Verbs/Init.js.map +1 -1
- package/dist/Verbs/ListConnectorActions.js +12 -9
- package/dist/Verbs/ListConnectorActions.js.map +1 -1
- package/dist/Verbs/ListConnectors.d.ts.map +1 -1
- package/dist/Verbs/ListConnectors.js +3 -2
- package/dist/Verbs/ListConnectors.js.map +1 -1
- package/dist/Verbs/ListMaafApps.js +3 -3
- package/dist/Verbs/ListMaafApps.js.map +1 -1
- package/dist/Verbs/MaafAppPermissions.d.ts.map +1 -1
- package/dist/Verbs/MaafAppPermissions.js +89 -17
- package/dist/Verbs/MaafAppPermissions.js.map +1 -1
- package/dist/Verbs/Pack.d.ts +1 -1
- package/dist/Verbs/RefreshDataSource.js +1 -1
- package/dist/Verbs/RefreshDataSource.js.map +1 -1
- package/dist/Verbs/RefreshGitAuth.d.ts.map +1 -1
- package/dist/Verbs/RefreshGitAuth.js +3 -15
- package/dist/Verbs/RefreshGitAuth.js.map +1 -1
- package/dist/Verbs/{DeleteDataSource.d.ts → RemoveDataSource.d.ts} +2 -2
- package/dist/Verbs/RemoveDataSource.d.ts.map +1 -0
- package/dist/Verbs/RemoveDataSource.js +158 -0
- package/dist/Verbs/RemoveDataSource.js.map +1 -0
- package/dist/Verbs/SetSetting.js +2 -2
- package/dist/Verbs/SetSetting.js.map +1 -1
- package/dist/Verbs/ShareLinkList.js +1 -1
- package/dist/Verbs/ShareLinkList.js.map +1 -1
- package/dist/Verbs/ShowMaafApp.d.ts +6 -0
- package/dist/Verbs/ShowMaafApp.d.ts.map +1 -1
- package/dist/Verbs/ShowMaafApp.js +10 -2
- package/dist/Verbs/ShowMaafApp.js.map +1 -1
- package/dist/Verbs/VerbConstants.d.ts +20 -23
- package/dist/Verbs/VerbConstants.d.ts.map +1 -1
- package/dist/Verbs/VerbConstants.js +20 -23
- package/dist/Verbs/VerbConstants.js.map +1 -1
- package/dist/Verbs/index.d.ts +1 -1
- package/dist/Verbs/index.d.ts.map +1 -1
- package/dist/Verbs/index.js +1 -1
- package/dist/Verbs/index.js.map +1 -1
- package/package.json +11 -9
- package/dist/Verbs/DeleteDataSource.d.ts.map +0 -1
- package/dist/Verbs/DeleteDataSource.js +0 -105
- package/dist/Verbs/DeleteDataSource.js.map +0 -1
|
@@ -3,15 +3,16 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import { addConnectorActionAsync, addConnectorTableAsync, AllActionsBlockedError, getConnectorActionPolicy, getPlayerServiceConfig, listDatasetsAsync, listTablesAsync, } from '@microsoft/managed-apps-actions';
|
|
5
5
|
import { getCliLogger, getSettings } from '../CliSettings.js';
|
|
6
|
-
import { promptSelectOrInput } from '../CliUtils.js';
|
|
6
|
+
import { promptConfirm, promptSelectOrInput, promptText } from '../CliUtils.js';
|
|
7
7
|
import { CLI_BINARY_NAME } from '../Constants/CliConstants.js';
|
|
8
8
|
import { UsageError } from '../Errors/CliError.js';
|
|
9
|
+
import { isCdsConnectorId } from '../Utils/ConnectorIds.js';
|
|
9
10
|
import { printInfo, printSuccess, printTable } from '../Utils/ConsoleOutput.js';
|
|
10
11
|
import { requestCliUserConsentAsync, resolveConnectionInteractivelyAsync, } from './ConnectorHelpers.js';
|
|
11
12
|
/**
|
|
12
13
|
* Runs the connection → dataset → table → addConnectorTableAsync flow.
|
|
13
|
-
* Caller must have already verified the connector exists, passed
|
|
14
|
-
* supports tabular.
|
|
14
|
+
* Caller must have already verified the connector exists, passed the
|
|
15
|
+
* connector-policy preflight, and supports tabular.
|
|
15
16
|
*/
|
|
16
17
|
export async function runAddTableFlowAsync(args) {
|
|
17
18
|
const { argumentProvider, connector, apiId, connectionIdFlag, datasetFlag, tableFlag, skipCodegen, useV1Codegen, } = args;
|
|
@@ -106,28 +107,29 @@ export async function runAddTableFlowAsync(args) {
|
|
|
106
107
|
...baseContext,
|
|
107
108
|
actionsParams: { apiId, connectionId, dataset, tableName, skipCodegen, useV1Codegen },
|
|
108
109
|
};
|
|
109
|
-
await addConnectorTableAsync(context);
|
|
110
|
-
printSuccess(`
|
|
111
|
-
printInfo(`Hint: Run '
|
|
110
|
+
const dataSourceName = await addConnectorTableAsync(context);
|
|
111
|
+
printSuccess(`Data source '${dataSourceName}' added successfully (table '${tableName}' from connector '${connector.properties.displayName ?? apiId}').`);
|
|
112
|
+
printInfo(`Hint: Run '${CLI_BINARY_NAME} app dev' to test locally, or '${CLI_BINARY_NAME} app deploy' to deploy.`);
|
|
112
113
|
}
|
|
113
114
|
/**
|
|
114
115
|
* Runs the optional-connection → addConnectorActionAsync flow.
|
|
115
|
-
* Caller must have already verified the connector exists and passed
|
|
116
|
+
* Caller must have already verified the connector exists and passed the
|
|
117
|
+
* connector-policy preflight.
|
|
116
118
|
*
|
|
117
119
|
* A connection is only resolved when the connector requires one (multi-auth
|
|
118
120
|
* connectors, or connectors with `allowSharing` metadata). Pure-action
|
|
119
121
|
* connectors that don't need a connection (e.g. some utility connectors)
|
|
120
122
|
* are added without prompting for one.
|
|
121
123
|
*
|
|
122
|
-
* When `policy` is provided, the action-level
|
|
123
|
-
*
|
|
124
|
-
*
|
|
125
|
-
*
|
|
126
|
-
*
|
|
127
|
-
*
|
|
124
|
+
* When `policy` is provided, the action-level rules for this connector are
|
|
125
|
+
* passed down to `addConnectorActionAsync`, which filters blocked operations
|
|
126
|
+
* out of the swagger before saving the schema and running codegen. The CLI
|
|
127
|
+
* prints a single info line summarizing what was filtered. If every
|
|
128
|
+
* operation is blocked, the action throws `AllActionsBlockedError` which we
|
|
129
|
+
* translate to a `UsageError`.
|
|
128
130
|
*/
|
|
129
131
|
export async function runAddActionFlowAsync(args) {
|
|
130
|
-
const { argumentProvider, connector, apiId, connectionIdFlag, skipCodegen, useV1Codegen, policy, } = args;
|
|
132
|
+
const { argumentProvider, connector, apiId, connectionIdFlag, skipCodegen, useV1Codegen, policy, dataverseEnvironmentId, dataverseTable, } = args;
|
|
131
133
|
const settings = getSettings();
|
|
132
134
|
const { fileConfig, cliFs } = settings;
|
|
133
135
|
const playerServiceConfig = getPlayerServiceConfig();
|
|
@@ -149,44 +151,90 @@ export async function runAddActionFlowAsync(args) {
|
|
|
149
151
|
if (needsConnection && connectionId) {
|
|
150
152
|
await requestCliUserConsentAsync({ apiId, connectionId });
|
|
151
153
|
}
|
|
152
|
-
// ── Step 3: Compute action-level
|
|
154
|
+
// ── Step 3: Compute action-level policy (no-op when policy absent) ────────
|
|
153
155
|
const actionPolicy = policy
|
|
154
156
|
? getConnectorActionPolicy(policy, connector.name ?? apiId)
|
|
155
157
|
: undefined;
|
|
158
|
+
const isCommonDataServiceForApps = isCdsConnectorId(apiId);
|
|
159
|
+
const initialDataverseParams = await resolveInitialDataverseParamsAsync({
|
|
160
|
+
isCommonDataServiceForApps,
|
|
161
|
+
dataverseEnvironmentId,
|
|
162
|
+
dataverseTable,
|
|
163
|
+
});
|
|
156
164
|
// ── Step 4: Add the connector action ──────────────────────────────────────
|
|
157
|
-
const
|
|
165
|
+
const createContext = (dataverseParams) => ({
|
|
158
166
|
vfs: cliFs,
|
|
159
167
|
authProvider,
|
|
160
168
|
httpClient: argumentProvider.getHttpClient(),
|
|
161
169
|
region: playerServiceConfig.region,
|
|
162
170
|
environmentName: playerServiceConfig.environmentName,
|
|
163
|
-
actionsParams: {
|
|
171
|
+
actionsParams: {
|
|
172
|
+
apiId,
|
|
173
|
+
connectionId,
|
|
174
|
+
skipCodegen,
|
|
175
|
+
useV1Codegen,
|
|
176
|
+
actionPolicy,
|
|
177
|
+
...dataverseParams,
|
|
178
|
+
},
|
|
164
179
|
localFilePaths: {
|
|
165
180
|
appConfigPath: fileConfig.appConfigPath,
|
|
166
181
|
schemaPath: fileConfig.schemaPath,
|
|
167
182
|
codeGenPath: fileConfig.codeGenPath,
|
|
168
183
|
},
|
|
169
184
|
logger,
|
|
170
|
-
};
|
|
171
|
-
let
|
|
185
|
+
});
|
|
186
|
+
let actionResult;
|
|
172
187
|
try {
|
|
173
|
-
|
|
188
|
+
actionResult = await addConnectorActionAsync(createContext(initialDataverseParams));
|
|
174
189
|
}
|
|
175
190
|
catch (err) {
|
|
176
191
|
if (err instanceof AllActionsBlockedError) {
|
|
177
192
|
// Translate the actions-layer error into a CLI-level usage error so the
|
|
178
|
-
// user sees it as a clean
|
|
193
|
+
// user sees it as a clean policy-blocked message rather than a stack.
|
|
179
194
|
throw new UsageError(err.message);
|
|
180
195
|
}
|
|
181
196
|
throw err;
|
|
182
197
|
}
|
|
183
198
|
// Surface the filter result to the user (count only — blocked names go to
|
|
184
199
|
// telemetry via AddConnectorAction.DlpFiltered).
|
|
185
|
-
if (
|
|
186
|
-
printInfo(`Skipped ${
|
|
200
|
+
if (actionResult.filteredCount > 0) {
|
|
201
|
+
printInfo(`Skipped ${actionResult.filteredCount} of ${actionResult.totalCount} actions due to your organization's connector policy.`);
|
|
202
|
+
}
|
|
203
|
+
printSuccess(`Data source '${actionResult.dataSourceName}' added successfully (connector '${connector.properties.displayName ?? apiId}').`);
|
|
204
|
+
if (isCommonDataServiceForApps && settings.interactive && !initialDataverseParams) {
|
|
205
|
+
const connectTable = await promptConfirm({
|
|
206
|
+
message: 'Connect this to a specific Dataverse table?',
|
|
207
|
+
initialValue: true,
|
|
208
|
+
});
|
|
209
|
+
if (connectTable) {
|
|
210
|
+
await addConnectorActionAsync(createContext(await promptDataverseParamsAsync({})));
|
|
211
|
+
printSuccess('Dataverse table binding added successfully.');
|
|
212
|
+
}
|
|
187
213
|
}
|
|
188
|
-
|
|
189
|
-
|
|
214
|
+
printInfo(`Hint: Run '${CLI_BINARY_NAME} app dev' to test locally, or '${CLI_BINARY_NAME} app deploy' to deploy.`);
|
|
215
|
+
}
|
|
216
|
+
async function resolveInitialDataverseParamsAsync(input) {
|
|
217
|
+
if (!input.isCommonDataServiceForApps) {
|
|
218
|
+
return undefined;
|
|
219
|
+
}
|
|
220
|
+
const settings = getSettings();
|
|
221
|
+
const hasEnvironmentId = !!input.dataverseEnvironmentId;
|
|
222
|
+
const hasTable = !!input.dataverseTable;
|
|
223
|
+
if (!settings.interactive && (!hasEnvironmentId || !hasTable)) {
|
|
224
|
+
return undefined;
|
|
225
|
+
}
|
|
226
|
+
if (!hasEnvironmentId && !hasTable) {
|
|
227
|
+
return undefined;
|
|
228
|
+
}
|
|
229
|
+
return promptDataverseParamsAsync({
|
|
230
|
+
dataverseEnvironmentId: input.dataverseEnvironmentId,
|
|
231
|
+
dataverseTable: input.dataverseTable,
|
|
232
|
+
});
|
|
233
|
+
}
|
|
234
|
+
async function promptDataverseParamsAsync(input) {
|
|
235
|
+
const dataverseEnvironmentId = input.dataverseEnvironmentId ?? (await promptText({ message: 'Dataverse environment ID:' }));
|
|
236
|
+
const dataverseTable = input.dataverseTable ?? (await promptText({ message: 'Dataverse table logical name:' }));
|
|
237
|
+
return { dataverseEnvironmentId, dataverseTable };
|
|
190
238
|
}
|
|
191
239
|
/**
|
|
192
240
|
* Shared helper to compute whether a connector supports tabular data sources.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddConnectorFlows.js","sourceRoot":"","sources":["../../src/Verbs/AddConnectorFlows.ts"],"names":[],"mappings":"AAAA;;GAEG;AAUH,OAAO,EACL,uBAAuB,EACvB,sBAAsB,EACtB,sBAAsB,EACtB,wBAAwB,EACxB,sBAAsB,EACtB,iBAAiB,EACjB,eAAe,GAChB,MAAM,iCAAiC,CAAC;AAGzC,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"AddConnectorFlows.js","sourceRoot":"","sources":["../../src/Verbs/AddConnectorFlows.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,12 +4,11 @@
|
|
|
4
4
|
import type { ArgumentProvider } from '../ArgumentProvider.js';
|
|
5
5
|
/**
|
|
6
6
|
* Adds a data source based on the provided environment variables.
|
|
7
|
-
* It supports
|
|
7
|
+
* It supports connector data sources.
|
|
8
8
|
* Expects the following environment variables:
|
|
9
|
-
* -
|
|
9
|
+
* - MS_CLI_CONNECTOR: The connector ID (e.g., shared_office365, shared_commondataserviceforapps)
|
|
10
10
|
* - MS_CLI_CONNECTION_ID?: The ID of the connection (for connector data sources)
|
|
11
|
-
* - MS_CLI_TABLE?: The table name for
|
|
12
|
-
* - MS_CLI_ENV_URL?: The environment URL for Dataverse data sources
|
|
11
|
+
* - MS_CLI_TABLE?: The table name for tabular connector data sources
|
|
13
12
|
* - MS_CLI_DATASET?: The dataset name for tabular/stored proc connector data sources
|
|
14
13
|
* - MS_CLI_SQL_STORED_PROCEDURE?: The name of the SQL stored procedure for connector data sources
|
|
15
14
|
* @param config - Local file paths configuration
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddDataSource.d.ts","sourceRoot":"","sources":["../../src/Verbs/AddDataSource.ts"],"names":[],"mappings":"AAAA;;GAEG;AAQH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAQ5D
|
|
1
|
+
{"version":3,"file":"AddDataSource.d.ts","sourceRoot":"","sources":["../../src/Verbs/AddDataSource.ts"],"names":[],"mappings":"AAAA;;GAEG;AAQH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAQ5D;;;;;;;;;;;GAWG;AACH,wBAAsB,kBAAkB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2C1F"}
|
|
@@ -10,12 +10,11 @@ import { printInfo, printSuccess } from '../Utils/ConsoleOutput.js';
|
|
|
10
10
|
import { AddDataSourceArguments, SharedArguments } from './VerbConstants.js';
|
|
11
11
|
/**
|
|
12
12
|
* Adds a data source based on the provided environment variables.
|
|
13
|
-
* It supports
|
|
13
|
+
* It supports connector data sources.
|
|
14
14
|
* Expects the following environment variables:
|
|
15
|
-
* -
|
|
15
|
+
* - MS_CLI_CONNECTOR: The connector ID (e.g., shared_office365, shared_commondataserviceforapps)
|
|
16
16
|
* - MS_CLI_CONNECTION_ID?: The ID of the connection (for connector data sources)
|
|
17
|
-
* - MS_CLI_TABLE?: The table name for
|
|
18
|
-
* - MS_CLI_ENV_URL?: The environment URL for Dataverse data sources
|
|
17
|
+
* - MS_CLI_TABLE?: The table name for tabular connector data sources
|
|
19
18
|
* - MS_CLI_DATASET?: The dataset name for tabular/stored proc connector data sources
|
|
20
19
|
* - MS_CLI_SQL_STORED_PROCEDURE?: The name of the SQL stored procedure for connector data sources
|
|
21
20
|
* @param config - Local file paths configuration
|
|
@@ -38,12 +37,11 @@ export async function addDataSourceAsync(argumentProvider) {
|
|
|
38
37
|
region: playerServiceConfig.region,
|
|
39
38
|
environmentName: playerServiceConfig.environmentName,
|
|
40
39
|
actionsParams: {
|
|
41
|
-
apiId: () => argumentProvider.getOption('
|
|
40
|
+
apiId: () => argumentProvider.getOption('connector'),
|
|
42
41
|
connectionId: () => argumentProvider.getOption('connectionId'),
|
|
43
42
|
tableName: () => argumentProvider.getOption('resourceName'),
|
|
44
43
|
dataset: () => argumentProvider.getOption('dataset'),
|
|
45
44
|
sqlStoredProcedure: () => argumentProvider.getOption('sqlStoredProcedure'),
|
|
46
|
-
envUrl: () => argumentProvider.getOption('orgUrl'),
|
|
47
45
|
solutionId: () => argumentProvider.getOption('solutionId'),
|
|
48
46
|
connectionRef: () => argumentProvider.getOption('connectionRef'),
|
|
49
47
|
skipCodeGen,
|
|
@@ -58,7 +56,7 @@ export async function addDataSourceAsync(argumentProvider) {
|
|
|
58
56
|
};
|
|
59
57
|
await addDataSourceActionsAsync(dsConfig);
|
|
60
58
|
printSuccess('Data source added successfully.');
|
|
61
|
-
printInfo(`Hint: Run '
|
|
59
|
+
printInfo(`Hint: Run '${CLI_BINARY_NAME} app dev' to test locally, or '${CLI_BINARY_NAME} app deploy' to deploy.`);
|
|
62
60
|
}
|
|
63
61
|
function createOptionSchema(argumentProvider) {
|
|
64
62
|
argumentProvider.setDescription(HelpStrings.app.add.description);
|
|
@@ -66,11 +64,11 @@ function createOptionSchema(argumentProvider) {
|
|
|
66
64
|
argumentProvider.addOptions([
|
|
67
65
|
createDefaultStringOption({
|
|
68
66
|
flags: {
|
|
69
|
-
key: SharedArguments.
|
|
67
|
+
key: SharedArguments.Connector.name,
|
|
70
68
|
},
|
|
71
|
-
env: SharedArguments.
|
|
72
|
-
message: SharedArguments.
|
|
73
|
-
description: HelpStrings.app.add.options.
|
|
69
|
+
env: SharedArguments.Connector.envVar,
|
|
70
|
+
message: SharedArguments.Connector.promptMessage,
|
|
71
|
+
description: HelpStrings.app.add.options.connector,
|
|
74
72
|
}),
|
|
75
73
|
createDefaultStringOption({
|
|
76
74
|
flags: {
|
|
@@ -119,15 +117,6 @@ function createOptionSchema(argumentProvider) {
|
|
|
119
117
|
message: SharedArguments.Dataset.promptMessage,
|
|
120
118
|
description: HelpStrings.app.add.options.dataset,
|
|
121
119
|
}),
|
|
122
|
-
createDefaultStringOption({
|
|
123
|
-
flags: {
|
|
124
|
-
key: SharedArguments.OrgUrl.name,
|
|
125
|
-
alias: SharedArguments.OrgUrl.alias,
|
|
126
|
-
},
|
|
127
|
-
env: SharedArguments.OrgUrl.envVar,
|
|
128
|
-
message: SharedArguments.OrgUrl.promptMessage,
|
|
129
|
-
description: HelpStrings.app.add.options.orgUrl,
|
|
130
|
-
}),
|
|
131
120
|
{
|
|
132
121
|
flags: {
|
|
133
122
|
key: SharedArguments.SqlStoredProcedure.name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddDataSource.js","sourceRoot":"","sources":["../../src/Verbs/AddDataSource.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EACL,kBAAkB,IAAI,yBAAyB,EAC/C,sBAAsB,GACvB,MAAM,iCAAiC,CAAC;AAGzC,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAE1E
|
|
1
|
+
{"version":3,"file":"AddDataSource.js","sourceRoot":"","sources":["../../src/Verbs/AddDataSource.ts"],"names":[],"mappings":"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"}
|
package/dist/Verbs/AddTable.js
CHANGED
|
@@ -11,17 +11,17 @@ import { AddTableArguments, SharedArguments } from './VerbConstants.js';
|
|
|
11
11
|
export async function addTableAsync(argumentProvider) {
|
|
12
12
|
createOptionSchema(argumentProvider);
|
|
13
13
|
await argumentProvider.runVerb();
|
|
14
|
-
const apiId = await argumentProvider.getOption('
|
|
14
|
+
const apiId = await argumentProvider.getOption('connector');
|
|
15
15
|
const connectionIdFlag = await argumentProvider.getOption('connectionId', true);
|
|
16
16
|
const datasetFlag = await argumentProvider.getOption('dataset', true);
|
|
17
17
|
const tableFlag = await argumentProvider.getOption('table', true);
|
|
18
18
|
const skipCodegen = !!(await argumentProvider.getOption('skipCodegen', true));
|
|
19
19
|
const useV1Codegen = !!(await argumentProvider.getOption('useV1Codegen', true));
|
|
20
|
-
// ── Preflight: connector +
|
|
20
|
+
// ── Preflight: connector + connector policy (throws on not-found or blocked) ──
|
|
21
21
|
const { connector } = await runConnectorDlpPreflightAsync(argumentProvider, apiId);
|
|
22
22
|
// ── Tabular capability check ──────────────────────────────────────────────
|
|
23
23
|
if (!isTabularConnector(connector)) {
|
|
24
|
-
throw new UsageError(`Connector '${connector.properties.displayName ?? apiId}' does not support tabular data sources. Use '${CLI_BINARY_NAME} app add
|
|
24
|
+
throw new UsageError(`Connector '${connector.properties.displayName ?? apiId}' does not support tabular data sources. Use '${CLI_BINARY_NAME} app add data-source --as action' instead.`);
|
|
25
25
|
}
|
|
26
26
|
await runAddTableFlowAsync({
|
|
27
27
|
argumentProvider,
|
|
@@ -39,10 +39,10 @@ function createOptionSchema(argumentProvider) {
|
|
|
39
39
|
argumentProvider.addExamples(HelpStrings.app.add.table.examples);
|
|
40
40
|
argumentProvider.addOptions([
|
|
41
41
|
createDefaultStringOption({
|
|
42
|
-
flags: { key: SharedArguments.
|
|
43
|
-
env: SharedArguments.
|
|
44
|
-
message: SharedArguments.
|
|
45
|
-
description: HelpStrings.app.add.table.options.
|
|
42
|
+
flags: { key: SharedArguments.Connector.name },
|
|
43
|
+
env: SharedArguments.Connector.envVar,
|
|
44
|
+
message: SharedArguments.Connector.promptMessage,
|
|
45
|
+
description: HelpStrings.app.add.table.options.connector,
|
|
46
46
|
}),
|
|
47
47
|
{
|
|
48
48
|
flags: { key: SharedArguments.ConnectionId.name, alias: SharedArguments.ConnectionId.alias },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddTable.js","sourceRoot":"","sources":["../../src/Verbs/AddTable.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAErE,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,gBAAkC;IACpE,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;IACrC,MAAM,gBAAgB,CAAC,OAAO,EAAE,CAAC;IAEjC,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,SAAS,CAAS,
|
|
1
|
+
{"version":3,"file":"AddTable.js","sourceRoot":"","sources":["../../src/Verbs/AddTable.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthStatus.d.ts","sourceRoot":"","sources":["../../src/Verbs/AuthStatus.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAK5D,wBAAsB,eAAe,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"AuthStatus.d.ts","sourceRoot":"","sources":["../../src/Verbs/AuthStatus.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAK5D,wBAAsB,eAAe,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiDvF"}
|
package/dist/Verbs/AuthStatus.js
CHANGED
|
@@ -15,7 +15,10 @@ export async function authStatusAsync(argumentProvider) {
|
|
|
15
15
|
printJsonSuccess({
|
|
16
16
|
signedIn: accounts.length > 0,
|
|
17
17
|
activeAccount: active
|
|
18
|
-
? {
|
|
18
|
+
? {
|
|
19
|
+
username: active.username,
|
|
20
|
+
homeAccountId: active.homeAccountId,
|
|
21
|
+
}
|
|
19
22
|
: null,
|
|
20
23
|
accounts: accounts.map((a) => ({
|
|
21
24
|
username: a.username,
|
|
@@ -30,14 +33,14 @@ export async function authStatusAsync(argumentProvider) {
|
|
|
30
33
|
return;
|
|
31
34
|
}
|
|
32
35
|
if (accounts.length === 1) {
|
|
33
|
-
printInfo(`Signed in as ${accounts[0].username}`);
|
|
36
|
+
printInfo(`Signed in as ${accounts[0].username} (account ID: ${accounts[0].homeAccountId})`);
|
|
34
37
|
return;
|
|
35
38
|
}
|
|
36
39
|
const hasActive = accounts.some((a) => a.isActive);
|
|
37
40
|
printTable({
|
|
38
41
|
title: 'Cached accounts',
|
|
39
|
-
columns: [{ header: 'Active' }, { header: 'Username' }],
|
|
40
|
-
rows: accounts.map((a) => [a.isActive ? '*' : '', a.username]),
|
|
42
|
+
columns: [{ header: 'Active' }, { header: 'Username' }, { header: 'Account ID' }],
|
|
43
|
+
rows: accounts.map((a) => [a.isActive ? '*' : '', a.username, a.homeAccountId]),
|
|
41
44
|
});
|
|
42
45
|
if (!hasActive) {
|
|
43
46
|
printWarning(`No active account selected. Run \`${CLI_BINARY_NAME} auth switch\` to choose one.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthStatus.js","sourceRoot":"","sources":["../../src/Verbs/AuthStatus.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE/F,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,gBAAkC;IACtE,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACrE,gBAAgB,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE/D,MAAM,gBAAgB,CAAC,OAAO,EAAE,CAAC;IAEjC,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,uBAAuB,EAAE,CAAC;IACtF,MAAM,QAAQ,GAAG,gBAAgB,CAAC,UAAU,EAAE,CAAC;IAE/C,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAChD,gBAAgB,CAAC;YACf,QAAQ,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC;YAC7B,aAAa,EAAE,MAAM;gBACnB,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"AuthStatus.js","sourceRoot":"","sources":["../../src/Verbs/AuthStatus.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE/F,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,gBAAkC;IACtE,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACrE,gBAAgB,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE/D,MAAM,gBAAgB,CAAC,OAAO,EAAE,CAAC;IAEjC,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,uBAAuB,EAAE,CAAC;IACtF,MAAM,QAAQ,GAAG,gBAAgB,CAAC,UAAU,EAAE,CAAC;IAE/C,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAChD,gBAAgB,CAAC;YACf,QAAQ,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC;YAC7B,aAAa,EAAE,MAAM;gBACnB,CAAC,CAAC;oBACE,QAAQ,EAAE,MAAM,CAAC,QAAQ;oBACzB,aAAa,EAAE,MAAM,CAAC,aAAa;iBACpC;gBACH,CAAC,CAAC,IAAI;YACR,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC7B,QAAQ,EAAE,CAAC,CAAC,QAAQ;gBACpB,aAAa,EAAE,CAAC,CAAC,aAAa;gBAC9B,QAAQ,EAAE,CAAC,CAAC,QAAQ;aACrB,CAAC,CAAC;SACJ,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,YAAY,CAAC,wBAAwB,eAAe,gCAAgC,CAAC,CAAC;QACtF,OAAO;IACT,CAAC;IAED,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,SAAS,CAAC,gBAAgB,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,iBAAiB,QAAQ,CAAC,CAAC,CAAC,CAAC,aAAa,GAAG,CAAC,CAAC;QAC7F,OAAO;IACT,CAAC;IAED,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IACnD,UAAU,CAAC;QACT,KAAK,EAAE,iBAAiB;QACxB,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;QACjF,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC;KAChF,CAAC,CAAC;IACH,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,YAAY,CACV,qCAAqC,eAAe,+BAA+B,CACpF,CAAC;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -37,7 +37,7 @@ export async function buildMaafAppAsync(argumentProvider) {
|
|
|
37
37
|
if (!commitSha) {
|
|
38
38
|
const gitDefaults = resolveGitDefaults();
|
|
39
39
|
if (!gitDefaults) {
|
|
40
|
-
throw new UsageError('Could not determine the latest commit
|
|
40
|
+
throw new UsageError('Could not determine the latest commit ID. Use --commit or -c to specify it.');
|
|
41
41
|
}
|
|
42
42
|
commitSha = gitDefaults.commitSha;
|
|
43
43
|
// CI checkouts are typically detached, so we proceed with the SHA either way
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BuildMaafApp.js","sourceRoot":"","sources":["../../src/Verbs/BuildMaafApp.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAG1E,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAClG,OAAO,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAExD,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,gBAAkC;IACxE,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;IACrC,MAAM,gBAAgB,CAAC,OAAO,EAAE,CAAC;IAEjC,MAAM,aAAa,GAAG,gBAAgB,CAAC,gBAAgB,EAAE,CAAC;IAC1D,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,UAAU,CAClB,qFAAqF;YACnF,2EAA2E,iBAAiB,IAAI;YAChG,4FAA4F;YAC5F,UAAU,iBAAiB,kCAAkC,CAChE,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,gBAAgB,EAAE,CAAC;IAC3D,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,UAAU,CAAC,0DAA0D,CAAC,CAAC;IACnF,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;IAC5D,MAAM,MAAM,GAAG,CAAC,MAAM,gBAAgB,CAAC,SAAS,CAAU,QAAQ,CAAC,CAAC,KAAK,IAAI,CAAC;IAE9E,2DAA2D;IAC3D,MAAM,cAAc,GAAG,MAAM,gBAAgB,CAAC,SAAS,CACrD,QAAQ;IACR,kBAAkB,CAAC,IAAI,CACxB,CAAC;IACF,IAAI,SAAS,GAAG,cAAc,CAAC;IAC/B,IAAI,MAA0B,CAAC;IAC/B,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,WAAW,GAAG,kBAAkB,EAAE,CAAC;QACzC,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,UAAU,CAClB,
|
|
1
|
+
{"version":3,"file":"BuildMaafApp.js","sourceRoot":"","sources":["../../src/Verbs/BuildMaafApp.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,19 +6,19 @@ import type { Region } from '@microsoft/managed-apps-common/services';
|
|
|
6
6
|
import type { ArgumentProvider } from '../ArgumentProvider.js';
|
|
7
7
|
/**
|
|
8
8
|
* Preflight step shared by `app add action` and `app add table`. Fetches the
|
|
9
|
-
* connector and effective
|
|
9
|
+
* connector and effective connector policy in parallel, then enforces the policy.
|
|
10
10
|
*
|
|
11
11
|
* Failure modes:
|
|
12
12
|
* - tenantId missing: surfaces a `DlpSkippedNoTenantId` telemetry event and a
|
|
13
13
|
* user-visible warning, then degrades to "allow all" so the verb can still
|
|
14
14
|
* proceed (the alternative — failing — would block users in auth states
|
|
15
15
|
* where tenant resolution legitimately can't happen).
|
|
16
|
-
* -
|
|
16
|
+
* - Policy fetch error: relies on `getEffectiveConnectorDataPolicyAsync`'s own
|
|
17
17
|
* `scenario.failure` telemetry; we only print a user warning and degrade
|
|
18
18
|
* to "allow all" rather than re-emitting a duplicate error event.
|
|
19
19
|
*
|
|
20
20
|
* Throws `NotFoundError` when the connector itself cannot be found, and
|
|
21
|
-
* `UsageError` when the connector is blocked by
|
|
21
|
+
* `UsageError` when the connector is blocked by the effective connector policy.
|
|
22
22
|
*/
|
|
23
23
|
export declare function runConnectorDlpPreflightAsync(argumentProvider: ArgumentProvider, apiId: string): Promise<{
|
|
24
24
|
connector: Api;
|
|
@@ -69,8 +69,9 @@ export declare function requestCliUserConsentAsync(opts: {
|
|
|
69
69
|
}): Promise<void>;
|
|
70
70
|
type ConnectionServerConfig = {
|
|
71
71
|
connectorName: string;
|
|
72
|
-
environmentId: string;
|
|
73
72
|
region: Region;
|
|
73
|
+
/** Power Platform environment ID forwarded to the player as `ms_envId`. */
|
|
74
|
+
environmentId: string;
|
|
74
75
|
};
|
|
75
76
|
type ConnectionResult = {
|
|
76
77
|
status: 'created' | 'cancelled' | 'error';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectorHelpers.d.ts","sourceRoot":"","sources":["../../src/Verbs/ConnectorHelpers.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,GAAG,EAAE,4BAA4B,EAAE,MAAM,iCAAiC,CAAC;AAUzF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AAKtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAiB5D;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,6BAA6B,CACjD,gBAAgB,EAAE,gBAAgB,EAClC,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;IACT,SAAS,EAAE,GAAG,CAAC;IACf,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,MAAM,EAAE,4BAA4B,CAAC;CACtC,CAAC,CA6CD;AAED;;;;;GAKG;AACH,wBAAsB,mCAAmC,CAAC,OAAO,EAAE;IACjE,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,GAAG,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"ConnectorHelpers.d.ts","sourceRoot":"","sources":["../../src/Verbs/ConnectorHelpers.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,GAAG,EAAE,4BAA4B,EAAE,MAAM,iCAAiC,CAAC;AAUzF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AAKtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAiB5D;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,6BAA6B,CACjD,gBAAgB,EAAE,gBAAgB,EAClC,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;IACT,SAAS,EAAE,GAAG,CAAC;IACf,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,MAAM,EAAE,4BAA4B,CAAC;CACtC,CAAC,CA6CD;AAED;;;;;GAKG;AACH,wBAAsB,mCAAmC,CAAC,OAAO,EAAE;IACjE,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,GAAG,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAgGlB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAsB,0BAA0B,CAAC,IAAI,EAAE;IACrD,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8BhB;AAMD,KAAK,sBAAsB,GAAG;IAC5B,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,2EAA2E;IAC3E,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACtB,MAAM,EAAE,SAAS,GAAG,WAAW,GAAG,OAAO,CAAC;IAC1C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,sBAAsB,GAC7B,OAAO,CAAC,gBAAgB,CAAC,CAsH3B"}
|
|
@@ -20,26 +20,26 @@ const CONNECTION_CREATION_TIMEOUT_MS = 10 * 60 * 1000; // 10 minutes
|
|
|
20
20
|
const PROTOCOL_VERSION = '1';
|
|
21
21
|
/**
|
|
22
22
|
* Preflight step shared by `app add action` and `app add table`. Fetches the
|
|
23
|
-
* connector and effective
|
|
23
|
+
* connector and effective connector policy in parallel, then enforces the policy.
|
|
24
24
|
*
|
|
25
25
|
* Failure modes:
|
|
26
26
|
* - tenantId missing: surfaces a `DlpSkippedNoTenantId` telemetry event and a
|
|
27
27
|
* user-visible warning, then degrades to "allow all" so the verb can still
|
|
28
28
|
* proceed (the alternative — failing — would block users in auth states
|
|
29
29
|
* where tenant resolution legitimately can't happen).
|
|
30
|
-
* -
|
|
30
|
+
* - Policy fetch error: relies on `getEffectiveConnectorDataPolicyAsync`'s own
|
|
31
31
|
* `scenario.failure` telemetry; we only print a user warning and degrade
|
|
32
32
|
* to "allow all" rather than re-emitting a duplicate error event.
|
|
33
33
|
*
|
|
34
34
|
* Throws `NotFoundError` when the connector itself cannot be found, and
|
|
35
|
-
* `UsageError` when the connector is blocked by
|
|
35
|
+
* `UsageError` when the connector is blocked by the effective connector policy.
|
|
36
36
|
*/
|
|
37
37
|
export async function runConnectorDlpPreflightAsync(argumentProvider, apiId) {
|
|
38
38
|
const logger = getCliLogger();
|
|
39
39
|
const tenantId = await argumentProvider.getTenantIdAsync();
|
|
40
40
|
if (!tenantId) {
|
|
41
41
|
logger.trackErrorEvent('DlpSkippedNoTenantId', { apiId });
|
|
42
|
-
printWarning(`Could not resolve tenant ID; skipping
|
|
42
|
+
printWarning(`Could not resolve tenant ID; skipping connector policy check. Sign in with '${CLI_BINARY_NAME} auth login' for full enforcement.`);
|
|
43
43
|
}
|
|
44
44
|
const [connector, policy] = await Promise.all([
|
|
45
45
|
getConnectorAsync(apiId, logger),
|
|
@@ -48,7 +48,7 @@ export async function runConnectorDlpPreflightAsync(argumentProvider, apiId) {
|
|
|
48
48
|
// GovernanceService already records `scenario.failure` internally,
|
|
49
49
|
// so we don't re-emit telemetry here — just surface the warning
|
|
50
50
|
// and degrade to allow-all.
|
|
51
|
-
printWarning('Could not verify
|
|
51
|
+
printWarning('Could not verify connector policy; proceeding without enforcement.');
|
|
52
52
|
return ALLOW_ALL_POLICY;
|
|
53
53
|
})
|
|
54
54
|
: Promise.resolve(ALLOW_ALL_POLICY),
|
|
@@ -61,7 +61,7 @@ export async function runConnectorDlpPreflightAsync(argumentProvider, apiId) {
|
|
|
61
61
|
const blockedSet = new Set((policy.blockedConnectors ?? []).map((e) => e.connectorId.toLowerCase()));
|
|
62
62
|
const isBlocked = policy.defaultBehavior === 'Block' ? !allowedMap.has(shortName) : blockedSet.has(shortName);
|
|
63
63
|
if (isBlocked) {
|
|
64
|
-
throw new UsageError(`Connector '${connector.properties.displayName ?? apiId}' is blocked by your organization's
|
|
64
|
+
throw new UsageError(`Connector '${connector.properties.displayName ?? apiId}' is blocked by your organization's connector policy.`);
|
|
65
65
|
}
|
|
66
66
|
return { connector, tenantId, policy };
|
|
67
67
|
}
|
|
@@ -131,10 +131,14 @@ export async function resolveConnectionInteractivelyAsync(options) {
|
|
|
131
131
|
}
|
|
132
132
|
// Browser-based fallback: open the maaf-player connection dialog
|
|
133
133
|
const connectorName = apiId.startsWith('shared_') ? apiId : `shared_${apiId}`;
|
|
134
|
+
const environmentId = argumentProvider.getEnvironmentId();
|
|
135
|
+
if (!environmentId) {
|
|
136
|
+
throw new UsageError('Missing required information. Make sure you are running this command in a Managed Apps directory.');
|
|
137
|
+
}
|
|
134
138
|
const result = await startConnectionServerAsync({
|
|
135
139
|
connectorName,
|
|
136
|
-
environmentId: playerServiceConfig.environmentName,
|
|
137
140
|
region: playerServiceConfig.region,
|
|
141
|
+
environmentId,
|
|
138
142
|
});
|
|
139
143
|
if (result.status === 'created' && result.connectionName) {
|
|
140
144
|
printSuccess('Connection created successfully!');
|
|
@@ -213,7 +217,7 @@ export async function requestCliUserConsentAsync(opts) {
|
|
|
213
217
|
* drift detection, and a timeout for cleanup.
|
|
214
218
|
*/
|
|
215
219
|
export async function startConnectionServerAsync(config) {
|
|
216
|
-
const { connectorName,
|
|
220
|
+
const { connectorName, region, environmentId } = config;
|
|
217
221
|
const nonce = crypto.randomUUID();
|
|
218
222
|
return new Promise((resolve, reject) => {
|
|
219
223
|
const server = http.createServer((req, res) => {
|
|
@@ -277,11 +281,12 @@ export async function startConnectionServerAsync(config) {
|
|
|
277
281
|
const address = server.address();
|
|
278
282
|
const port = typeof address === 'object' && address ? address.port : 0;
|
|
279
283
|
const callbackUrl = `http://localhost:${port}/callback`;
|
|
280
|
-
const playerUrl = createMaafConnectionUrl(region,
|
|
284
|
+
const playerUrl = createMaafConnectionUrl(region, {
|
|
281
285
|
connector: connectorName,
|
|
282
286
|
callbackUrl,
|
|
283
287
|
nonce,
|
|
284
288
|
protocolVersion: PROTOCOL_VERSION,
|
|
289
|
+
environmentId,
|
|
285
290
|
});
|
|
286
291
|
printInfo(`Opening browser at ${playerUrl}`);
|
|
287
292
|
try {
|