From b3c82e1e453265bc365a5cb04e070516b77cc480 Mon Sep 17 00:00:00 2001 From: sdk-team Date: Fri, 2 Jul 2021 07:43:22 +0000 Subject: [PATCH] Fix DescribeInstance EncryptionType. --- CHANGELOG | 3 + VERSION | 2 +- hbase/CMakeLists.txt | 4 -- .../include/alibabacloud/hbase/HBaseClient.h | 8 --- .../hbase/model/DescribeInstanceResult.h | 4 +- .../model/DescribeMultiZoneClusterResult.h | 4 +- .../DescribeUserEncryptionKeyListRequest.h | 54 ---------------- .../DescribeUserEncryptionKeyListResult.h | 55 ---------------- hbase/src/HBaseClient.cc | 36 ----------- hbase/src/model/DescribeInstanceResult.cc | 4 +- .../model/DescribeMultiZoneClusterResult.cc | 4 +- .../DescribeUserEncryptionKeyListRequest.cc | 62 ------------------- .../DescribeUserEncryptionKeyListResult.cc | 57 ----------------- 13 files changed, 12 insertions(+), 285 deletions(-) delete mode 100644 hbase/include/alibabacloud/hbase/model/DescribeUserEncryptionKeyListRequest.h delete mode 100644 hbase/include/alibabacloud/hbase/model/DescribeUserEncryptionKeyListResult.h delete mode 100644 hbase/src/model/DescribeUserEncryptionKeyListRequest.cc delete mode 100644 hbase/src/model/DescribeUserEncryptionKeyListResult.cc diff --git a/CHANGELOG b/CHANGELOG index 9048fcad5..72c6777c6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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. diff --git a/VERSION b/VERSION index 7e2d9c78b..50e0a73ec 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.805 \ No newline at end of file +1.36.806 \ No newline at end of file diff --git a/hbase/CMakeLists.txt b/hbase/CMakeLists.txt index 4bc266865..0bb2b0df1 100644 --- a/hbase/CMakeLists.txt +++ b/hbase/CMakeLists.txt @@ -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 diff --git a/hbase/include/alibabacloud/hbase/HBaseClient.h b/hbase/include/alibabacloud/hbase/HBaseClient.h index 0f20d9a8c..2291abd5d 100644 --- a/hbase/include/alibabacloud/hbase/HBaseClient.h +++ b/hbase/include/alibabacloud/hbase/HBaseClient.h @@ -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 DescribeSubDomainOutcome; typedef std::future DescribeSubDomainOutcomeCallable; typedef std::function&)> DescribeSubDomainAsyncHandler; - typedef Outcome DescribeUserEncryptionKeyListOutcome; - typedef std::future DescribeUserEncryptionKeyListOutcomeCallable; - typedef std::function&)> DescribeUserEncryptionKeyListAsyncHandler; typedef Outcome EnableHBaseueBackupOutcome; typedef std::future EnableHBaseueBackupOutcomeCallable; typedef std::function&)> 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& 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& 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& context = nullptr) const; EnableHBaseueBackupOutcomeCallable enableHBaseueBackupCallable(const Model::EnableHBaseueBackupRequest& request) const; diff --git a/hbase/include/alibabacloud/hbase/model/DescribeInstanceResult.h b/hbase/include/alibabacloud/hbase/model/DescribeInstanceResult.h index ccadf788d..bc33d463b 100644 --- a/hbase/include/alibabacloud/hbase/model/DescribeInstanceResult.h +++ b/hbase/include/alibabacloud/hbase/model/DescribeInstanceResult.h @@ -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_; diff --git a/hbase/include/alibabacloud/hbase/model/DescribeMultiZoneClusterResult.h b/hbase/include/alibabacloud/hbase/model/DescribeMultiZoneClusterResult.h index 17af63c9d..1e8f7f734 100644 --- a/hbase/include/alibabacloud/hbase/model/DescribeMultiZoneClusterResult.h +++ b/hbase/include/alibabacloud/hbase/model/DescribeMultiZoneClusterResult.h @@ -59,7 +59,7 @@ namespace AlibabaCloud std::vector 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 tags_; std::string engine_; std::string status_; - bool encryptionType_; + std::string encryptionType_; std::string expireTimeUTC_; int masterDiskSize_; std::string instanceId_; diff --git a/hbase/include/alibabacloud/hbase/model/DescribeUserEncryptionKeyListRequest.h b/hbase/include/alibabacloud/hbase/model/DescribeUserEncryptionKeyListRequest.h deleted file mode 100644 index ee7b38c8f..000000000 --- a/hbase/include/alibabacloud/hbase/model/DescribeUserEncryptionKeyListRequest.h +++ /dev/null @@ -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 -#include -#include -#include - -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_ \ No newline at end of file diff --git a/hbase/include/alibabacloud/hbase/model/DescribeUserEncryptionKeyListResult.h b/hbase/include/alibabacloud/hbase/model/DescribeUserEncryptionKeyListResult.h deleted file mode 100644 index 81e24a12f..000000000 --- a/hbase/include/alibabacloud/hbase/model/DescribeUserEncryptionKeyListResult.h +++ /dev/null @@ -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 -#include -#include -#include -#include - -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 getKmsKeys()const; - - protected: - void parse(const std::string &payload); - private: - std::vector kmsKeys_; - - }; - } - } -} -#endif // !ALIBABACLOUD_HBASE_MODEL_DESCRIBEUSERENCRYPTIONKEYLISTRESULT_H_ \ No newline at end of file diff --git a/hbase/src/HBaseClient.cc b/hbase/src/HBaseClient.cc index c138a9b59..21414104e 100644 --- a/hbase/src/HBaseClient.cc +++ b/hbase/src/HBaseClient.cc @@ -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& 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>( - [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(); diff --git a/hbase/src/model/DescribeInstanceResult.cc b/hbase/src/model/DescribeInstanceResult.cc index 303587852..8fb24a907 100644 --- a/hbase/src/model/DescribeInstanceResult.cc +++ b/hbase/src/model/DescribeInstanceResult.cc @@ -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_; } diff --git a/hbase/src/model/DescribeMultiZoneClusterResult.cc b/hbase/src/model/DescribeMultiZoneClusterResult.cc index 293e05187..8602890fe 100644 --- a/hbase/src/model/DescribeMultiZoneClusterResult.cc +++ b/hbase/src/model/DescribeMultiZoneClusterResult.cc @@ -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_; } diff --git a/hbase/src/model/DescribeUserEncryptionKeyListRequest.cc b/hbase/src/model/DescribeUserEncryptionKeyListRequest.cc deleted file mode 100644 index 1182c7dbb..000000000 --- a/hbase/src/model/DescribeUserEncryptionKeyListRequest.cc +++ /dev/null @@ -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 - -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); -} - diff --git a/hbase/src/model/DescribeUserEncryptionKeyListResult.cc b/hbase/src/model/DescribeUserEncryptionKeyListResult.cc deleted file mode 100644 index 33b18088f..000000000 --- a/hbase/src/model/DescribeUserEncryptionKeyListResult.cc +++ /dev/null @@ -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 -#include - -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::getKmsKeys()const -{ - return kmsKeys_; -} -