Merge 4d23cc6 into c4d835a

libraries/botframework-config/src/models/luisService.ts

@@ -48,7 +48,21 @@ export class LuisService extends ConnectedService implements ILuisService {
 
     // get endpoint for the luis service
     public getEndpoint(): string {
-        return `https://${this.region}.api.cognitive.microsoft.com`;
+        let reg  = this.region.toLowerCase(); 
+
+        // usgovvirginia is that actual azure region name, but the cognitive service team called their endpoint 'virginia' instead of 'usgovvirginia'
+        // We handle both region names as an alias for virginia.api.cognitive.microsoft.us
+        if (reg === "virginia" || reg === "usgovvirginia") 
+        { 
+            return `https://virginia.api.cognitive.microsoft.us`; 
+        } 
+        // regardless, if it starts with usgov or usdod then it is us TLD (ex: api.cognitive.microsoft.us )
+        else if (reg.startsWith("usgov") || reg.startsWith("usdod")) 
+        { 
+            return `https://${this.region}.api.cognitive.microsoft.us`; 
+        } 
+
+        return `https://${this.region}.api.cognitive.microsoft.com`;     
     }
 
     // encrypt keys in service

libraries/botframework-config/tests/service.test.js

@@ -8,6 +8,15 @@ describe("Service Tests", () => {
     it("Luis.getEndpoint() returns correct url for region", async () => {
         let luis = new bf.LuisService({ region: "westus" });
         assert.equal(luis.getEndpoint(), `https://westus.api.cognitive.microsoft.com`);
+
+        luis = new bf.LuisService({ region: "virginia" });
+        assert.equal(luis.getEndpoint(),  `https://virginia.api.cognitive.microsoft.us`);
+
+        luis = new bf.LuisService({ region: "usgovvirginia" });
+        assert.equal(luis.getEndpoint(),  `https://virginia.api.cognitive.microsoft.us`);
+
+        luis = new bf.LuisService({ region: "usgoviowa" });
+        assert.equal(luis.getEndpoint(),  `https://usgoviowa.api.cognitive.microsoft.us`);
     });
 
     it("QNAMaker corretly adds suffix", () => {