Inicio Explorar Ayuda
Registro Iniciar sesión
1585346868
/
aliyun-openapi-cpp-sdk
1
0
Fork 0
Archivos Incidencias 0 Pull Requests 0 Wiki
Explorar el Código

provide more information when error occurs

zhangzifa hace 7 años
padre
f877a9ef39
commit
33a44c856d
Se han modificado 9 ficheros con 163 adiciones y 24 borrados
Dividir vista Mostrar estadísticas de diff
  1. 7 2
      core/src/CoreClient.cc
  2. 3 1
      core/src/CurlHttpClient.cc
  3. 31 0
      test/core/commonclient_ut.cc
  4. 1 0
      test/core/coreclient_ut.cc
  5. 3 3
      test/core/curlhttpclient_ut.cc
  6. 40 15
      test/core/hmacsha1signer_ut.cc
  7. 11 1
      test/core/signer_ut.cc
  8. 65 0
      test/function_test/ecs/ecs_describeInstances_ft.cc
  9. 2 2
      test/function_test/nlp/nlp_wordsegment_ft.cc

+ 7 - 2
core/src/CoreClient.cc
Ver fichero 

@@ -67,8 +67,13 @@ HttpClient::HttpResponseOutcome CoreClient::AttemptRequest(
 
 Error CoreClient::buildCoreError(const HttpResponse &response)const {
 
   Json::Reader reader;
 
   Json::Value value;
 
-  if (!reader.parse(std::string(response.body(), response.bodySize()), value))
 
-    return Error("InvalidResponse", "");
 
+  if (!reader.parse(std::string(response.body(), response.bodySize()), value)) {
 
+    if (response.bodySize() > 0) {
 
+      return Error("InvalidResponse", response.body());
 
+    } else {
 
+      return Error("InvalidResponse", "body is empty");
 
+    }
 
+  }
 
 
   Error error;
 
   error.setErrorCode(value["Code"].asString());

+ 3 - 1
core/src/CurlHttpClient.cc
Ver fichero 

@@ -144,7 +144,9 @@ CurlHttpClient::makeRequest(const HttpRequest &request) {
 
         "A problem occurred somewhere in the SSL/TLS handshake."));
 
   default:
 
     return HttpResponseOutcome(
 
-      Error("NetworkError", "Failed to connect to host or proxy."));
 
+      Error("NetworkError",
 
+        "Failed to connect to host or proxy: " +
 
+        HttpMethodToString(request.method()) + " " + request.url().toString()));
 
   }
 
 }

+ 31 - 0
test/core/commonclient_ut.cc
Ver fichero 

@@ -56,19 +56,24 @@ namespace {
 
 
     CommonClient::CommonResponseOutcome out1 = cc1.commonResponse(cr);
 
     EXPECT_TRUE(out1.error().errorCode() == "NetworkError");
 
+    EXPECT_TRUE(out1.error().errorMessage().find("Failed to connect to host or proxy: GET ") == 0);
 
+
 
     EXPECT_TRUE(out1.result().payload() == "");
 
 
     CommonClient::CommonResponseOutcome out2 = cc2.commonResponse(cr);
 
     EXPECT_TRUE(out2.error().errorCode() == "NetworkError");
 
+    EXPECT_TRUE(out2.error().errorMessage().find("Failed to connect to host or proxy: GET ") == 0);
 
     EXPECT_TRUE(out2.result().payload() == "");
 
 
     CommonClient::CommonResponseOutcome out3 = cc3.commonResponse(cr);
 
     EXPECT_TRUE(out3.error().errorCode() == "NetworkError");
 
+    EXPECT_TRUE(out3.error().errorMessage().find("Failed to connect to host or proxy: GET ") == 0);
 
     EXPECT_TRUE(out3.result().payload() == "");
 
 
     cr.setRequestPattern(CommonRequest::RequestPattern::RoaPattern);
 
     CommonClient::CommonResponseOutcome out4 = cc4.commonResponse(cr);
 
     EXPECT_TRUE(out4.error().errorCode() == "NetworkError");
 
+    EXPECT_TRUE(out4.error().errorMessage().find("Failed to connect to host or proxy: GET ") == 0);
 
     EXPECT_TRUE(out4.result().payload() == "");
 
 
   /*
 
@@ -154,7 +159,33 @@ namespace {
 
     ShutdownSdk();
 
   }
 
 
+  TEST(CommonClient, abnormal) {
 
+    InitializeSdk();
 
 
+    ClientConfiguration configuration("cn-hangzhou");
 
+    CommonClient client("key", "secret", configuration);
 
+
 
+    CommonRequest req;
 
+    req.setScheme("http");
 
+    req.setDomain("aliyun.com");
 
+
 
+    auto out = client.commonResponse(req);
 
+    EXPECT_TRUE(out.error().errorCode() == "InvalidResponse");
 
+    EXPECT_TRUE(out.result().payload().empty());
 
+/*
 
+1: =====================<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
 
+1: <html>
 
+1: <head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
+1: <title>301 Moved Permanently</title></head>
 
+1: <body bgcolor="white">
 
+1: <h1>301 Moved Permanently</h1>
 
+1: <p>The requested resource has been assigned a new permanent URI.</p>
 
+1: <hr/>Powered by Tengine/Aserver</body>
 
+1: </html>
 
+*/
 
+    EXPECT_FALSE(out.error().errorMessage().empty());
 
+    ShutdownSdk();
 
+  }
 
 
   void cb(const CommonClient *client,
 
           const CommonRequest &req,

+ 1 - 0
test/core/coreclient_ut.cc
Ver fichero 

@@ -34,6 +34,7 @@ TEST(CoreClient, basic) {
 
   HttpResponse res;
 
   Error e1 = client.buildCoreError(res);
 
   EXPECT_TRUE(e1.errorCode() == ("InvalidResponse"));
 
+  EXPECT_TRUE(e1.errorMessage() == ("body is empty"));
 
   string body = "{\"Code\":\"any-error-code\",\"Message\":\"any-error-message\",\"HostId\":\"any-host-id\",\"RequestId\":\"any-request-id\"}";
 
   res.setBody(body.c_str(), body.size());
 
   Error e2 = client.buildCoreError(res);

+ 3 - 3
test/core/curlhttpclient_ut.cc
Ver fichero 

@@ -83,7 +83,7 @@ TEST(CurlHttpClient, netWorkError) {
 
   HttpRequest request;
 
   HttpClient::HttpResponseOutcome out = client.makeRequest(request);
 
   EXPECT_TRUE(out.error().errorCode() == "NetworkError");
 
-  EXPECT_TRUE(out.error().errorMessage() == "Failed to connect to host or proxy.");
 
+  EXPECT_TRUE(out.error().errorMessage().find("Failed to connect to host or proxy: GET ") == 0);
 
 }
 
 
 TEST(CurlHttpClient, netWorkErrorWithHttpProxy) {
 
@@ -99,7 +99,7 @@ TEST(CurlHttpClient, netWorkErrorWithHttpProxy) {
 
   HttpRequest request;
 
   HttpClient::HttpResponseOutcome out = client.makeRequest(request);
 
   EXPECT_TRUE(out.error().errorCode() == "NetworkError");
 
-  EXPECT_TRUE(out.error().errorMessage() == "Failed to connect to host or proxy.");
 
+  EXPECT_TRUE(out.error().errorMessage().find("Failed to connect to host or proxy: GET ") == 0);
 
 }
 
 
 TEST(CurlHttpClient, netWorkErrorWithSocks5Proxy) {
 
@@ -115,7 +115,7 @@ TEST(CurlHttpClient, netWorkErrorWithSocks5Proxy) {
 
   HttpRequest request;
 
   HttpClient::HttpResponseOutcome out = client.makeRequest(request);
 
   EXPECT_TRUE(out.error().errorCode() == "NetworkError");
 
-  EXPECT_TRUE(out.error().errorMessage() == "Failed to connect to host or proxy.");
 
+  EXPECT_TRUE(out.error().errorMessage().find("Failed to connect to host or proxy: GET ") == 0);
 
 }
 
 
 TEST(CurlHttpClient, mock) {

+ 40 - 15
test/core/hmacsha1signer_ut.cc
Ver fichero 

@@ -5,21 +5,46 @@
 
 using namespace std;
 
 using namespace AlibabaCloud;
 
 
+namespace {
 
+
 
 TEST(HmacSha1Signer, assign) {
 
 
-  HmacSha1Signer sig;
 
-  string sign = sig.generate("GET&%2F&AccessKeyId%3Dtestid%26Action%3DDescribeRegions"
 
-      "%26Format%3DXML%26RegionId%3Dregion1%26SignatureMethod%3DHMAC-SHA1"
 
-      "%26SignatureNonce%3DNwDAxvLU6tFE0DVb%26SignatureVersion%3D1.0"
 
-      "%26TimeStamp%3D2012-12-26T10%253A33%253A56Z%26Version%3D2013-01-10",
 
-      "testsecret&");
 
-  EXPECT_TRUE("axE3FUHgDyfm9/+Iep0HpZXrRwE=" == sign);
 
-  EXPECT_TRUE(sig.type() == HmacSha1Signer::HmacSha1);
 
-  EXPECT_TRUE(sig.name() == "HMAC-SHA1");
 
-  EXPECT_TRUE(sig.version() == "1.0");
 
-}
 
+    HmacSha1Signer sig;
 
+    string sign = sig.generate("GET&%2F&AccessKeyId%3Dtestid%26Action%3DDescribeRegions"
 
+        "%26Format%3DXML%26RegionId%3Dregion1%26SignatureMethod%3DHMAC-SHA1"
 
+        "%26SignatureNonce%3DNwDAxvLU6tFE0DVb%26SignatureVersion%3D1.0"
 
+        "%26TimeStamp%3D2012-12-26T10%253A33%253A56Z%26Version%3D2013-01-10",
 
+        "testsecret&");
 
+    EXPECT_TRUE("axE3FUHgDyfm9/+Iep0HpZXrRwE=" == sign);
 
+    EXPECT_TRUE(sig.type() == HmacSha1Signer::HmacSha1);
 
+    EXPECT_TRUE(sig.name() == "HMAC-SHA1");
 
+    EXPECT_TRUE(sig.version() == "1.0");
 
+  }
 
+
 
+  TEST(HmacSha1Signer, edge_from_empty_string) {
 
+    HmacSha1Signer sign;
 
+    EXPECT_TRUE(sign.generate("", "") == "");
 
+  }
 
+
 
+  TEST(HmacSha1Signer, unicode) {
 
+    HmacSha1Signer sig;
 
+    string sign = sig.generate("GET&%2F&AccessKeyId%3Dtestid%26Action%3DDescribeRegions"
 
+        "%26TestUnicode%3DDescribeRegions啊啊啊"
 
+        "%26Format%3DXML%26RegionId%3Dregion1%26SignatureMethod%3DHMAC-SHA1"
 
+        "%26SignatureNonce%3DNwDAxvLU6tFE0DVb%26SignatureVersion%3D1.0"
 
+        "%26TimeStamp%3D2012-12-26T10%253A33%253A56Z%26Version%3D2013-01-10",
 
+        "testsecret&");
 
+    EXPECT_TRUE("VJ1a5YBLy+shtBK/l97MCMq+mzs=" == sign);
 
+  }
 
 
-TEST(HmacSha1Signer, edge_from_empty_string) {
 
-  HmacSha1Signer sign;
 
-  EXPECT_TRUE(sign.generate("", "") == "");
 
-}
 
+  TEST(HmacSha1Signer, specialQuery) {
 
+    HmacSha1Signer sig;
 
+    string sign = sig.generate("GET&%2F&AccessKeyId%3Dtestid%26Action%3DDescribeRegions"
 
+        "%26TestUnicode%3DDescri&beRegions"
 
+        "%26Format%3DXML%26RegionId%3Dregion1%26SignatureMethod%3DHMAC-SHA1"
 
+        "%26SignatureNonce%3DNwDAxvLU6tFE0DVb%26SignatureVersion%3D1.0"
 
+        "%26TimeStamp%3D2012-12-26T10%253A33%253A56Z%26Version%3D2013-01-10",
 
+        "testsecret&");
 
+    EXPECT_TRUE("3PuleV7r01lLr4wwvWNCOuLKV5A=" == sign);
 
+  }
 
+}

+ 11 - 1
test/core/signer_ut.cc
Ver fichero 

@@ -7,7 +7,6 @@ using namespace AlibabaCloud;
 
 
 namespace {
 
   TEST(Signer, basic) {
 
-
 
     HmacSha1Signer sig;
 
     string sign = sig.generate("GET&%2F&AccessKeyId%3Dtestid%26Action%3DDescribeRegions"
 
         "%26Format%3DXML%26RegionId%3Dregion1%26SignatureMethod%3DHMAC-SHA1"
 
@@ -15,6 +14,17 @@ namespace {
 
         "%26TimeStamp%3D2012-12-26T10%253A33%253A56Z%26Version%3D2013-01-10",
 
         "testsecret&");
 
     EXPECT_TRUE("axE3FUHgDyfm9/+Iep0HpZXrRwE=" == sign);
 
+  }
 
 
+  TEST(Signer, unicode) {
 
+    HmacSha1Signer sig;
 
+    string sign = sig.generate("GET&%2F&AccessKeyId%3Dtestid%26Action%3DDescribeRegions"
 
+        "%26TestUnicode%3DDescribeRegions啊啊啊"
 
+        "%26Format%3DXML%26RegionId%3Dregion1%26SignatureMethod%3DHMAC-SHA1"
 
+        "%26SignatureNonce%3DNwDAxvLU6tFE0DVb%26SignatureVersion%3D1.0"
 
+        "%26TimeStamp%3D2012-12-26T10%253A33%253A56Z%26Version%3D2013-01-10",
 
+        "testsecret&");
 
+    cout << "aaaaaaaaaaa======================================= " << sign << endl;
 
+    EXPECT_TRUE("axE3FUHgDyfm9/+Iep0HpZXrRwE=" == sign);
 
   }
 
 }

+ 65 - 0
test/function_test/ecs/ecs_describeInstances_ft.cc
Ver fichero 

@@ -3,6 +3,11 @@
 
 #include "gtest/gtest.h"
 
 #include "alibabacloud/core/AlibabaCloud.h"
 
 #include "alibabacloud/ecs/EcsClient.h"
 
+#include "alibabacloud/core/CommonClient.h"
 
+#include "alibabacloud/core/CommonRequest.h"
 
+#include "alibabacloud/core/sts/StsClient.h"
 
+#include "alibabacloud/core/StsAssumeRoleCredentialsProvider.h"
 
+
 
 
 using namespace std;
 
 using namespace AlibabaCloud;
 
@@ -25,4 +30,64 @@ namespace {
 
     EXPECT_TRUE(outcome.result().getTotalCount() == 16);
 
     ShutdownSdk();
 
   }
 
+
 
+  TEST(ecs, describeInstancesViaCommonRequest) {
 
+    utUtils utils;
 
+    string key = utils.get_env("ENV_AccessKeyId");
 
+    string secret = utils.get_env("ENV_AccessKeySecret");
 
+    InitializeSdk();
 
+
 
+    ClientConfiguration configuration("cn-hangzhou");
 
+    CommonClient client(key, secret, configuration);
 
+    CommonRequest request(CommonRequest::RpcPattern);
 
+
 
+    request.setScheme("https");
 
+    request.setDomain("ecs.aliyuncs.com");
 
+    request.setHttpMethod(HttpRequest::Get);
 
+    request.setHeaderParameter("Content-Type", "application/json;chrset=utf-8");
 
+    request.setVersion("2014-05-26");
 
+    request.setQueryParameter("action", "DescribeInstances");
 
+
 
+    auto outcome = client.commonResponse(request);
 
+
 
+    EXPECT_TRUE(outcome.error().errorCode().empty());
 
+    EXPECT_TRUE(outcome.result().payload().find("\"TotalCount\":16") != string::npos);
 
+    ShutdownSdk();
 
+  }
 
+
 
+  TEST(ecs, describeInstancesViaCommonRequestAndStsAssumeRole) {
 
+
 
+    utUtils utils;
 
+    const string sub_user_key = utils.get_env("ENV_AccessKeyId_AssumeRole");
 
+    const string sub_user_secret = utils.get_env("ENV_AccessKeySecret_AssumeRole");
 
+    const Credentials sub_user_credentials(sub_user_key, sub_user_secret);
 
+
 
+    const string arn = "acs:ram::1940345800212929:role/testassumerole";
 
+    const string session = "roleSessionName";
 
+    const string policy = "";
 
+    int duration = 1800;
 
+
 
+    InitializeSdk();
 
+    ClientConfiguration configuration("cn-hangzhou");
 
+    StsAssumeRoleCredentialsProvider provider(sub_user_credentials, configuration, arn, session, policy, duration);
 
+    Credentials assumed_role_credentials = provider.getCredentials();
 
+    CommonClient client(assumed_role_credentials, configuration);
 
+    CommonRequest request(CommonRequest::RpcPattern);
 
+
 
+    request.setScheme("https");
 
+    request.setDomain("ecs.aliyuncs.com");
 
+    request.setHttpMethod(HttpRequest::Get);
 
+    request.setHeaderParameter("Content-Type", "application/json;chrset=utf-8");
 
+    request.setVersion("2014-05-26");
 
+    request.setQueryParameter("action", "DescribeInstances");
 
+
 
+    auto outcome = client.commonResponse(request);
 
+
 
+    EXPECT_TRUE(outcome.error().errorCode().empty());
 
+    EXPECT_TRUE(outcome.result().payload().find("\"TotalCount\":") != string::npos);
 
+    EXPECT_TRUE(outcome.result().payload().find("\"PageNumber\":") != string::npos);
 
+    EXPECT_TRUE(outcome.result().payload().find("\"PageSize\":") != string::npos);
 
+    EXPECT_TRUE(outcome.result().payload().find("\"Instances\":") != string::npos);
 
+    ShutdownSdk();
 
+  }
 
 }

+ 2 - 2
test/function_test/nlp/nlp_wordsegment_ft.cc
Ver fichero 

@@ -19,7 +19,7 @@ namespace {
 
     ClientConfiguration configuration("cn-shanghai");
 
 
     CommonClient client(key, secret, configuration);
 
-    // 创建API请求并设置参数
 
+    // create request and assign parameters
 
     CommonRequest request(CommonRequest::RoaPattern);
 
     request.setScheme("http");
 
     request.setDomain("nlp.cn-shanghai.aliyuncs.com");
 
@@ -46,7 +46,7 @@ namespace {
 
     ClientConfiguration configuration("cn-shanghai");
 
 
     CommonClient client(key, secret, configuration);
 
-    // 创建API请求并设置参数
 
+    // create request and assign parameters
 
     CommonRequest request(CommonRequest::RoaPattern);
 
     request.setScheme("http");
 
     request.setDomain("nlp.cn-shanghai.aliyuncs.com");