1585346868/aliyun-openapi-cpp-sdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add unit test case for ecsmetadata and fix other ut

Browse Source
This commit is contained in:
zhangzifa
2019-01-14 18:17:15 +08:00
committed by Jackson Tian
parent 352be1dd14
commit fc29617d7d
11 changed files with 130 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/include/alibabacloud/core/CommonClient.h
View File

@@ -35,7 +35,7 @@ namespace AlibabaCloud
typedef std::future<CommonResponseOutcome> CommonResponseOutcomeCallable;
typedef std::function<void(const CommonClient*, const CommonRequest&, const CommonResponseOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CommonResponseAsyncHandler;
typedef Outcome<Error, std::string> JsonOutcome;
CommonClient(const Credentials &credentials, const ClientConfiguration &configuration);
CommonClient(const std::shared_ptr<CredentialsProvider> &credentialsProvider, const ClientConfiguration &configuration);
CommonClient(const std::string &accessKeyId, const std::string &accessKeySecret, const ClientConfiguration &configuration);
@@ -51,7 +51,7 @@ namespace AlibabaCloud
HttpRequest buildRoaHttpRequest(const std::string & endpoint, const CommonRequest &msg, HttpRequest::Method method) const;
HttpRequest buildRpcHttpRequest(const std::string & endpoint, const CommonRequest &msg, HttpRequest::Method method) const;
JsonOutcome makeRequest(const std::string &endpoint, const CommonRequest &msg, HttpRequest::Method method = HttpRequest::Method::Get)const;
using CoreClient::asyncExecute;
private:
std::string canonicalizedQuery(const std::map <std::string, std::string> &params)const;
std::string canonicalizedHeaders(const HttpMessage::HeaderCollection &headers)const;

6
core/include/alibabacloud/core/CoreClient.h
View File

@@ -1,12 +1,12 @@
/*
* Copyright 2009-2017 Alibaba Cloud All rights reserved.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

6
core/include/alibabacloud/core/HttpMessage.h
View File

@@ -1,12 +1,12 @@
/*
* Copyright 2009-2017 Alibaba Cloud All rights reserved.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

13
core/src/EcsMetadataFetcher.cc
View File

@@ -22,13 +22,6 @@
using namespace AlibabaCloud;
namespace
{
const int DEFAULT_TIMEOUT_IN_MILLISECONDS = 5000;
const char* const METADATA_SERVICE_HOST = "100.100.100.200";
const char* const URL_IN_ECS_METADATA = "/latest/meta-data/ram/security-credentials/";
}
EcsMetadataFetcher::EcsMetadataFetcher()
{
}
@@ -47,13 +40,13 @@ void EcsMetadataFetcher::setRoleName(const std::string & roleName)
roleName_ = roleName;
}
std::string EcsMetadataFetcher::getMetadata()
std::string EcsMetadataFetcher::getMetadata(const std::string host, const std::string in_path)
{
std::stringstream path;
path << URL_IN_ECS_METADATA << roleName_;
path << in_path << roleName_;
Url credentialUrl;
credentialUrl.setHost(METADATA_SERVICE_HOST);
credentialUrl.setHost(host);
credentialUrl.setPath(path.str());
auto client = std::make_shared<CurlHttpClient>();

9
core/src/EcsMetadataFetcher.h
View File

@@ -19,6 +19,12 @@
#include <string>
namespace {
const int DEFAULT_TIMEOUT_IN_MILLISECONDS = 5000;
const char* const METADATA_SERVICE_HOST = "100.100.100.200";
const char* const URL_IN_ECS_METADATA = "/latest/meta-data/ram/security-credentials/";
}
namespace AlibabaCloud
{
class EcsMetadataFetcher
@@ -29,8 +35,7 @@ namespace AlibabaCloud
std::string roleName()const;
void setRoleName(const std::string & roleName);
std::string getMetadata();
std::string getMetadata(const std::string host = METADATA_SERVICE_HOST, const std::string path = URL_IN_ECS_METADATA);
private:
std::string roleName_;
};