[Botskills] Implement support for --gov (#2850)

* Implement Azure Government Support

* Implement AZ Government in connectSkill

* Implement AZ Government in refreshSkill

Co-authored-by: Victor Grycuk <[email protected]>

Author: 2 people

tools/botskills/src/functionality/connectSkill.ts

@@ -16,7 +16,7 @@ import {
     ISkillManifest,
     IUtteranceSource
 } from '../models';
-import { AuthenticationUtils, ChildProcessUtils, getDispatchNames, isValidCultures, wrapPathWithQuotes } from '../utils';
+import { AuthenticationUtils, ChildProcessUtils, getDispatchNames, isCloudGovernment, isValidCultures, wrapPathWithQuotes } from '../utils';
 import { RefreshSkill } from './refreshSkill';
 
 export class ConnectSkill {
@@ -211,12 +211,20 @@ Make sure you have a Dispatch for the cultures you are trying to connect, and th
         try {
             // tslint:disable-next-line:no-backbone-get-set-outside-model
             const luisApp: string = <string> executionModelByCulture.get('luisApp');
+
             // Update Dispatch file
             const dispatchAddCommandArguments: string[] = ['--type', '--name', '--filePath', '--intentName', '--dataFolder', '--dispatch'];
+
             dispatchAddCommandArguments.forEach((argument: string): void => {
                 const argumentValue: string = <string> executionModelByCulture.get(argument);
                 dispatchAddCommand.push(...[argument, argumentValue]);
             });
+
+            // Append '--gov true' if it is a government cloud
+            if (await isCloudGovernment() === true) {
+                dispatchAddCommand.push('--gov', 'true');
+            }
+
             await this.runCommand(dispatchAddCommand, `Executing dispatch add for the ${culture} ${luisApp} LU file`);
         } catch (err) {
             throw new Error(`There was an error in the dispatch add command:\nCommand: ${dispatchAddCommand.join(' ')}\n${err}`);

tools/botskills/src/functionality/refreshSkill.ts

@@ -6,7 +6,7 @@ import { existsSync, readFileSync } from 'fs';
 import { join } from 'path';
 import { ConsoleLogger, ILogger } from '../logger';
 import { ICognitiveModel, IRefreshConfiguration } from '../models';
-import { ChildProcessUtils, getDispatchNames, wrapPathWithQuotes } from '../utils';
+import { ChildProcessUtils, getDispatchNames, isCloudGovernment, wrapPathWithQuotes } from '../utils';
 
 export class RefreshSkill {
     public logger: ILogger;
@@ -44,6 +44,10 @@ export class RefreshSkill {
                 const argumentValue: string = <string> executionModelByCulture.get(argument);
                 dispatchRefreshCommand.push(...[argument, argumentValue]);
             });
+            // Append '--gov true' if it is a government cloud
+            if (await isCloudGovernment() === true) {
+                dispatchRefreshCommand.push('--gov', 'true');
+            }
             await this.runCommand(
                 dispatchRefreshCommand,
                 `Executing dispatch refresh for the ${dispatchName} file`);

tools/botskills/src/models/cloud.ts

@@ -0,0 +1,9 @@
+/**
+ * Copyright(c) Microsoft Corporation.All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+export interface ICloud {
+    isActive: boolean;
+    name: string;
+}

tools/botskills/src/models/index.ts

@@ -28,3 +28,4 @@ export {
     IUtterance,
     IUtteranceSource } from './skillManifest';
 export { IRefreshConfiguration } from './refreshConfiguration';
+export { ICloud } from './cloud';

tools/botskills/src/utils/azUtils.ts

@@ -4,6 +4,7 @@
  */
 
 import { gte } from 'semver';
+import { ICloud } from '../models/Cloud';
 import { ChildProcessUtils } from './childProcessUtils';
 
 const azPreviewMessage: string = `Command group 'bot' is in preview. It may be changed/removed in a future release.\r\n`;
@@ -36,3 +37,15 @@ export async function isValidAzVersion(): Promise<boolean> {
 
     return false;
 }
+
+/**
+ * @returns Returns TRUE if the AzureUSGovernment is active
+ */
+// tslint:disable-next-line:export-name
+export async function isCloudGovernment(): Promise<boolean> {
+    const azCloudListCommand: string[] = ['az', 'cloud', 'list'];
+    // tslint:disable-next-line: no-unsafe-any
+    const azCloudList: ICloud[] =  JSON.parse(await childProcess.tryExecute(azCloudListCommand));
+
+    return azCloudList.some((cloud: ICloud) => cloud.isActive && cloud.name === 'AzureUSGovernment');
+}

tools/botskills/src/utils/index.ts

@@ -4,7 +4,7 @@
  */
 
 export { AuthenticationUtils } from './authenticationUtils';
-export { isAzPreviewMessage, isValidAzVersion } from './azUtils';
+export { isAzPreviewMessage, isCloudGovernment, isValidAzVersion } from './azUtils';
 export { ChildProcessUtils } from './childProcessUtils';
 export { getDispatchNames } from './dispatchUtils';
 export { sanitizePath, wrapPathWithQuotes } from './sanitizationUtils';