Skip to content

Commit

Permalink
fix(general): tslint being applied in all sources.
Browse files Browse the repository at this point in the history
  • Loading branch information
rodrigorodriguez committed Mar 8, 2019
1 parent cd5189d commit 2c18517
Show file tree
Hide file tree
Showing 30 changed files with 360 additions and 458 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
"scripts": {
"clean": "shx rm -rf node_modules/ dist/ docs/reference",
"tslint": "tslint --fix ./src/*.ts ./packages/**/*.ts -t verbose",
"tslint": "tslint --fix ./src/*.ts ./packages/**/*.ts -t verbose -e ./packages/default.gbui/**/* -e ./packages/**/*.gbdialog/**/*",
"build": "npm install && npm run build-server && npm run build-gbui && npm run build-docs",
"build-server": "tsc",
"build-gbui": "cd packages/default.gbui && echo SKIP_PREFLIGHT_CHECK=true >.env && npm install && npm run build",
Expand Down
2 changes: 1 addition & 1 deletion packages/admin.gbapp/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export class GBAdminPackage implements IGBPackage {
public unloadPackage(core: IGBCoreService): void {}
public getDialogs(min: GBMinInstance) {}
public unloadBot(min: GBMinInstance): void {}
public onNewSession(min: GBMinInstance, step: any): void {}
public onNewSession(min: GBMinInstance, step: GBDialogStep): void {}

public loadPackage(core: IGBCoreService, sequelize: Sequelize): void {
core.sequelize.addModels([GuaribasAdmin]);
Expand Down
2 changes: 1 addition & 1 deletion packages/analytics.gblib/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ export class GBAnalyticsPackage implements IGBPackage {
public unloadPackage(core: IGBCoreService): void {}
public loadBot(min: GBMinInstance): void {}
public unloadBot(min: GBMinInstance): void {}
public onNewSession(min: GBMinInstance, step: any): void {}
public onNewSession(min: GBMinInstance, step: GBDialogStep): void {}
}
2 changes: 1 addition & 1 deletion packages/azuredeployer.gbapp/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,5 @@ export class GBAzureDeployerPackage implements IGBPackage {
public loadBot(min: GBMinInstance): void {}

public unloadBot(min: GBMinInstance): void {}
public onNewSession(min: GBMinInstance, step: any): void {}
public onNewSession(min: GBMinInstance, step: GBDialogStep): void {}
}
22 changes: 11 additions & 11 deletions packages/azuredeployer.gbapp/services/AzureDeployerService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ import { GBConfigService } from '../../../packages/core.gbapp/services/GBConfigS
import { GBDeployer } from '../../../packages/core.gbapp/services/GBDeployer';

const Spinner = require('cli-spinner').Spinner;
const logger = require('../../../src/logger');

const UrlJoin = require('url-join');
const iconUrl = 'https://github.com/pragmatismo-io/BotServer/blob/master/docs/images/generalbots-logo-squared.png';
const publicIp = require('public-ip');
Expand Down Expand Up @@ -221,7 +221,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
if (!(res.bodyAsJson as any).id) {
throw res.bodyAsText;
}
logger.info(`Bot proxy updated at: ${endpoint}.`);
GBLog.info(`Bot proxy updated at: ${endpoint}.`);
}

public async openStorageFirewall(groupName, serverName) {
Expand Down Expand Up @@ -258,14 +258,14 @@ export class AzureDeployerService implements IGBInstallationDeployer {
let keys: any;
const name = instance.botId;

logger.info(`Deploying Deploy Group (It may take a few minutes)...`);
GBLog.info(`Deploying Deploy Group (It may take a few minutes)...`);
await this.createDeployGroup(name, instance.cloudLocation);

logger.info(`Deploying Bot Server...`);
GBLog.info(`Deploying Bot Server...`);
const serverFarm = await this.createHostingPlan(name, `${name}-server-plan`, instance.cloudLocation);
await this.createServer(serverFarm.id, name, `${name}-server`, instance.cloudLocation);

logger.info(`Deploying Bot Storage...`);
GBLog.info(`Deploying Bot Storage...`);
const administratorLogin = `sa${GBAdminService.getRndReadableIdentifier()}`;
const administratorPassword = GBAdminService.getRndPassword();
const storageServer = `${name.toLowerCase()}-storage-server`;
Expand All @@ -285,7 +285,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
instance.storageDialect = 'mssql';
instance.storageServer = storageServer;

logger.info(`Deploying Search...`);
GBLog.info(`Deploying Search...`);
const searchName = `${name}-search`.toLowerCase();
await this.createSearch(name, searchName, instance.cloudLocation);
const searchKeys = await this.searchClient.adminKeys.get(name, searchName);
Expand All @@ -295,27 +295,27 @@ export class AzureDeployerService implements IGBInstallationDeployer {
instance.searchKey = searchKeys.primaryKey;
this.deployer.rebuildIndex(instance, this.deployer);

logger.info(`Deploying Speech...`);
GBLog.info(`Deploying Speech...`);
const speech = await this.createSpeech(name, `${name}-speech`, instance.cloudLocation);
keys = await this.cognitiveClient.accounts.listKeys(name, speech.name);
instance.speechEndpoint = speech.endpoint;
instance.speechKey = keys.key1;

logger.info(`Deploying SpellChecker...`);
GBLog.info(`Deploying SpellChecker...`);
const spellChecker = await this.createSpellChecker(name, `${name}-spellchecker`);
keys = await this.cognitiveClient.accounts.listKeys(name, spellChecker.name);
instance.spellcheckerKey = keys.key1;
instance.spellcheckerEndpoint = spellChecker.endpoint;

logger.info(`Deploying Text Analytics...`);
GBLog.info(`Deploying Text Analytics...`);
const textAnalytics = await this.createTextAnalytics(name, `${name}-textanalytics`, instance.cloudLocation);
keys = await this.cognitiveClient.accounts.listKeys(name, textAnalytics.name);
instance.textAnalyticsEndpoint = textAnalytics.endpoint;
instance.textAnalyticsKey = keys.key1;

// TODO: Check quotes being added when NLP field is filled.

logger.info(`Deploying NLP...`);
GBLog.info(`Deploying NLP...`);
const nlp = await this.createNLP(name, `${name}-nlp`, instance.cloudLocation);
keys = await this.cognitiveClient.accounts.listKeys(name, nlp.name);
const nlpAppId = await this.createNLPService(name, name, instance.cloudLocation, culture, instance.nlpAuthoringKey);
Expand All @@ -324,7 +324,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
instance.nlpKey = keys.key1;
instance.nlpAppId = nlpAppId;

logger.info(`Deploying Bot...`);
GBLog.info(`Deploying Bot...`);
instance.botEndpoint = this.defaultEndPoint;

instance = await this.internalDeployBot(
Expand Down
2 changes: 1 addition & 1 deletion packages/console.gblib/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,5 @@ export class GBConsolePackage implements IGBPackage {

public unloadBot(min: GBMinInstance): void {}

public onNewSession(min: GBMinInstance, step: any): void {}
public onNewSession(min: GBMinInstance, step: GBDialogStep): void {}
}
Loading

0 comments on commit 2c18517

Please sign in to comment.