use new endpoint convention

aliyun · Oct 12, 2017 · 7c91963 · 7c91963
1 parent bc7b4ac
commit 7c91963
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/es5/client.js b/es5/client.js
@@ -101,8 +101,8 @@ var Client = function () {
 
     var internal = config.internal ? '-internal' : '';
 
-    this.endpoint = `${protocol}://${accountid}.fc.${region}${internal}.aliyuncs.com`;
-    this.host = `${accountid}.fc.${region}${internal}.aliyuncs.com`;
+    this.endpoint = `${protocol}://${accountid}.${region}${internal}.fc.aliyuncs.com`;
+    this.host = `${accountid}.${region}${internal}.fc.aliyuncs.com`;
     this.version = '2016-08-15';
     this.timeout = Number.isFinite(config.timeout) ? config.timeout : 10000; // default is 10s
   }

diff --git a/lib/client.js b/lib/client.js
@@ -89,8 +89,8 @@ class Client {
 
     const internal = config.internal ? '-internal': '';
 
-    this.endpoint = `${protocol}://${accountid}.fc.${region}${internal}.aliyuncs.com`;
-    this.host = `${accountid}.fc.${region}${internal}.aliyuncs.com`;
+    this.endpoint = `${protocol}://${accountid}.${region}${internal}.fc.aliyuncs.com`;
+    this.host = `${accountid}.${region}${internal}.fc.aliyuncs.com`;
     this.version = '2016-08-15';
     this.timeout = Number.isFinite(config.timeout) ? config.timeout : 10000; // default is 10s
   }

diff --git a/test/client.test.js b/test/client.test.js
@@ -55,23 +55,23 @@ describe('client test', function () {
       accessKeySecret: 'accessKeySecret',
       region: 'cn-shanghai'
     });
-    expect(client.endpoint).to.be('http://accountid.fc.cn-shanghai.aliyuncs.com');
+    expect(client.endpoint).to.be('http://accountid.cn-shanghai.fc.aliyuncs.com');
 
     client = new FunctionComputeClient('accountid', {
       accessKeyID: 'STS.accessKeyID',
       accessKeySecret: 'accessKeySecret',
       region: 'cn-shanghai',
       securityToken: 'securityToken',
     });
-    expect(client.endpoint).to.be('http://accountid.fc.cn-shanghai.aliyuncs.com');
+    expect(client.endpoint).to.be('http://accountid.cn-shanghai.fc.aliyuncs.com');
 
     client = new FunctionComputeClient('accountid', {
       accessKeyID: 'accessKeyID',
       accessKeySecret: 'accessKeySecret',
       region: 'cn-shanghai',
       secure: true
     });
-    expect(client.endpoint).to.be('https://accountid.fc.cn-shanghai.aliyuncs.com');
+    expect(client.endpoint).to.be('https://accountid.cn-shanghai.fc.aliyuncs.com');
 
     client = new FunctionComputeClient('accountid', {
       accessKeyID: 'accessKeyID',
@@ -80,7 +80,7 @@ describe('client test', function () {
       secure: true,
       internal: true
     });
-    expect(client.endpoint).to.be('https://accountid.fc.cn-shanghai-internal.aliyuncs.com');
+    expect(client.endpoint).to.be('https://accountid.cn-shanghai-internal.fc.aliyuncs.com');
 
     client = new FunctionComputeClient('accountid', {
       accessKeyID: 'accessKeyID',