diff --git a/CHANGELOG b/CHANGELOG index 945cd44f5..bacb233b4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2022-01-25 Version: 1.36.1043 +- Create Lindorm Open api. + 2022-01-25 Version: 1.36.1042 - Supported new features for outbound. diff --git a/VERSION b/VERSION index c70fae864..68c14d308 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1042 \ No newline at end of file +1.36.1043 \ No newline at end of file diff --git a/hitsdb/CMakeLists.txt b/hitsdb/CMakeLists.txt index a8fd8349c..c626442cd 100644 --- a/hitsdb/CMakeLists.txt +++ b/hitsdb/CMakeLists.txt @@ -33,8 +33,6 @@ set(hitsdb_public_header_model include/alibabacloud/hitsdb/model/GetLindormInstanceEngineListResult.h include/alibabacloud/hitsdb/model/GetLindormInstanceListRequest.h include/alibabacloud/hitsdb/model/GetLindormInstanceListResult.h - include/alibabacloud/hitsdb/model/GetLindormSSLCertUrlRequest.h - include/alibabacloud/hitsdb/model/GetLindormSSLCertUrlResult.h include/alibabacloud/hitsdb/model/ReleaseLindormInstanceRequest.h include/alibabacloud/hitsdb/model/ReleaseLindormInstanceResult.h include/alibabacloud/hitsdb/model/UpdateInstanceIpWhiteListRequest.h @@ -56,8 +54,6 @@ set(hitsdb_src src/model/GetLindormInstanceEngineListResult.cc src/model/GetLindormInstanceListRequest.cc src/model/GetLindormInstanceListResult.cc - src/model/GetLindormSSLCertUrlRequest.cc - src/model/GetLindormSSLCertUrlResult.cc src/model/ReleaseLindormInstanceRequest.cc src/model/ReleaseLindormInstanceResult.cc src/model/UpdateInstanceIpWhiteListRequest.cc diff --git a/hitsdb/include/alibabacloud/hitsdb/HitsdbClient.h b/hitsdb/include/alibabacloud/hitsdb/HitsdbClient.h index 96b0dd3d9..bcf989f11 100644 --- a/hitsdb/include/alibabacloud/hitsdb/HitsdbClient.h +++ b/hitsdb/include/alibabacloud/hitsdb/HitsdbClient.h @@ -34,8 +34,6 @@ #include "model/GetLindormInstanceEngineListResult.h" #include "model/GetLindormInstanceListRequest.h" #include "model/GetLindormInstanceListResult.h" -#include "model/GetLindormSSLCertUrlRequest.h" -#include "model/GetLindormSSLCertUrlResult.h" #include "model/ReleaseLindormInstanceRequest.h" #include "model/ReleaseLindormInstanceResult.h" #include "model/UpdateInstanceIpWhiteListRequest.h" @@ -69,9 +67,6 @@ namespace AlibabaCloud typedef Outcome GetLindormInstanceListOutcome; typedef std::future GetLindormInstanceListOutcomeCallable; typedef std::function&)> GetLindormInstanceListAsyncHandler; - typedef Outcome GetLindormSSLCertUrlOutcome; - typedef std::future GetLindormSSLCertUrlOutcomeCallable; - typedef std::function&)> GetLindormSSLCertUrlAsyncHandler; typedef Outcome ReleaseLindormInstanceOutcome; typedef std::future ReleaseLindormInstanceOutcomeCallable; typedef std::function&)> ReleaseLindormInstanceAsyncHandler; @@ -104,9 +99,6 @@ namespace AlibabaCloud GetLindormInstanceListOutcome getLindormInstanceList(const Model::GetLindormInstanceListRequest &request)const; void getLindormInstanceListAsync(const Model::GetLindormInstanceListRequest& request, const GetLindormInstanceListAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; GetLindormInstanceListOutcomeCallable getLindormInstanceListCallable(const Model::GetLindormInstanceListRequest& request) const; - GetLindormSSLCertUrlOutcome getLindormSSLCertUrl(const Model::GetLindormSSLCertUrlRequest &request)const; - void getLindormSSLCertUrlAsync(const Model::GetLindormSSLCertUrlRequest& request, const GetLindormSSLCertUrlAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; - GetLindormSSLCertUrlOutcomeCallable getLindormSSLCertUrlCallable(const Model::GetLindormSSLCertUrlRequest& request) const; ReleaseLindormInstanceOutcome releaseLindormInstance(const Model::ReleaseLindormInstanceRequest &request)const; void releaseLindormInstanceAsync(const Model::ReleaseLindormInstanceRequest& request, const ReleaseLindormInstanceAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; ReleaseLindormInstanceOutcomeCallable releaseLindormInstanceCallable(const Model::ReleaseLindormInstanceRequest& request) const; diff --git a/hitsdb/include/alibabacloud/hitsdb/model/GetLindormInstanceResult.h b/hitsdb/include/alibabacloud/hitsdb/model/GetLindormInstanceResult.h index a6632dd61..8aa0c2522 100644 --- a/hitsdb/include/alibabacloud/hitsdb/model/GetLindormInstanceResult.h +++ b/hitsdb/include/alibabacloud/hitsdb/model/GetLindormInstanceResult.h @@ -73,6 +73,7 @@ namespace AlibabaCloud std::string getDeletionProtection()const; std::string getVswitchId()const; std::string getVpcId()const; + bool getEnableCdc()const; bool getEnablePhoenix()const; std::string getRegionId()const; std::string getExpireTime()const; @@ -107,6 +108,7 @@ namespace AlibabaCloud std::string deletionProtection_; std::string vswitchId_; std::string vpcId_; + bool enableCdc_; bool enablePhoenix_; std::string regionId_; std::string expireTime_; diff --git a/hitsdb/include/alibabacloud/hitsdb/model/GetLindormSSLCertUrlRequest.h b/hitsdb/include/alibabacloud/hitsdb/model/GetLindormSSLCertUrlRequest.h deleted file mode 100644 index 3b99be6f3..000000000 --- a/hitsdb/include/alibabacloud/hitsdb/model/GetLindormSSLCertUrlRequest.h +++ /dev/null @@ -1,69 +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_HITSDB_MODEL_GETLINDORMSSLCERTURLREQUEST_H_ -#define ALIBABACLOUD_HITSDB_MODEL_GETLINDORMSSLCERTURLREQUEST_H_ - -#include -#include -#include -#include - -namespace AlibabaCloud -{ - namespace Hitsdb - { - namespace Model - { - class ALIBABACLOUD_HITSDB_EXPORT GetLindormSSLCertUrlRequest : public RpcServiceRequest - { - - public: - GetLindormSSLCertUrlRequest(); - ~GetLindormSSLCertUrlRequest(); - - long getResourceOwnerId()const; - void setResourceOwnerId(long resourceOwnerId); - std::string getAccessKeyId()const; - void setAccessKeyId(const std::string& accessKeyId); - std::string getSecurityToken()const; - void setSecurityToken(const std::string& securityToken); - std::string getRegionId()const; - void setRegionId(const std::string& regionId); - std::string getResourceOwnerAccount()const; - void setResourceOwnerAccount(const std::string& resourceOwnerAccount); - std::string getOwnerAccount()const; - void setOwnerAccount(const std::string& ownerAccount); - long getOwnerId()const; - void setOwnerId(long ownerId); - std::string getInstanceId()const; - void setInstanceId(const std::string& instanceId); - - private: - long resourceOwnerId_; - std::string accessKeyId_; - std::string securityToken_; - std::string regionId_; - std::string resourceOwnerAccount_; - std::string ownerAccount_; - long ownerId_; - std::string instanceId_; - - }; - } - } -} -#endif // !ALIBABACLOUD_HITSDB_MODEL_GETLINDORMSSLCERTURLREQUEST_H_ \ No newline at end of file diff --git a/hitsdb/include/alibabacloud/hitsdb/model/GetLindormSSLCertUrlResult.h b/hitsdb/include/alibabacloud/hitsdb/model/GetLindormSSLCertUrlResult.h deleted file mode 100644 index 66a333991..000000000 --- a/hitsdb/include/alibabacloud/hitsdb/model/GetLindormSSLCertUrlResult.h +++ /dev/null @@ -1,53 +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_HITSDB_MODEL_GETLINDORMSSLCERTURLRESULT_H_ -#define ALIBABACLOUD_HITSDB_MODEL_GETLINDORMSSLCERTURLRESULT_H_ - -#include -#include -#include -#include -#include - -namespace AlibabaCloud -{ - namespace Hitsdb - { - namespace Model - { - class ALIBABACLOUD_HITSDB_EXPORT GetLindormSSLCertUrlResult : public ServiceResult - { - public: - - - GetLindormSSLCertUrlResult(); - explicit GetLindormSSLCertUrlResult(const std::string &payload); - ~GetLindormSSLCertUrlResult(); - long getCertExpiresAt()const; - std::string getCertUrl()const; - - protected: - void parse(const std::string &payload); - private: - long certExpiresAt_; - std::string certUrl_; - - }; - } - } -} -#endif // !ALIBABACLOUD_HITSDB_MODEL_GETLINDORMSSLCERTURLRESULT_H_ \ No newline at end of file diff --git a/hitsdb/src/HitsdbClient.cc b/hitsdb/src/HitsdbClient.cc index 505d5bc0f..4efce62b7 100644 --- a/hitsdb/src/HitsdbClient.cc +++ b/hitsdb/src/HitsdbClient.cc @@ -267,42 +267,6 @@ HitsdbClient::GetLindormInstanceListOutcomeCallable HitsdbClient::getLindormInst return task->get_future(); } -HitsdbClient::GetLindormSSLCertUrlOutcome HitsdbClient::getLindormSSLCertUrl(const GetLindormSSLCertUrlRequest &request) const -{ - auto endpointOutcome = endpointProvider_->getEndpoint(); - if (!endpointOutcome.isSuccess()) - return GetLindormSSLCertUrlOutcome(endpointOutcome.error()); - - auto outcome = makeRequest(endpointOutcome.result(), request); - - if (outcome.isSuccess()) - return GetLindormSSLCertUrlOutcome(GetLindormSSLCertUrlResult(outcome.result())); - else - return GetLindormSSLCertUrlOutcome(outcome.error()); -} - -void HitsdbClient::getLindormSSLCertUrlAsync(const GetLindormSSLCertUrlRequest& request, const GetLindormSSLCertUrlAsyncHandler& handler, const std::shared_ptr& context) const -{ - auto fn = [this, request, handler, context]() - { - handler(this, request, getLindormSSLCertUrl(request), context); - }; - - asyncExecute(new Runnable(fn)); -} - -HitsdbClient::GetLindormSSLCertUrlOutcomeCallable HitsdbClient::getLindormSSLCertUrlCallable(const GetLindormSSLCertUrlRequest &request) const -{ - auto task = std::make_shared>( - [this, request]() - { - return this->getLindormSSLCertUrl(request); - }); - - asyncExecute(new Runnable([task]() { (*task)(); })); - return task->get_future(); -} - HitsdbClient::ReleaseLindormInstanceOutcome HitsdbClient::releaseLindormInstance(const ReleaseLindormInstanceRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); diff --git a/hitsdb/src/model/GetLindormInstanceResult.cc b/hitsdb/src/model/GetLindormInstanceResult.cc index ddac594cb..8eec50dac 100644 --- a/hitsdb/src/model/GetLindormInstanceResult.cc +++ b/hitsdb/src/model/GetLindormInstanceResult.cc @@ -117,6 +117,8 @@ void GetLindormInstanceResult::parse(const std::string &payload) enableCompute_ = value["EnableCompute"].asString() == "true"; if(!value["EnableSSL"].isNull()) enableSSL_ = value["EnableSSL"].asString() == "true"; + if(!value["EnableCdc"].isNull()) + enableCdc_ = value["EnableCdc"].asString() == "true"; } @@ -250,6 +252,11 @@ std::string GetLindormInstanceResult::getVpcId()const return vpcId_; } +bool GetLindormInstanceResult::getEnableCdc()const +{ + return enableCdc_; +} + bool GetLindormInstanceResult::getEnablePhoenix()const { return enablePhoenix_; diff --git a/hitsdb/src/model/GetLindormSSLCertUrlRequest.cc b/hitsdb/src/model/GetLindormSSLCertUrlRequest.cc deleted file mode 100644 index dea487f29..000000000 --- a/hitsdb/src/model/GetLindormSSLCertUrlRequest.cc +++ /dev/null @@ -1,117 +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::Hitsdb::Model::GetLindormSSLCertUrlRequest; - -GetLindormSSLCertUrlRequest::GetLindormSSLCertUrlRequest() : - RpcServiceRequest("hitsdb", "2020-06-15", "GetLindormSSLCertUrl") -{ - setMethod(HttpRequest::Method::Post); -} - -GetLindormSSLCertUrlRequest::~GetLindormSSLCertUrlRequest() -{} - -long GetLindormSSLCertUrlRequest::getResourceOwnerId()const -{ - return resourceOwnerId_; -} - -void GetLindormSSLCertUrlRequest::setResourceOwnerId(long resourceOwnerId) -{ - resourceOwnerId_ = resourceOwnerId; - setParameter("ResourceOwnerId", std::to_string(resourceOwnerId)); -} - -std::string GetLindormSSLCertUrlRequest::getAccessKeyId()const -{ - return accessKeyId_; -} - -void GetLindormSSLCertUrlRequest::setAccessKeyId(const std::string& accessKeyId) -{ - accessKeyId_ = accessKeyId; - setParameter("AccessKeyId", accessKeyId); -} - -std::string GetLindormSSLCertUrlRequest::getSecurityToken()const -{ - return securityToken_; -} - -void GetLindormSSLCertUrlRequest::setSecurityToken(const std::string& securityToken) -{ - securityToken_ = securityToken; - setParameter("SecurityToken", securityToken); -} - -std::string GetLindormSSLCertUrlRequest::getRegionId()const -{ - return regionId_; -} - -void GetLindormSSLCertUrlRequest::setRegionId(const std::string& regionId) -{ - regionId_ = regionId; - setParameter("RegionId", regionId); -} - -std::string GetLindormSSLCertUrlRequest::getResourceOwnerAccount()const -{ - return resourceOwnerAccount_; -} - -void GetLindormSSLCertUrlRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount) -{ - resourceOwnerAccount_ = resourceOwnerAccount; - setParameter("ResourceOwnerAccount", resourceOwnerAccount); -} - -std::string GetLindormSSLCertUrlRequest::getOwnerAccount()const -{ - return ownerAccount_; -} - -void GetLindormSSLCertUrlRequest::setOwnerAccount(const std::string& ownerAccount) -{ - ownerAccount_ = ownerAccount; - setParameter("OwnerAccount", ownerAccount); -} - -long GetLindormSSLCertUrlRequest::getOwnerId()const -{ - return ownerId_; -} - -void GetLindormSSLCertUrlRequest::setOwnerId(long ownerId) -{ - ownerId_ = ownerId; - setParameter("OwnerId", std::to_string(ownerId)); -} - -std::string GetLindormSSLCertUrlRequest::getInstanceId()const -{ - return instanceId_; -} - -void GetLindormSSLCertUrlRequest::setInstanceId(const std::string& instanceId) -{ - instanceId_ = instanceId; - setParameter("InstanceId", instanceId); -} - diff --git a/hitsdb/src/model/GetLindormSSLCertUrlResult.cc b/hitsdb/src/model/GetLindormSSLCertUrlResult.cc deleted file mode 100644 index 24b4ed1a9..000000000 --- a/hitsdb/src/model/GetLindormSSLCertUrlResult.cc +++ /dev/null @@ -1,58 +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::Hitsdb; -using namespace AlibabaCloud::Hitsdb::Model; - -GetLindormSSLCertUrlResult::GetLindormSSLCertUrlResult() : - ServiceResult() -{} - -GetLindormSSLCertUrlResult::GetLindormSSLCertUrlResult(const std::string &payload) : - ServiceResult() -{ - parse(payload); -} - -GetLindormSSLCertUrlResult::~GetLindormSSLCertUrlResult() -{} - -void GetLindormSSLCertUrlResult::parse(const std::string &payload) -{ - Json::Reader reader; - Json::Value value; - reader.parse(payload, value); - setRequestId(value["RequestId"].asString()); - if(!value["CertUrl"].isNull()) - certUrl_ = value["CertUrl"].asString(); - if(!value["CertExpiresAt"].isNull()) - certExpiresAt_ = std::stol(value["CertExpiresAt"].asString()); - -} - -long GetLindormSSLCertUrlResult::getCertExpiresAt()const -{ - return certExpiresAt_; -} - -std::string GetLindormSSLCertUrlResult::getCertUrl()const -{ - return certUrl_; -} -