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

Fix DescribeInstance EncryptionType.

Browse Source
This commit is contained in:
sdk-team
2021-07-02 07:43:22 +00:00
parent fe5bdbf24a
commit b3c82e1e45
13 changed files with 12 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@@ -1,3 +1,6 @@
2021-07-02 Version: 1.36.806
- Fix DescribeInstance EncryptionType.
2021-07-02 Version: 1.36.805
- Release RecognizeQuotaInvoice RecognizeTicketInvoice RecognizePdf.

2
VERSION
View File

@@ -1 +1 @@
1.36.805
1.36.806

4
hbase/CMakeLists.txt
View File

@@ -123,8 +123,6 @@ set(hbase_public_header_model
include/alibabacloud/hbase/model/DescribeServerlessClusterResult.h
include/alibabacloud/hbase/model/DescribeSubDomainRequest.h
include/alibabacloud/hbase/model/DescribeSubDomainResult.h
include/alibabacloud/hbase/model/DescribeUserEncryptionKeyListRequest.h
include/alibabacloud/hbase/model/DescribeUserEncryptionKeyListResult.h
include/alibabacloud/hbase/model/EnableHBaseueBackupRequest.h
include/alibabacloud/hbase/model/EnableHBaseueBackupResult.h
include/alibabacloud/hbase/model/EnableHBaseueModuleRequest.h
@@ -312,8 +310,6 @@ set(hbase_src
src/model/DescribeServerlessClusterResult.cc
src/model/DescribeSubDomainRequest.cc
src/model/DescribeSubDomainResult.cc
src/model/DescribeUserEncryptionKeyListRequest.cc
src/model/DescribeUserEncryptionKeyListResult.cc
src/model/EnableHBaseueBackupRequest.cc
src/model/EnableHBaseueBackupResult.cc
src/model/EnableHBaseueModuleRequest.cc

8
hbase/include/alibabacloud/hbase/HBaseClient.h
View File

@@ -124,8 +124,6 @@
#include "model/DescribeServerlessClusterResult.h"
#include "model/DescribeSubDomainRequest.h"
#include "model/DescribeSubDomainResult.h"
#include "model/DescribeUserEncryptionKeyListRequest.h"
#include "model/DescribeUserEncryptionKeyListResult.h"
#include "model/EnableHBaseueBackupRequest.h"
#include "model/EnableHBaseueBackupResult.h"
#include "model/EnableHBaseueModuleRequest.h"
@@ -370,9 +368,6 @@ namespace AlibabaCloud
typedef Outcome<Error, Model::DescribeSubDomainResult> DescribeSubDomainOutcome;
typedef std::future<DescribeSubDomainOutcome> DescribeSubDomainOutcomeCallable;
typedef std::function<void(const HBaseClient*, const Model::DescribeSubDomainRequest&, const DescribeSubDomainOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeSubDomainAsyncHandler;
typedef Outcome<Error, Model::DescribeUserEncryptionKeyListResult> DescribeUserEncryptionKeyListOutcome;
typedef std::future<DescribeUserEncryptionKeyListOutcome> DescribeUserEncryptionKeyListOutcomeCallable;
typedef std::function<void(const HBaseClient*, const Model::DescribeUserEncryptionKeyListRequest&, const DescribeUserEncryptionKeyListOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeUserEncryptionKeyListAsyncHandler;
typedef Outcome<Error, Model::EnableHBaseueBackupResult> EnableHBaseueBackupOutcome;
typedef std::future<EnableHBaseueBackupOutcome> EnableHBaseueBackupOutcomeCallable;
typedef std::function<void(const HBaseClient*, const Model::EnableHBaseueBackupRequest&, const EnableHBaseueBackupOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> EnableHBaseueBackupAsyncHandler;
@@ -654,9 +649,6 @@ namespace AlibabaCloud
DescribeSubDomainOutcome describeSubDomain(const Model::DescribeSubDomainRequest &request)const;
void describeSubDomainAsync(const Model::DescribeSubDomainRequest& request, const DescribeSubDomainAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
DescribeSubDomainOutcomeCallable describeSubDomainCallable(const Model::DescribeSubDomainRequest& request) const;
DescribeUserEncryptionKeyListOutcome describeUserEncryptionKeyList(const Model::DescribeUserEncryptionKeyListRequest &request)const;
void describeUserEncryptionKeyListAsync(const Model::DescribeUserEncryptionKeyListRequest& request, const DescribeUserEncryptionKeyListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
DescribeUserEncryptionKeyListOutcomeCallable describeUserEncryptionKeyListCallable(const Model::DescribeUserEncryptionKeyListRequest& request) const;
EnableHBaseueBackupOutcome enableHBaseueBackup(const Model::EnableHBaseueBackupRequest &request)const;
void enableHBaseueBackupAsync(const Model::EnableHBaseueBackupRequest& request, const EnableHBaseueBackupAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
EnableHBaseueBackupOutcomeCallable enableHBaseueBackupCallable(const Model::EnableHBaseueBackupRequest& request) const;

4
hbase/include/alibabacloud/hbase/model/DescribeInstanceResult.h
View File

@@ -64,7 +64,7 @@ namespace AlibabaCloud
std::string getCoreDiskCount()const;
std::string getParentId()const;
int getColdStorageSize()const;
bool getEncryptionType()const;
std::string getEncryptionType()const;
int getMasterDiskSize()const;
std::string getExpireTimeUTC()const;
std::string getZoneId()const;
@@ -114,7 +114,7 @@ namespace AlibabaCloud
std::string coreDiskCount_;
std::string parentId_;
int coldStorageSize_;
bool encryptionType_;
std::string encryptionType_;
int masterDiskSize_;
std::string expireTimeUTC_;
std::string zoneId_;

4
hbase/include/alibabacloud/hbase/model/DescribeMultiZoneClusterResult.h
View File

@@ -59,7 +59,7 @@ namespace AlibabaCloud
std::vector<Tag> getTags()const;
std::string getEngine()const;
std::string getStatus()const;
bool getEncryptionType()const;
std::string getEncryptionType()const;
std::string getExpireTimeUTC()const;
int getMasterDiskSize()const;
std::string getInstanceId()const;
@@ -112,7 +112,7 @@ namespace AlibabaCloud
std::vector<Tag> tags_;
std::string engine_;
std::string status_;
bool encryptionType_;
std::string encryptionType_;
std::string expireTimeUTC_;
int masterDiskSize_;
std::string instanceId_;

54
hbase/include/alibabacloud/hbase/model/DescribeUserEncryptionKeyListRequest.h
View File

@@ -1,54 +0,0 @@
/*
* 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.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef ALIBABACLOUD_HBASE_MODEL_DESCRIBEUSERENCRYPTIONKEYLISTREQUEST_H_
#define ALIBABACLOUD_HBASE_MODEL_DESCRIBEUSERENCRYPTIONKEYLISTREQUEST_H_
#include <string>
#include <vector>
#include <alibabacloud/core/RpcServiceRequest.h>
#include <alibabacloud/hbase/HBaseExport.h>
namespace AlibabaCloud
{
namespace HBase
{
namespace Model
{
class ALIBABACLOUD_HBASE_EXPORT DescribeUserEncryptionKeyListRequest : public RpcServiceRequest
{
public:
DescribeUserEncryptionKeyListRequest();
~DescribeUserEncryptionKeyListRequest();
std::string getPageNumber()const;
void setPageNumber(const std::string& pageNumber);
std::string getRegionId()const;
void setRegionId(const std::string& regionId);
std::string getPageSize()const;
void setPageSize(const std::string& pageSize);
private:
std::string pageNumber_;
std::string regionId_;
std::string pageSize_;
};
}
}
}
#endif // !ALIBABACLOUD_HBASE_MODEL_DESCRIBEUSERENCRYPTIONKEYLISTREQUEST_H_

55
hbase/include/alibabacloud/hbase/model/DescribeUserEncryptionKeyListResult.h
View File

@@ -1,55 +0,0 @@
/*
* 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.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef ALIBABACLOUD_HBASE_MODEL_DESCRIBEUSERENCRYPTIONKEYLISTRESULT_H_
#define ALIBABACLOUD_HBASE_MODEL_DESCRIBEUSERENCRYPTIONKEYLISTRESULT_H_
#include <string>
#include <vector>
#include <utility>
#include <alibabacloud/core/ServiceResult.h>
#include <alibabacloud/hbase/HBaseExport.h>
namespace AlibabaCloud
{
namespace HBase
{
namespace Model
{
class ALIBABACLOUD_HBASE_EXPORT DescribeUserEncryptionKeyListResult : public ServiceResult
{
public:
struct KmsKeysItem
{
std::string keyId;
};
DescribeUserEncryptionKeyListResult();
explicit DescribeUserEncryptionKeyListResult(const std::string &payload);
~DescribeUserEncryptionKeyListResult();
std::vector<KmsKeysItem> getKmsKeys()const;
protected:
void parse(const std::string &payload);
private:
std::vector<KmsKeysItem> kmsKeys_;
};
}
}
}
#endif // !ALIBABACLOUD_HBASE_MODEL_DESCRIBEUSERENCRYPTIONKEYLISTRESULT_H_

36
hbase/src/HBaseClient.cc
View File

@@ -1887,42 +1887,6 @@ HBaseClient::DescribeSubDomainOutcomeCallable HBaseClient::describeSubDomainCall
return task->get_future();
}
HBaseClient::DescribeUserEncryptionKeyListOutcome HBaseClient::describeUserEncryptionKeyList(const DescribeUserEncryptionKeyListRequest &request) const
{
auto endpointOutcome = endpointProvider_->getEndpoint();
if (!endpointOutcome.isSuccess())
return DescribeUserEncryptionKeyListOutcome(endpointOutcome.error());
auto outcome = makeRequest(endpointOutcome.result(), request);
if (outcome.isSuccess())
return DescribeUserEncryptionKeyListOutcome(DescribeUserEncryptionKeyListResult(outcome.result()));
else
return DescribeUserEncryptionKeyListOutcome(outcome.error());
}
void HBaseClient::describeUserEncryptionKeyListAsync(const DescribeUserEncryptionKeyListRequest& request, const DescribeUserEncryptionKeyListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
{
auto fn = [this, request, handler, context]()
{
handler(this, request, describeUserEncryptionKeyList(request), context);
};
asyncExecute(new Runnable(fn));
}
HBaseClient::DescribeUserEncryptionKeyListOutcomeCallable HBaseClient::describeUserEncryptionKeyListCallable(const DescribeUserEncryptionKeyListRequest &request) const
{
auto task = std::make_shared<std::packaged_task<DescribeUserEncryptionKeyListOutcome()>>(
[this, request]()
{
return this->describeUserEncryptionKeyList(request);
});
asyncExecute(new Runnable([task]() { (*task)(); }));
return task->get_future();
}
HBaseClient::EnableHBaseueBackupOutcome HBaseClient::enableHBaseueBackup(const EnableHBaseueBackupRequest &request) const
{
auto endpointOutcome = endpointProvider_->getEndpoint();

4
hbase/src/model/DescribeInstanceResult.cc
View File

@@ -136,7 +136,7 @@ void DescribeInstanceResult::parse(const std::string &payload)
if(!value["ResourceGroupId"].isNull())
resourceGroupId_ = value["ResourceGroupId"].asString();
if(!value["EncryptionType"].isNull())
encryptionType_ = value["EncryptionType"].asString() == "true";
encryptionType_ = value["EncryptionType"].asString();
if(!value["EncryptionKey"].isNull())
encryptionKey_ = value["EncryptionKey"].asString();
@@ -252,7 +252,7 @@ int DescribeInstanceResult::getColdStorageSize()const
return coldStorageSize_;
}
bool DescribeInstanceResult::getEncryptionType()const
std::string DescribeInstanceResult::getEncryptionType()const
{
return encryptionType_;
}

4
hbase/src/model/DescribeMultiZoneClusterResult.cc
View File

@@ -156,7 +156,7 @@ void DescribeMultiZoneClusterResult::parse(const std::string &payload)
if(!value["ResourceGroupId"].isNull())
resourceGroupId_ = value["ResourceGroupId"].asString();
if(!value["EncryptionType"].isNull())
encryptionType_ = value["EncryptionType"].asString() == "true";
encryptionType_ = value["EncryptionType"].asString();
if(!value["EncryptionKey"].isNull())
encryptionKey_ = value["EncryptionKey"].asString();
@@ -207,7 +207,7 @@ std::string DescribeMultiZoneClusterResult::getStatus()const
return status_;
}
bool DescribeMultiZoneClusterResult::getEncryptionType()const
std::string DescribeMultiZoneClusterResult::getEncryptionType()const
{
return encryptionType_;
}

62
hbase/src/model/DescribeUserEncryptionKeyListRequest.cc
View File

@@ -1,62 +0,0 @@
/*
* 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.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <alibabacloud/hbase/model/DescribeUserEncryptionKeyListRequest.h>
using AlibabaCloud::HBase::Model::DescribeUserEncryptionKeyListRequest;
DescribeUserEncryptionKeyListRequest::DescribeUserEncryptionKeyListRequest() :
RpcServiceRequest("hbase", "2019-01-01", "DescribeUserEncryptionKeyList")
{
setMethod(HttpRequest::Method::Post);
}
DescribeUserEncryptionKeyListRequest::~DescribeUserEncryptionKeyListRequest()
{}
std::string DescribeUserEncryptionKeyListRequest::getPageNumber()const
{
return pageNumber_;
}
void DescribeUserEncryptionKeyListRequest::setPageNumber(const std::string& pageNumber)
{
pageNumber_ = pageNumber;
setParameter("PageNumber", pageNumber);
}
std::string DescribeUserEncryptionKeyListRequest::getRegionId()const
{
return regionId_;
}
void DescribeUserEncryptionKeyListRequest::setRegionId(const std::string& regionId)
{
regionId_ = regionId;
setParameter("RegionId", regionId);
}
std::string DescribeUserEncryptionKeyListRequest::getPageSize()const
{
return pageSize_;
}
void DescribeUserEncryptionKeyListRequest::setPageSize(const std::string& pageSize)
{
pageSize_ = pageSize;
setParameter("PageSize", pageSize);
}

57
hbase/src/model/DescribeUserEncryptionKeyListResult.cc
View File

@@ -1,57 +0,0 @@
/*
* 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.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <alibabacloud/hbase/model/DescribeUserEncryptionKeyListResult.h>
#include <json/json.h>
using namespace AlibabaCloud::HBase;
using namespace AlibabaCloud::HBase::Model;
DescribeUserEncryptionKeyListResult::DescribeUserEncryptionKeyListResult() :
ServiceResult()
{}
DescribeUserEncryptionKeyListResult::DescribeUserEncryptionKeyListResult(const std::string &payload) :
ServiceResult()
{
parse(payload);
}
DescribeUserEncryptionKeyListResult::~DescribeUserEncryptionKeyListResult()
{}
void DescribeUserEncryptionKeyListResult::parse(const std::string &payload)
{
Json::Reader reader;
Json::Value value;
reader.parse(payload, value);
setRequestId(value["RequestId"].asString());
auto allKmsKeysNode = value["KmsKeys"]["KmsKeysItem"];
for (auto valueKmsKeysKmsKeysItem : allKmsKeysNode)
{
KmsKeysItem kmsKeysObject;
if(!valueKmsKeysKmsKeysItem["KeyId"].isNull())
kmsKeysObject.keyId = valueKmsKeysKmsKeysItem["KeyId"].asString();
kmsKeys_.push_back(kmsKeysObject);
}
}
std::vector<DescribeUserEncryptionKeyListResult::KmsKeysItem> DescribeUserEncryptionKeyListResult::getKmsKeys()const
{
return kmsKeys_;
}