Merge branch 'master' into emilio/luis

munozemilio · munozemilio · commit 878d880d24fd · 2019-10-09T13:29:19.000-07:00
diff --git a/packages/qnamaker/src/commands/qnamaker/create/kb.ts b/packages/qnamaker/src/commands/qnamaker/create/kb.ts
@@ -16,29 +16,33 @@ export default class QnamakerCreateKb extends Command {
   static description = 'Creates a new knowledgebase'
 
   static flags: flags.Input<any> = {
-    in: flags.string({description: 'The CreateKbDTO object to send in the body of the request.', required: true}),
+    in: flags.string({description: 'File path to the CreateKbDTO object to send in the body of the request.'}),
     name: flags.string({description: 'Name of the kb you want to create. This will override the name of KB that might be present in the CreateKb DTO'}),
     save: flags.boolean({description: 'Save the kbId in config.'}),
+    quiet: flags.boolean({description: 'Save the kbId in config.'}),
     subscriptionKey: flags.string({description: 'Specifies the qnamaker Ocp-Apim-Subscription Key (found in Keys under Resource Management section for your Qna Maker cognitive service). Overrides the subscriptionkey value present in config'}),
     help: flags.help({char: 'h', description: 'qnamaker:create:kb command help'}),
   }
 
   async run() {
     const {flags} = this.parse(QnamakerCreateKb)
+    const stdin = await this.readStdin()
+    if (!stdin && !flags.in) {
+      throw new CLIError('No input. Please set file path with --in or pipe required data to the command')
+    }
 
-    let input: Inputs = await processInputs(flags, createKbJSON, this.config.configDir)
+    let input: Inputs = await processInputs(flags, createKbJSON, this.config.configDir, stdin)
 
     if (flags.name) {
       input.requestBody.name = flags.name
     }
 
-    if (!input.requestBody.name) {
-      if (!(flags.q || flags.quiet)) {
-        let answer = readlineSync.question('What would you like to name your new knowledgebase?')
-        if (answer && answer.length > 0) {
-          input.requestBody.name = answer.trim()
-        }
+    if (!input.requestBody.name && flags.quiet) {
+      let answer = readlineSync.question('What would you like to name your new knowledgebase?')
+      if (answer && answer.length > 0) {
+        input.requestBody.name = answer.trim()
       }
+
     }
     // hack to map incorrect export property from expected import.  Export uses qnaDocuments, create/update/replace qnaList :(
     if (input.requestBody.qnaDocuments && !input.requestBody.qnaList) {
diff --git a/packages/qnamaker/src/commands/qnamaker/replace/alterations.ts b/packages/qnamaker/src/commands/qnamaker/replace/alterations.ts
@@ -7,14 +7,20 @@ export default class QnamakerReplaceAlterations extends Command {
   static description = 'Replaces word alterations (synonyms) for the KB with the give records.'
 
   static flags: flags.Input<any> = {
-    in: flags.string({description: 'The WordAlterationsDTO object to send in the body of the request', required: true}),
+    in: flags.string({description: 'File path to the WordAlterationsDTO object to send in the body of the request'}),
     subscriptionKey: flags.string({description: 'Specifies the qnamaker Ocp-Apim-Subscription Key (found in Keys under Resource Management section for your Qna Maker cognitive service). Overrides the subscriptionkey value present in config'}),
     help: flags.help({char: 'h', description: 'qnamaker:replace:alterations command help'}),
   }
 
   async run() {
     const {flags} = this.parse(QnamakerReplaceAlterations)
-    let input: Inputs = await processInputs(flags, replaceAlterationsJSON, this.config.configDir)
+    const stdin = await this.readStdin()
+
+    if (!stdin && !flags.in) {
+      throw new CLIError('No input. Please set file path with --in or pipe required data to the command')
+    }
+
+    let input: Inputs = await processInputs(flags, replaceAlterationsJSON, this.config.configDir, stdin)
     // hack to map incorrect export property from expected import.  Export uses qnaDocuments, create/update/replace qnaList :(
     if (input.requestBody.qnaDocuments && !input.requestBody.qnaList) {
       input.requestBody.qnaList = input.requestBody.qnaDocuments
diff --git a/packages/qnamaker/src/commands/qnamaker/replace/kb.ts b/packages/qnamaker/src/commands/qnamaker/replace/kb.ts
@@ -8,15 +8,20 @@ export default class QnamakerReplaceKb extends Command {
   static description = 'Replace a knowledgebase contents with new contents'
 
   static flags: flags.Input<any> = {
-    in: flags.string({description: 'The ReplaceKbDTO object to send in the body of the request', required: true}),
+    in: flags.string({description: 'File path to the ReplaceKbDTO object to send in the body of the request'}),
     kbId: flags.string({description: 'Knowledgebase id.'}),
     subscriptionKey: flags.string({description: 'Specifies the qnamaker Ocp-Apim-Subscription Key (found in Keys under Resource Management section for your Qna Maker cognitive service). Overrides the subscriptionkey value present in config'}),
     help: flags.help({char: 'h', description: 'qnamaker:replace:kb command help'}),
   }
 
   async run() {
     const {flags} = this.parse(QnamakerReplaceKb)
-    let input: Inputs = await processInputs(flags, replaceKbJSON, this.config.configDir)
+    const stdin = await this.readStdin()
+    if (!stdin && !flags.in) {
+      throw new CLIError('No input. Please set file path with --in or pipe required data to the command')
+    }
+
+    let input: Inputs = await processInputs(flags, replaceKbJSON, this.config.configDir, stdin)
     // hack to map incorrect export property from expected import.  Export uses qnaDocuments, create/update/replace qnaList :(
     if (input.requestBody.qnaDocuments && !input.requestBody.qnaList) {
       input.requestBody.qnaList = input.requestBody.qnaDocuments
diff --git a/packages/qnamaker/src/commands/qnamaker/train.ts b/packages/qnamaker/src/commands/qnamaker/train.ts
@@ -7,7 +7,7 @@ export default class QnamakerTrain extends Command {
   static description = 'Train call to add suggestions to the knowledgebase.'
 
   static flags: flags.Input<any> = {
-    in: flags.string({description: 'The FeedbackRecordDTO object to send in the body of the request.', required: true}),
+    in: flags.string({description: 'File path to the FeedbackRecordDTO object to send in the body of the request.'}),
     subscriptionKey: flags.string({description: 'Specifies the qnamaker Ocp-Apim-Subscription Key (found in Keys under Resource Management section for your Qna Maker cognitive service). Overrides the subscriptionkey value present in config'}),
     hostname: flags.string({description: 'Specifies the url for your private QnA service. Overrides the value present in config.'}),
     endpointKey: flags.string({description: 'Specifies the endpoint key for your private QnA service.(from qnamaker.ai portal user settings page). Overrides the value present in config.'}),
@@ -17,7 +17,12 @@ export default class QnamakerTrain extends Command {
 
   async run() {
     const {flags} = this.parse(QnamakerTrain)
-    let input: Inputs = await processInputs(flags, trainJSON, this.config.configDir)
+    const stdin = await this.readStdin()
+
+    if (!stdin && !flags.in) {
+      throw new CLIError('No input. Please set file path with --in or pipe required data to the command')
+    }
+    let input: Inputs = await processInputs(flags, trainJSON, this.config.configDir, stdin)
     const result = await qnamaker(input.config, input.serviceManifest, flags, input.requestBody)
     if (result.error) {
       throw new CLIError(JSON.stringify(result.error, null, 4))
diff --git a/packages/qnamaker/src/commands/qnamaker/update/kb.ts b/packages/qnamaker/src/commands/qnamaker/update/kb.ts
@@ -9,7 +9,7 @@ export default class QnamakerUpdateKb extends Command {
   static description = 'Add or delete QnA Pairs and / or URLs to an existing knowledge base'
 
   static flags: flags.Input<any> = {
-    in: flags.string({description: 'The UpdateKbOperationDTO object to send in the body of the request.', required: true}),
+    in: flags.string({description: 'The file path to the UpdateKbOperationDTO object to send in the body of the request.'}),
     kbId: flags.string({description: 'Knowledgebase id.'}),
     wait: flags.boolean({description: 'Wait for the operation to complete.'}),
     subscriptionKey: flags.string({description: 'Specifies the qnamaker Ocp-Apim-Subscription Key (found in Keys under Resource Management section for your Qna Maker cognitive service). Overrides the subscriptionkey value present in config'}),
@@ -18,7 +18,11 @@ export default class QnamakerUpdateKb extends Command {
 
   async run() {
     const {flags} = this.parse(QnamakerUpdateKb)
-    let input: Inputs = await processInputs(flags, updateKbJSON, this.config.configDir)
+    const stdin = await this.readStdin()
+    if (!stdin && !flags.in) {
+      throw new CLIError('No input. Please set file path with --in or pipe required data to the command')
+    }
+    let input: Inputs = await processInputs(flags, updateKbJSON, this.config.configDir, stdin)
     // hack to map incorrect export property from expected import.  Export uses qnaDocuments, create/update/replace qnaList :(
     if (input.requestBody.qnaDocuments && !input.requestBody.qnaList) {
       input.requestBody.qnaList = input.requestBody.qnaDocuments
diff --git a/packages/qnamaker/src/utils/qnamakerbase.ts b/packages/qnamaker/src/utils/qnamakerbase.ts
@@ -1,24 +1,24 @@
 import {CLIError} from '@microsoft/bf-cli-command'
-const stdin = require('get-stdin')
+const fs = require('fs-extra')
+const path = require('path')
 const qnaconfig = require('./../../utils/qnaconfig')
 const srvMan = require('./../../utils/servicemanifest')
 const {ServiceBase} = require('./../../utils/api/serviceBase')
 
-export async function processInputs(flags: any, payload: any, configfile: string) {
+export async function processInputs(flags: any, payload: any, configfile: string, stdin = '') {
   let result: Inputs = {}
   const config = await qnaconfig.composeConfig(flags, configfile)
-  let service = {}
 
   try {
-    if (flags.stdin) {
-      let json = await stdin()
-      service = await JSON.parse(json)
-    }
-    qnaconfig.buildConfig(flags, service, config)
+    qnaconfig.buildConfig(flags, config)
     ServiceBase.config = flags
     await qnaconfig.validateConfig(flags)
     const serviceManifest = srvMan.getServiceManifest(payload)
+    flags.in = stdin ? stdin : flags.in
     result.requestBody = await srvMan.validateArguments(serviceManifest, flags)
+    if (stdin || flags.in) {
+      result.requestBody = stdin ? JSON.parse(stdin) : await getFileInput(flags.in)
+    }
     result.config = config
     result.serviceManifest = serviceManifest
   } catch (e) {
@@ -28,6 +28,12 @@ export async function processInputs(flags: any, payload: any, configfile: string
   return result
 }
 
+async function getFileInput(file: string) {
+  // Let any errors fall through to the runProgram() promise
+  let body = await fs.readJSON(path.resolve(file))
+  return body
+}
+
 export interface Inputs {
   [key: string]: any
 }
diff --git a/packages/qnamaker/test/commands/qnamaker/create/kb.test.ts b/packages/qnamaker/test/commands/qnamaker/create/kb.test.ts
@@ -118,4 +118,13 @@ describe('qnamaker:create:kb --save', () => {
     let config = await fs.readJSON(getConfigFile())
     expect(config.qnamaker.kbId).to.contain('8600c573-2acf-4466-97e8-999ad4cecbc2')
   })
+})
+
+describe('qnamaker:create:kb No input', () => {
+  test
+  .stderr()
+  .command(['qnamaker:create:kb'])
+  .it('Creates kb qnamaker:create:kb --in', ctx => {
+    expect(ctx.stderr).to.contain('No input. Please set file path with --in or pipe required data to the command')
+  })
 })
diff --git a/packages/qnamaker/test/commands/qnamaker/replace/alterations.test.ts b/packages/qnamaker/test/commands/qnamaker/replace/alterations.test.ts
@@ -23,4 +23,11 @@ describe('qnamaker:replace:alterations', () => {
     .it('runs qnamaker:replace:alterations', ctx => {
       expect(ctx.stdout).to.empty
     })
+
+    test
+    .stderr()
+    .command(['qnamaker:replace:alterations'])
+    .it('runs qnamaker:replace:alterations', ctx => {
+      expect(ctx.stderr).to.contain('No input. Please set file path with --in or pipe required data to the command')
+    })
 })
diff --git a/packages/qnamaker/test/commands/qnamaker/replace/kb.test.ts b/packages/qnamaker/test/commands/qnamaker/replace/kb.test.ts
@@ -22,4 +22,13 @@ describe('qnamaker:replace:kb', () => {
     .it('runs qnamaker:replace:kb --kbId xxxxxxxxxx --in replace.json', ctx => {
       expect(ctx.stdout).to.equal('')
     })
+
+    test
+    .stderr()
+    .command(['qnamaker:replace:kb'])
+    .it('runs qnamaker:replace:kb', ctx => {
+      expect(ctx.stderr).to.contain('No input. Please set file path with --in or pipe required data to the command')
+    })
+
+    
 })
diff --git a/packages/qnamaker/test/commands/qnamaker/train.test.ts b/packages/qnamaker/test/commands/qnamaker/train.test.ts
@@ -1,5 +1,10 @@
 import {expect, test} from '@oclif/test'
 
 describe('qnamaker:train', () => {
-
+    test
+    .stderr()
+    .command(['qnamaker:train'])
+    .it('qnamaker:train no input passed', ctx => {
+      expect(ctx.stderr).to.contain('No input. Please set file path with --in or pipe required data to the command')
+    })
 })
diff --git a/packages/qnamaker/test/commands/qnamaker/update/kb.test.ts b/packages/qnamaker/test/commands/qnamaker/update/kb.test.ts
@@ -45,4 +45,11 @@ describe('qnamaker:update:kb', () => {
     .it('Updates knowledgebase', ctx => {
       expect(ctx.stdout).to.contain('"operationId": "4f2d3e54-e53e-471c-86bf-ef94bc562267"')
     })
+
+    test
+    .stderr()
+    .command(['qnamaker:update:kb'])
+    .it('Updates knowledgebase no input', ctx => {
+      expect(ctx.stderr).to.contain('No input. Please set file path with --in or pipe required data to the command')
+    })
 })
diff --git a/packages/qnamaker/utils/qnaconfig.js b/packages/qnamaker/utils/qnaconfig.js
@@ -7,11 +7,11 @@ const Delay = require('await-delay');
 const {cli} = require('cli-ux')
 
 const config = {
-    buildConfig: function(flags, serviceIn, config) {
-        flags.kbId = (flags.kbId || serviceIn.kbId || config.kbId),
-        flags.subscriptionKey = (flags.subscriptionKey || serviceIn.subscriptionKey || config.subscriptionKey),
-        flags.endpointKey = (flags.endpointKey || serviceIn.endpointKey || config.endpointKey),
-        flags.hostname = (flags.hostname || serviceIn.hostname || config.hostname)
+    buildConfig: function(flags, config) {
+        flags.kbId = (flags.kbId || config.kbId),
+        flags.subscriptionKey = (flags.subscriptionKey || config.subscriptionKey),
+        flags.endpointKey = (flags.endpointKey || config.endpointKey),
+        flags.hostname = (flags.hostname || config.hostname)
     },
 
     composeConfig: async function (args, configfile) {
diff --git a/packages/qnamaker/utils/servicemanifest.js b/packages/qnamaker/utils/servicemanifest.js
@@ -1,5 +1,3 @@
-const fs = require('fs-extra')
-const path = require('path')
 const cc = require('camelcase');
 
 function getServiceManifest(json) {
@@ -33,18 +31,12 @@ async function validateArguments(serviceManifest, args) {
 
     if (!entityRequired && entitySpecified) {
         error.message = `The ${operation.name} operation does not accept an input`;
-
         throw error;
     }
 
-    if (entityRequired) {
-        if (entitySpecified) {
-            body = await getFileInput(args);
-        }
-        else {
-            error.message = `The ${operation.name} requires an input of type: ${operation.entityType}`;
-            throw error;
-        }
+    if (entityRequired && !entitySpecified) {
+        error.message = `The ${operation.name} requires an input of type: ${operation.entityType}`;
+        throw error;
     }
 
     if (serviceManifest.operation.params) {
@@ -61,14 +53,6 @@ async function validateArguments(serviceManifest, args) {
     return body;
 }
 
-async function getFileInput(args) {
-    if (typeof args.in !== 'string') {
-        return null;
-    }
-    // Let any errors fall through to the runProgram() promise
-    return await fs.readJSON(path.resolve(args.in))
-}
-
 module.exports = {
     getServiceManifest,
     validateArguments
