From 4080b6e4d9fc9a5f088a142aa23b9e43e75196b4 Mon Sep 17 00:00:00 2001 From: Ben Brown Date: Thu, 22 Apr 2021 10:45:35 -0500 Subject: [PATCH 1/2] Do not specify the luis endpoint key as a parameter to the runtime if no vlaue is present (#7240) (leaving this paramter blank causes issues on windows) --- extensions/localPublish/src/index.ts | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/extensions/localPublish/src/index.ts b/extensions/localPublish/src/index.ts index 3c46508dd1..8f6d673329 100644 --- a/extensions/localPublish/src/index.ts +++ b/extensions/localPublish/src/index.ts @@ -402,17 +402,15 @@ class LocalPublisher implements PublishPlugin { } config = this.getConfig(settings, skillHostEndpoint); let spawnProcess; + const args = [...commandAndArgs, '--port', port, `--urls`, `http://0.0.0.0:${port}`, ...config]; + this.composer.log('Executing command with arguments: %s %s', startCommand, args.join(' ')); try { - spawnProcess = spawn( - startCommand, - [...commandAndArgs, '--port', port, `--urls`, `http://0.0.0.0:${port}`, ...config], - { - cwd: botDir, - stdio: ['ignore', 'pipe', 'pipe'], - detached: !isWin, // detach in non-windows - shell: isWin, // run in a shell on windows so `npm start` doesn't need to be `npm.cmd start` - } - ); + spawnProcess = spawn(startCommand, args, { + cwd: botDir, + stdio: ['ignore', 'pipe', 'pipe'], + detached: !isWin, // detach in non-windows + shell: isWin, // run in a shell on windows so `npm start` doesn't need to be `npm.cmd start` + }); this.composer.log('Started process %d', spawnProcess.pid); this.setBotStatus(botId, { process: spawnProcess, @@ -455,7 +453,7 @@ class LocalPublisher implements PublishPlugin { configList.push('--MicrosoftAppPassword'); configList.push(config.MicrosoftAppPassword); } - if (config.luis) { + if (config.luis && (config.luis.endpointKey || config.luis.authoringKey)) { configList.push('--luis:endpointKey'); configList.push(config.luis.endpointKey || config.luis.authoringKey); } From 8635df9acc1373aa4cb01a421e45c64f55ef632a Mon Sep 17 00:00:00 2001 From: Ben Brown Date: Thu, 22 Apr 2021 12:02:46 -0500 Subject: [PATCH 2/2] disable telemetry calls in the provision dialog while we investigate why telemetryclient is null (#7256) Co-authored-by: Geoff Cox (Microsoft) --- .../src/components/azureProvisionDialog.tsx | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/extensions/azurePublish/src/components/azureProvisionDialog.tsx b/extensions/azurePublish/src/components/azureProvisionDialog.tsx index 6c1cc9c5ff..e789f47331 100644 --- a/extensions/azurePublish/src/components/azureProvisionDialog.tsx +++ b/extensions/azurePublish/src/components/azureProvisionDialog.tsx @@ -284,6 +284,8 @@ export const AzureProvisionDialog: React.FC = () => { } = usePublishApi(); const telemetryClient: TelemetryClient = useTelemetryClient(); + console.log('TELEMETRY CLIENT', telemetryClient); + const { setItem, getItem, clearAll } = useLocalStorage(); // set type of publish - azurePublish or azureFunctionsPublish const publishType = getType(); @@ -362,22 +364,22 @@ export const AzureProvisionDialog: React.FC = () => { setPage(page); switch (page) { case PageTypes.AddResources: - telemetryClient.track('ProvisionAddResourcesNavigate'); + // telemetryClient.track('ProvisionAddResourcesNavigate'); setTitle(DialogTitle.ADD_RESOURCES); break; case PageTypes.ChooseAction: setTitle(DialogTitle.CHOOSE_ACTION); break; case PageTypes.ConfigProvision: - telemetryClient.track('ProvisionConfigureResources'); + // telemetryClient.track('ProvisionConfigureResources'); setTitle(DialogTitle.CONFIG_RESOURCES); break; case PageTypes.EditJson: - telemetryClient.track('ProvisionEditJSON'); + // telemetryClient.track('ProvisionEditJSON'); setTitle(DialogTitle.EDIT); break; case PageTypes.ReviewResource: - telemetryClient.track('ProvisionReviewResources'); + // telemetryClient.track('ProvisionReviewResources'); setTitle(DialogTitle.REVIEW); break; } @@ -704,11 +706,11 @@ export const AzureProvisionDialog: React.FC = () => { const onSubmit = useCallback((options) => { // call back to the main Composer API to begin this process... - telemetryClient.track('ProvisionStart', { - region: options.location, - subscriptionId: options.subscription, - externalResources: options.externalResources, - }); + // telemetryClient.track('ProvisionStart', { + // region: options.location, + // subscriptionId: options.subscription, + // externalResources: options.externalResources, + // }); startProvision(options); clearAll(); @@ -981,7 +983,7 @@ export const AzureProvisionDialog: React.FC = () => { style={{ margin: '0 4px' }} text={formatMessage('Cancel')} onClick={() => { - telemetryClient.track('ProvisionCancel'); + // telemetryClient.track('ProvisionCancel'); closeDialog(); }} /> @@ -1077,7 +1079,7 @@ export const AzureProvisionDialog: React.FC = () => { text={formatMessage('Next')} onClick={() => { if (formData.creationType === 'generate') { - telemetryClient.track('ProvisionShowHandoff'); + // telemetryClient.track('ProvisionShowHandoff'); setShowHandoff(true); } else { setPageAndTitle(PageTypes.ReviewResource); @@ -1101,7 +1103,7 @@ export const AzureProvisionDialog: React.FC = () => { style={{ margin: '0 4px' }} text={formatMessage('Cancel')} onClick={() => { - telemetryClient.track('ProvisionAddResourcesCancel'); + // telemetryClient.track('ProvisionAddResourcesCancel'); closeDialog(); }} />