From 64d9884b69256c77887d50c8e256f625234be916 Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Mon, 29 Nov 2021 18:39:42 -0300 Subject: [PATCH] fix(azuredeployer.gblib): Fix MSFT changes. --- packages/admin.gbapp/services/GBAdminService.ts | 2 +- .../services/AzureDeployerService.ts | 4 +--- packages/core.gbapp/services/GBDeployer.ts | 12 +----------- packages/core.gbapp/services/GBMinService.ts | 10 ++++++++++ packages/kb.gbapp/services/KBService.ts | 2 +- src/app.ts | 3 +++ 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/packages/admin.gbapp/services/GBAdminService.ts b/packages/admin.gbapp/services/GBAdminService.ts index abf85eca..6805e300 100644 --- a/packages/admin.gbapp/services/GBAdminService.ts +++ b/packages/admin.gbapp/services/GBAdminService.ts @@ -113,7 +113,7 @@ export class GBAdminService implements IGBAdminService { maximumLength: 14 }; let password = passwordGenerator.generatePassword(options); - password = password.replace(/[\@\[\=\:\;\?\"\'\#]/gi, '1'); + password = password.replace(/[\@\[\=\:\;\?\"\'\#]/gi, '*'); return password; } diff --git a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts index efd89f2f..e63137fe 100644 --- a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts +++ b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts @@ -429,8 +429,6 @@ export class AzureDeployerService implements IGBInstallationDeployer { const nlpa = await this.createNLPAuthoring(name, `${name}-nlpa`, instance.cloudLocation); instance.nlpEndpoint = nlp.endpoint; - - GBLog.info(`Waiting for Cognitive objects stack...`); const sleep = ms => { return new Promise(resolve => { setTimeout(resolve, ms); @@ -449,7 +447,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { ); - GBLog.info(`Waiting to finishing NLP service and keys creation...`); + GBLog.info(`Waiting one minute to finishing NLP service and keys creation...`); await sleep(60000); keys = await this.cognitiveClient.accounts.listKeys(name, textAnalytics.name); instance.textAnalyticsKey = keys.key1; diff --git a/packages/core.gbapp/services/GBDeployer.ts b/packages/core.gbapp/services/GBDeployer.ts index 24895667..2e3bbee1 100644 --- a/packages/core.gbapp/services/GBDeployer.ts +++ b/packages/core.gbapp/services/GBDeployer.ts @@ -198,16 +198,6 @@ export class GBDeployer implements IGBDeployer { await this.deployAppPackages(list, core, appPackages); GBLog.info(`App Package deployment done.`); - - // Then all remaining general packages are loaded. - - const instances = await core.loadInstances(); - await CollectionUtil.asyncForEach(instances, async instance => { - this.mountGBKBAssets(`${instance.botId}.gbkb`, - instance.botId, `${instance.botId}.gbkb`); - }); - - GBLog.info(`Package deployment done.`); } /** @@ -821,7 +811,7 @@ export class GBDeployer implements IGBDeployer { /** * Servers bot storage assets to be used by web, WhatsApp and other channels. */ - public mountGBKBAssets(packageName: any, botId: string, filename: string) { + public static mountGBKBAssets(packageName: any, botId: string, filename: string) { // Servers menu assets. diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts index 8517785b..68ddb47b 100644 --- a/packages/core.gbapp/services/GBMinService.ts +++ b/packages/core.gbapp/services/GBMinService.ts @@ -165,6 +165,16 @@ export class GBMinService { } }); + // Then all remaining general packages are loaded. + + await CollectionUtil.asyncForEach(instances, async instance => { + GBDeployer.mountGBKBAssets(`${instance.botId}.gbkb`, + instance.botId, `${instance.botId}.gbkb`); + }); + + GBLog.info(`Package deployment done.`); + + } diff --git a/packages/kb.gbapp/services/KBService.ts b/packages/kb.gbapp/services/KBService.ts index 0c77c26a..f9465fe2 100644 --- a/packages/kb.gbapp/services/KBService.ts +++ b/packages/kb.gbapp/services/KBService.ts @@ -710,7 +710,7 @@ export class KBService implements IGBKBService { GBLog.info(`[GBDeployer] Importing: ${localPath}`); const p = await deployer.deployPackageToStorage(instance.instanceId, packageName); await this.importKbPackage(min, localPath, p, instance); - deployer.mountGBKBAssets(packageName, min.botId, localPath); + GBDeployer.mountGBKBAssets(packageName, min.botId, localPath); await deployer.rebuildIndex(instance, new AzureDeployerService(deployer).getKBSearchSchema(instance.searchIndex)); GBLog.info(`[GBDeployer] Finished import of ${localPath}`); diff --git a/src/app.ts b/src/app.ts index 8e114e34..05d312f3 100644 --- a/src/app.ts +++ b/src/app.ts @@ -155,6 +155,7 @@ export class GBServer { await deployer.deployPackages(core, server, GBServer.globals.appPackages); await core.syncDatabaseStructure(); + GBLog.info(`Publishing instances...`); const instances: IGBInstance[] = await core.loadAllInstances( core, @@ -173,6 +174,8 @@ export class GBServer { await deployer.deployBotFull(instance, GBServer.globals.publicAddress); instances.push(instance); + // Runs the search even with empty content to create structure. + await azureDeployer['runSearch'](instance); }