diff --git a/CHANGELOG b/CHANGELOG index 27ce21959..a9b0e80b3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2020-11-20 Version: patch +- Generated 2019-09-10 for `waf-openapi`. + 2020-11-19 Version: patch - Update DescribeDedicatedClusterInstanceList return data. diff --git a/waf-openapi/CMakeLists.txt b/waf-openapi/CMakeLists.txt index 0428b4be2..1b96d6d08 100644 --- a/waf-openapi/CMakeLists.txt +++ b/waf-openapi/CMakeLists.txt @@ -33,6 +33,8 @@ set(waf-openapi_public_header_model include/alibabacloud/waf-openapi/model/DeleteDomainResult.h include/alibabacloud/waf-openapi/model/DeleteInstanceRequest.h include/alibabacloud/waf-openapi/model/DeleteInstanceResult.h + include/alibabacloud/waf-openapi/model/DeleteProtectionModuleRuleRequest.h + include/alibabacloud/waf-openapi/model/DeleteProtectionModuleRuleResult.h include/alibabacloud/waf-openapi/model/DescribeCertMatchStatusRequest.h include/alibabacloud/waf-openapi/model/DescribeCertMatchStatusResult.h include/alibabacloud/waf-openapi/model/DescribeCertificatesRequest.h @@ -61,8 +63,6 @@ set(waf-openapi_public_header_model include/alibabacloud/waf-openapi/model/DescribeProtectionModuleStatusResult.h include/alibabacloud/waf-openapi/model/ModifyDomainRequest.h include/alibabacloud/waf-openapi/model/ModifyDomainResult.h - include/alibabacloud/waf-openapi/model/ModifyDomainClusterTypeRequest.h - include/alibabacloud/waf-openapi/model/ModifyDomainClusterTypeResult.h include/alibabacloud/waf-openapi/model/ModifyDomainIpv6StatusRequest.h include/alibabacloud/waf-openapi/model/ModifyDomainIpv6StatusResult.h include/alibabacloud/waf-openapi/model/ModifyLogRetrievalStatusRequest.h @@ -96,6 +96,8 @@ set(waf-openapi_src src/model/DeleteDomainResult.cc src/model/DeleteInstanceRequest.cc src/model/DeleteInstanceResult.cc + src/model/DeleteProtectionModuleRuleRequest.cc + src/model/DeleteProtectionModuleRuleResult.cc src/model/DescribeCertMatchStatusRequest.cc src/model/DescribeCertMatchStatusResult.cc src/model/DescribeCertificatesRequest.cc @@ -124,8 +126,6 @@ set(waf-openapi_src src/model/DescribeProtectionModuleStatusResult.cc src/model/ModifyDomainRequest.cc src/model/ModifyDomainResult.cc - src/model/ModifyDomainClusterTypeRequest.cc - src/model/ModifyDomainClusterTypeResult.cc src/model/ModifyDomainIpv6StatusRequest.cc src/model/ModifyDomainIpv6StatusResult.cc src/model/ModifyLogRetrievalStatusRequest.cc diff --git a/waf-openapi/include/alibabacloud/waf-openapi/Waf_openapiClient.h b/waf-openapi/include/alibabacloud/waf-openapi/Waf_openapiClient.h index d9faecb57..a8b1e8f36 100644 --- a/waf-openapi/include/alibabacloud/waf-openapi/Waf_openapiClient.h +++ b/waf-openapi/include/alibabacloud/waf-openapi/Waf_openapiClient.h @@ -34,6 +34,8 @@ #include "model/DeleteDomainResult.h" #include "model/DeleteInstanceRequest.h" #include "model/DeleteInstanceResult.h" +#include "model/DeleteProtectionModuleRuleRequest.h" +#include "model/DeleteProtectionModuleRuleResult.h" #include "model/DescribeCertMatchStatusRequest.h" #include "model/DescribeCertMatchStatusResult.h" #include "model/DescribeCertificatesRequest.h" @@ -62,8 +64,6 @@ #include "model/DescribeProtectionModuleStatusResult.h" #include "model/ModifyDomainRequest.h" #include "model/ModifyDomainResult.h" -#include "model/ModifyDomainClusterTypeRequest.h" -#include "model/ModifyDomainClusterTypeResult.h" #include "model/ModifyDomainIpv6StatusRequest.h" #include "model/ModifyDomainIpv6StatusResult.h" #include "model/ModifyLogRetrievalStatusRequest.h" @@ -109,6 +109,9 @@ namespace AlibabaCloud typedef Outcome DeleteInstanceOutcome; typedef std::future DeleteInstanceOutcomeCallable; typedef std::function&)> DeleteInstanceAsyncHandler; + typedef Outcome DeleteProtectionModuleRuleOutcome; + typedef std::future DeleteProtectionModuleRuleOutcomeCallable; + typedef std::function&)> DeleteProtectionModuleRuleAsyncHandler; typedef Outcome DescribeCertMatchStatusOutcome; typedef std::future DescribeCertMatchStatusOutcomeCallable; typedef std::function&)> DescribeCertMatchStatusAsyncHandler; @@ -151,9 +154,6 @@ namespace AlibabaCloud typedef Outcome ModifyDomainOutcome; typedef std::future ModifyDomainOutcomeCallable; typedef std::function&)> ModifyDomainAsyncHandler; - typedef Outcome ModifyDomainClusterTypeOutcome; - typedef std::future ModifyDomainClusterTypeOutcomeCallable; - typedef std::function&)> ModifyDomainClusterTypeAsyncHandler; typedef Outcome ModifyDomainIpv6StatusOutcome; typedef std::future ModifyDomainIpv6StatusOutcomeCallable; typedef std::function&)> ModifyDomainIpv6StatusAsyncHandler; @@ -204,6 +204,9 @@ namespace AlibabaCloud DeleteInstanceOutcome deleteInstance(const Model::DeleteInstanceRequest &request)const; void deleteInstanceAsync(const Model::DeleteInstanceRequest& request, const DeleteInstanceAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; DeleteInstanceOutcomeCallable deleteInstanceCallable(const Model::DeleteInstanceRequest& request) const; + DeleteProtectionModuleRuleOutcome deleteProtectionModuleRule(const Model::DeleteProtectionModuleRuleRequest &request)const; + void deleteProtectionModuleRuleAsync(const Model::DeleteProtectionModuleRuleRequest& request, const DeleteProtectionModuleRuleAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; + DeleteProtectionModuleRuleOutcomeCallable deleteProtectionModuleRuleCallable(const Model::DeleteProtectionModuleRuleRequest& request) const; DescribeCertMatchStatusOutcome describeCertMatchStatus(const Model::DescribeCertMatchStatusRequest &request)const; void describeCertMatchStatusAsync(const Model::DescribeCertMatchStatusRequest& request, const DescribeCertMatchStatusAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; DescribeCertMatchStatusOutcomeCallable describeCertMatchStatusCallable(const Model::DescribeCertMatchStatusRequest& request) const; @@ -246,9 +249,6 @@ namespace AlibabaCloud ModifyDomainOutcome modifyDomain(const Model::ModifyDomainRequest &request)const; void modifyDomainAsync(const Model::ModifyDomainRequest& request, const ModifyDomainAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; ModifyDomainOutcomeCallable modifyDomainCallable(const Model::ModifyDomainRequest& request) const; - ModifyDomainClusterTypeOutcome modifyDomainClusterType(const Model::ModifyDomainClusterTypeRequest &request)const; - void modifyDomainClusterTypeAsync(const Model::ModifyDomainClusterTypeRequest& request, const ModifyDomainClusterTypeAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; - ModifyDomainClusterTypeOutcomeCallable modifyDomainClusterTypeCallable(const Model::ModifyDomainClusterTypeRequest& request) const; ModifyDomainIpv6StatusOutcome modifyDomainIpv6Status(const Model::ModifyDomainIpv6StatusRequest &request)const; void modifyDomainIpv6StatusAsync(const Model::ModifyDomainIpv6StatusRequest& request, const ModifyDomainIpv6StatusAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; ModifyDomainIpv6StatusOutcomeCallable modifyDomainIpv6StatusCallable(const Model::ModifyDomainIpv6StatusRequest& request) const; diff --git a/waf-openapi/include/alibabacloud/waf-openapi/model/CreateCertificateRequest.h b/waf-openapi/include/alibabacloud/waf-openapi/model/CreateCertificateRequest.h index 3ca2300f2..472bdc982 100644 --- a/waf-openapi/include/alibabacloud/waf-openapi/model/CreateCertificateRequest.h +++ b/waf-openapi/include/alibabacloud/waf-openapi/model/CreateCertificateRequest.h @@ -49,8 +49,6 @@ namespace AlibabaCloud void setDomain(const std::string& domain); std::string getCertificateName()const; void setCertificateName(const std::string& certificateName); - long getHttpsCertId()const; - void setHttpsCertId(long httpsCertId); private: std::string certificate_; @@ -60,7 +58,6 @@ namespace AlibabaCloud std::string instanceId_; std::string domain_; std::string certificateName_; - long httpsCertId_; }; } diff --git a/waf-openapi/include/alibabacloud/waf-openapi/model/CreateDomainRequest.h b/waf-openapi/include/alibabacloud/waf-openapi/model/CreateDomainRequest.h index c7f119dc2..0c827e654 100644 --- a/waf-openapi/include/alibabacloud/waf-openapi/model/CreateDomainRequest.h +++ b/waf-openapi/include/alibabacloud/waf-openapi/model/CreateDomainRequest.h @@ -35,6 +35,8 @@ namespace AlibabaCloud CreateDomainRequest(); ~CreateDomainRequest(); + int getIpFollowStatus()const; + void setIpFollowStatus(int ipFollowStatus); std::string getResourceGroupId()const; void setResourceGroupId(const std::string& resourceGroupId); std::string getSourceIp()const; @@ -47,12 +49,16 @@ namespace AlibabaCloud void setWriteTime(int writeTime); std::string getLang()const; void setLang(const std::string& lang); + std::string getAccessType()const; + void setAccessType(const std::string& accessType); std::string getLogHeaders()const; void setLogHeaders(const std::string& logHeaders); int getConnectionTime()const; void setConnectionTime(int connectionTime); int getClusterType()const; void setClusterType(int clusterType); + std::string getCloudNativeInstances()const; + void setCloudNativeInstances(const std::string& cloudNativeInstances); int getHttpsRedirect()const; void setHttpsRedirect(int httpsRedirect); std::string getInstanceId()const; @@ -73,15 +79,18 @@ namespace AlibabaCloud void setHttpToUserIp(int httpToUserIp); private: + int ipFollowStatus_; std::string resourceGroupId_; std::string sourceIp_; std::string httpPort_; std::string http2Port_; int writeTime_; std::string lang_; + std::string accessType_; std::string logHeaders_; int connectionTime_; int clusterType_; + std::string cloudNativeInstances_; int httpsRedirect_; std::string instanceId_; std::string sourceIps_; diff --git a/waf-openapi/include/alibabacloud/waf-openapi/model/ModifyDomainClusterTypeRequest.h b/waf-openapi/include/alibabacloud/waf-openapi/model/DeleteProtectionModuleRuleRequest.h similarity index 62% rename from waf-openapi/include/alibabacloud/waf-openapi/model/ModifyDomainClusterTypeRequest.h rename to waf-openapi/include/alibabacloud/waf-openapi/model/DeleteProtectionModuleRuleRequest.h index bf8010fdc..789896cdb 100644 --- a/waf-openapi/include/alibabacloud/waf-openapi/model/ModifyDomainClusterTypeRequest.h +++ b/waf-openapi/include/alibabacloud/waf-openapi/model/DeleteProtectionModuleRuleRequest.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ALIBABACLOUD_WAF_OPENAPI_MODEL_MODIFYDOMAINCLUSTERTYPEREQUEST_H_ -#define ALIBABACLOUD_WAF_OPENAPI_MODEL_MODIFYDOMAINCLUSTERTYPEREQUEST_H_ +#ifndef ALIBABACLOUD_WAF_OPENAPI_MODEL_DELETEPROTECTIONMODULERULEREQUEST_H_ +#define ALIBABACLOUD_WAF_OPENAPI_MODEL_DELETEPROTECTIONMODULERULEREQUEST_H_ #include #include @@ -28,30 +28,36 @@ namespace AlibabaCloud { namespace Model { - class ALIBABACLOUD_WAF_OPENAPI_EXPORT ModifyDomainClusterTypeRequest : public RpcServiceRequest + class ALIBABACLOUD_WAF_OPENAPI_EXPORT DeleteProtectionModuleRuleRequest : public RpcServiceRequest { public: - ModifyDomainClusterTypeRequest(); - ~ModifyDomainClusterTypeRequest(); + DeleteProtectionModuleRuleRequest(); + ~DeleteProtectionModuleRuleRequest(); - int getClusterType()const; - void setClusterType(int clusterType); + std::string getDefenseType()const; + void setDefenseType(const std::string& defenseType); std::string getInstanceId()const; void setInstanceId(const std::string& instanceId); std::string getSourceIp()const; void setSourceIp(const std::string& sourceIp); std::string getDomain()const; void setDomain(const std::string& domain); + std::string getLang()const; + void setLang(const std::string& lang); + long getRuleId()const; + void setRuleId(long ruleId); private: - int clusterType_; + std::string defenseType_; std::string instanceId_; std::string sourceIp_; std::string domain_; + std::string lang_; + long ruleId_; }; } } } -#endif // !ALIBABACLOUD_WAF_OPENAPI_MODEL_MODIFYDOMAINCLUSTERTYPEREQUEST_H_ \ No newline at end of file +#endif // !ALIBABACLOUD_WAF_OPENAPI_MODEL_DELETEPROTECTIONMODULERULEREQUEST_H_ \ No newline at end of file diff --git a/waf-openapi/include/alibabacloud/waf-openapi/model/ModifyDomainClusterTypeResult.h b/waf-openapi/include/alibabacloud/waf-openapi/model/DeleteProtectionModuleRuleResult.h similarity index 66% rename from waf-openapi/include/alibabacloud/waf-openapi/model/ModifyDomainClusterTypeResult.h rename to waf-openapi/include/alibabacloud/waf-openapi/model/DeleteProtectionModuleRuleResult.h index a4a46f373..78149799e 100644 --- a/waf-openapi/include/alibabacloud/waf-openapi/model/ModifyDomainClusterTypeResult.h +++ b/waf-openapi/include/alibabacloud/waf-openapi/model/DeleteProtectionModuleRuleResult.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ALIBABACLOUD_WAF_OPENAPI_MODEL_MODIFYDOMAINCLUSTERTYPERESULT_H_ -#define ALIBABACLOUD_WAF_OPENAPI_MODEL_MODIFYDOMAINCLUSTERTYPERESULT_H_ +#ifndef ALIBABACLOUD_WAF_OPENAPI_MODEL_DELETEPROTECTIONMODULERULERESULT_H_ +#define ALIBABACLOUD_WAF_OPENAPI_MODEL_DELETEPROTECTIONMODULERULERESULT_H_ #include #include @@ -29,14 +29,14 @@ namespace AlibabaCloud { namespace Model { - class ALIBABACLOUD_WAF_OPENAPI_EXPORT ModifyDomainClusterTypeResult : public ServiceResult + class ALIBABACLOUD_WAF_OPENAPI_EXPORT DeleteProtectionModuleRuleResult : public ServiceResult { public: - ModifyDomainClusterTypeResult(); - explicit ModifyDomainClusterTypeResult(const std::string &payload); - ~ModifyDomainClusterTypeResult(); + DeleteProtectionModuleRuleResult(); + explicit DeleteProtectionModuleRuleResult(const std::string &payload); + ~DeleteProtectionModuleRuleResult(); protected: void parse(const std::string &payload); @@ -46,4 +46,4 @@ namespace AlibabaCloud } } } -#endif // !ALIBABACLOUD_WAF_OPENAPI_MODEL_MODIFYDOMAINCLUSTERTYPERESULT_H_ \ No newline at end of file +#endif // !ALIBABACLOUD_WAF_OPENAPI_MODEL_DELETEPROTECTIONMODULERULERESULT_H_ \ No newline at end of file diff --git a/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeDomainBasicConfigsRequest.h b/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeDomainBasicConfigsRequest.h index 3b921f8e0..588ac282e 100644 --- a/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeDomainBasicConfigsRequest.h +++ b/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeDomainBasicConfigsRequest.h @@ -45,6 +45,10 @@ namespace AlibabaCloud void setPageSize(int pageSize); std::string getLang()const; void setLang(const std::string& lang); + std::string getAccessType()const; + void setAccessType(const std::string& accessType); + int getCloudNativeProductId()const; + void setCloudNativeProductId(int cloudNativeProductId); std::string getInstanceId()const; void setInstanceId(const std::string& instanceId); std::string getDomainKey()const; @@ -56,6 +60,8 @@ namespace AlibabaCloud std::string sourceIp_; int pageSize_; std::string lang_; + std::string accessType_; + int cloudNativeProductId_; std::string instanceId_; std::string domainKey_; diff --git a/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeDomainBasicConfigsResult.h b/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeDomainBasicConfigsResult.h index 006de9aa6..f93377645 100644 --- a/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeDomainBasicConfigsResult.h +++ b/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeDomainBasicConfigsResult.h @@ -42,6 +42,7 @@ namespace AlibabaCloud int wafMode; int wafStatus; std::string domain; + std::string accessType; int ccMode; }; diff --git a/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeDomainResult.h b/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeDomainResult.h index 72c81ef8d..1325e45ef 100644 --- a/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeDomainResult.h +++ b/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeDomainResult.h @@ -39,12 +39,25 @@ namespace AlibabaCloud std::string v; std::string k; }; + struct CloudNativeInstancesItem + { + struct ProtocolPortConfigsItem + { + std::string ports; + std::string protocol; + }; + std::vector protocolPortConfigs; + std::string instanceId; + std::string iPAddressList; + std::string cloudNativeProductName; + }; int httpToUserIp; std::vector httpPort; int isAccessProduct; std::string resourceGroupId; int readTime; std::vector sourceIps; + int ipFollowStatus; int clusterType; int loadBalancing; std::string cname; @@ -54,6 +67,8 @@ namespace AlibabaCloud long version; int httpsRedirect; int connectionTime; + std::vector cloudNativeInstances; + std::string accessType; std::vector httpsPort; }; diff --git a/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeInstanceInfoResult.h b/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeInstanceInfoResult.h index 280f2b4b1..21cee96bc 100644 --- a/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeInstanceInfoResult.h +++ b/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeInstanceInfoResult.h @@ -38,6 +38,7 @@ namespace AlibabaCloud std::string subscriptionType; int trial; std::string instanceId; + std::string version; int inDebt; std::string region; int remainDay; diff --git a/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeProtectionModuleModeResult.h b/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeProtectionModuleModeResult.h index 0aeed07e2..bf2150bde 100644 --- a/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeProtectionModuleModeResult.h +++ b/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeProtectionModuleModeResult.h @@ -37,11 +37,13 @@ namespace AlibabaCloud DescribeProtectionModuleModeResult(); explicit DescribeProtectionModuleModeResult(const std::string &payload); ~DescribeProtectionModuleModeResult(); + int getLearnStatus()const; int getMode()const; protected: void parse(const std::string &payload); private: + int learnStatus_; int mode_; }; diff --git a/waf-openapi/include/alibabacloud/waf-openapi/model/ModifyDomainRequest.h b/waf-openapi/include/alibabacloud/waf-openapi/model/ModifyDomainRequest.h index c037de1b4..05ae02c49 100644 --- a/waf-openapi/include/alibabacloud/waf-openapi/model/ModifyDomainRequest.h +++ b/waf-openapi/include/alibabacloud/waf-openapi/model/ModifyDomainRequest.h @@ -35,6 +35,8 @@ namespace AlibabaCloud ModifyDomainRequest(); ~ModifyDomainRequest(); + int getIpFollowStatus()const; + void setIpFollowStatus(int ipFollowStatus); std::string getSourceIp()const; void setSourceIp(const std::string& sourceIp); int getXffHeaderMode()const; @@ -49,6 +51,8 @@ namespace AlibabaCloud void setLang(const std::string& lang); std::string getXffHeaders()const; void setXffHeaders(const std::string& xffHeaders); + std::string getAccessType()const; + void setAccessType(const std::string& accessType); int getBindingIpv6()const; void setBindingIpv6(int bindingIpv6); std::string getLogHeaders()const; @@ -57,6 +61,8 @@ namespace AlibabaCloud void setConnectionTime(int connectionTime); int getClusterType()const; void setClusterType(int clusterType); + std::string getCloudNativeInstances()const; + void setCloudNativeInstances(const std::string& cloudNativeInstances); int getHttpsRedirect()const; void setHttpsRedirect(int httpsRedirect); std::string getInstanceId()const; @@ -77,6 +83,7 @@ namespace AlibabaCloud void setHttpToUserIp(int httpToUserIp); private: + int ipFollowStatus_; std::string sourceIp_; int xffHeaderMode_; std::string httpPort_; @@ -84,10 +91,12 @@ namespace AlibabaCloud int writeTime_; std::string lang_; std::string xffHeaders_; + std::string accessType_; int bindingIpv6_; std::string logHeaders_; int connectionTime_; int clusterType_; + std::string cloudNativeInstances_; int httpsRedirect_; std::string instanceId_; std::string sourceIps_; diff --git a/waf-openapi/src/Waf-openapiClient.cc b/waf-openapi/src/Waf-openapiClient.cc index 203fcbe06..6cda76871 100644 --- a/waf-openapi/src/Waf-openapiClient.cc +++ b/waf-openapi/src/Waf-openapiClient.cc @@ -267,6 +267,42 @@ Waf_openapiClient::DeleteInstanceOutcomeCallable Waf_openapiClient::deleteInstan return task->get_future(); } +Waf_openapiClient::DeleteProtectionModuleRuleOutcome Waf_openapiClient::deleteProtectionModuleRule(const DeleteProtectionModuleRuleRequest &request) const +{ + auto endpointOutcome = endpointProvider_->getEndpoint(); + if (!endpointOutcome.isSuccess()) + return DeleteProtectionModuleRuleOutcome(endpointOutcome.error()); + + auto outcome = makeRequest(endpointOutcome.result(), request); + + if (outcome.isSuccess()) + return DeleteProtectionModuleRuleOutcome(DeleteProtectionModuleRuleResult(outcome.result())); + else + return DeleteProtectionModuleRuleOutcome(outcome.error()); +} + +void Waf_openapiClient::deleteProtectionModuleRuleAsync(const DeleteProtectionModuleRuleRequest& request, const DeleteProtectionModuleRuleAsyncHandler& handler, const std::shared_ptr& context) const +{ + auto fn = [this, request, handler, context]() + { + handler(this, request, deleteProtectionModuleRule(request), context); + }; + + asyncExecute(new Runnable(fn)); +} + +Waf_openapiClient::DeleteProtectionModuleRuleOutcomeCallable Waf_openapiClient::deleteProtectionModuleRuleCallable(const DeleteProtectionModuleRuleRequest &request) const +{ + auto task = std::make_shared>( + [this, request]() + { + return this->deleteProtectionModuleRule(request); + }); + + asyncExecute(new Runnable([task]() { (*task)(); })); + return task->get_future(); +} + Waf_openapiClient::DescribeCertMatchStatusOutcome Waf_openapiClient::describeCertMatchStatus(const DescribeCertMatchStatusRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); @@ -771,42 +807,6 @@ Waf_openapiClient::ModifyDomainOutcomeCallable Waf_openapiClient::modifyDomainCa return task->get_future(); } -Waf_openapiClient::ModifyDomainClusterTypeOutcome Waf_openapiClient::modifyDomainClusterType(const ModifyDomainClusterTypeRequest &request) const -{ - auto endpointOutcome = endpointProvider_->getEndpoint(); - if (!endpointOutcome.isSuccess()) - return ModifyDomainClusterTypeOutcome(endpointOutcome.error()); - - auto outcome = makeRequest(endpointOutcome.result(), request); - - if (outcome.isSuccess()) - return ModifyDomainClusterTypeOutcome(ModifyDomainClusterTypeResult(outcome.result())); - else - return ModifyDomainClusterTypeOutcome(outcome.error()); -} - -void Waf_openapiClient::modifyDomainClusterTypeAsync(const ModifyDomainClusterTypeRequest& request, const ModifyDomainClusterTypeAsyncHandler& handler, const std::shared_ptr& context) const -{ - auto fn = [this, request, handler, context]() - { - handler(this, request, modifyDomainClusterType(request), context); - }; - - asyncExecute(new Runnable(fn)); -} - -Waf_openapiClient::ModifyDomainClusterTypeOutcomeCallable Waf_openapiClient::modifyDomainClusterTypeCallable(const ModifyDomainClusterTypeRequest &request) const -{ - auto task = std::make_shared>( - [this, request]() - { - return this->modifyDomainClusterType(request); - }); - - asyncExecute(new Runnable([task]() { (*task)(); })); - return task->get_future(); -} - Waf_openapiClient::ModifyDomainIpv6StatusOutcome Waf_openapiClient::modifyDomainIpv6Status(const ModifyDomainIpv6StatusRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); diff --git a/waf-openapi/src/model/CreateCertificateRequest.cc b/waf-openapi/src/model/CreateCertificateRequest.cc index c337e185e..e20cb6fa5 100644 --- a/waf-openapi/src/model/CreateCertificateRequest.cc +++ b/waf-openapi/src/model/CreateCertificateRequest.cc @@ -104,14 +104,3 @@ void CreateCertificateRequest::setCertificateName(const std::string& certificate setParameter("CertificateName", certificateName); } -long CreateCertificateRequest::getHttpsCertId()const -{ - return httpsCertId_; -} - -void CreateCertificateRequest::setHttpsCertId(long httpsCertId) -{ - httpsCertId_ = httpsCertId; - setParameter("HttpsCertId", std::to_string(httpsCertId)); -} - diff --git a/waf-openapi/src/model/CreateDomainRequest.cc b/waf-openapi/src/model/CreateDomainRequest.cc index 0baee6465..936d9fe9e 100644 --- a/waf-openapi/src/model/CreateDomainRequest.cc +++ b/waf-openapi/src/model/CreateDomainRequest.cc @@ -27,6 +27,17 @@ CreateDomainRequest::CreateDomainRequest() : CreateDomainRequest::~CreateDomainRequest() {} +int CreateDomainRequest::getIpFollowStatus()const +{ + return ipFollowStatus_; +} + +void CreateDomainRequest::setIpFollowStatus(int ipFollowStatus) +{ + ipFollowStatus_ = ipFollowStatus; + setParameter("IpFollowStatus", std::to_string(ipFollowStatus)); +} + std::string CreateDomainRequest::getResourceGroupId()const { return resourceGroupId_; @@ -93,6 +104,17 @@ void CreateDomainRequest::setLang(const std::string& lang) setParameter("Lang", lang); } +std::string CreateDomainRequest::getAccessType()const +{ + return accessType_; +} + +void CreateDomainRequest::setAccessType(const std::string& accessType) +{ + accessType_ = accessType; + setParameter("AccessType", accessType); +} + std::string CreateDomainRequest::getLogHeaders()const { return logHeaders_; @@ -126,6 +148,17 @@ void CreateDomainRequest::setClusterType(int clusterType) setParameter("ClusterType", std::to_string(clusterType)); } +std::string CreateDomainRequest::getCloudNativeInstances()const +{ + return cloudNativeInstances_; +} + +void CreateDomainRequest::setCloudNativeInstances(const std::string& cloudNativeInstances) +{ + cloudNativeInstances_ = cloudNativeInstances; + setParameter("CloudNativeInstances", cloudNativeInstances); +} + int CreateDomainRequest::getHttpsRedirect()const { return httpsRedirect_; diff --git a/waf-openapi/src/model/DeleteProtectionModuleRuleRequest.cc b/waf-openapi/src/model/DeleteProtectionModuleRuleRequest.cc new file mode 100644 index 000000000..12eb037dd --- /dev/null +++ b/waf-openapi/src/model/DeleteProtectionModuleRuleRequest.cc @@ -0,0 +1,95 @@ +/* + * 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::Waf_openapi::Model::DeleteProtectionModuleRuleRequest; + +DeleteProtectionModuleRuleRequest::DeleteProtectionModuleRuleRequest() : + RpcServiceRequest("waf-openapi", "2019-09-10", "DeleteProtectionModuleRule") +{ + setMethod(HttpRequest::Method::Post); +} + +DeleteProtectionModuleRuleRequest::~DeleteProtectionModuleRuleRequest() +{} + +std::string DeleteProtectionModuleRuleRequest::getDefenseType()const +{ + return defenseType_; +} + +void DeleteProtectionModuleRuleRequest::setDefenseType(const std::string& defenseType) +{ + defenseType_ = defenseType; + setParameter("DefenseType", defenseType); +} + +std::string DeleteProtectionModuleRuleRequest::getInstanceId()const +{ + return instanceId_; +} + +void DeleteProtectionModuleRuleRequest::setInstanceId(const std::string& instanceId) +{ + instanceId_ = instanceId; + setParameter("InstanceId", instanceId); +} + +std::string DeleteProtectionModuleRuleRequest::getSourceIp()const +{ + return sourceIp_; +} + +void DeleteProtectionModuleRuleRequest::setSourceIp(const std::string& sourceIp) +{ + sourceIp_ = sourceIp; + setParameter("SourceIp", sourceIp); +} + +std::string DeleteProtectionModuleRuleRequest::getDomain()const +{ + return domain_; +} + +void DeleteProtectionModuleRuleRequest::setDomain(const std::string& domain) +{ + domain_ = domain; + setParameter("Domain", domain); +} + +std::string DeleteProtectionModuleRuleRequest::getLang()const +{ + return lang_; +} + +void DeleteProtectionModuleRuleRequest::setLang(const std::string& lang) +{ + lang_ = lang; + setParameter("Lang", lang); +} + +long DeleteProtectionModuleRuleRequest::getRuleId()const +{ + return ruleId_; +} + +void DeleteProtectionModuleRuleRequest::setRuleId(long ruleId) +{ + ruleId_ = ruleId; + setParameter("RuleId", std::to_string(ruleId)); +} + diff --git a/waf-openapi/src/model/ModifyDomainClusterTypeResult.cc b/waf-openapi/src/model/DeleteProtectionModuleRuleResult.cc similarity index 70% rename from waf-openapi/src/model/ModifyDomainClusterTypeResult.cc rename to waf-openapi/src/model/DeleteProtectionModuleRuleResult.cc index 239732531..47c34e3ec 100644 --- a/waf-openapi/src/model/ModifyDomainClusterTypeResult.cc +++ b/waf-openapi/src/model/DeleteProtectionModuleRuleResult.cc @@ -14,26 +14,26 @@ * limitations under the License. */ -#include +#include #include using namespace AlibabaCloud::Waf_openapi; using namespace AlibabaCloud::Waf_openapi::Model; -ModifyDomainClusterTypeResult::ModifyDomainClusterTypeResult() : +DeleteProtectionModuleRuleResult::DeleteProtectionModuleRuleResult() : ServiceResult() {} -ModifyDomainClusterTypeResult::ModifyDomainClusterTypeResult(const std::string &payload) : +DeleteProtectionModuleRuleResult::DeleteProtectionModuleRuleResult(const std::string &payload) : ServiceResult() { parse(payload); } -ModifyDomainClusterTypeResult::~ModifyDomainClusterTypeResult() +DeleteProtectionModuleRuleResult::~DeleteProtectionModuleRuleResult() {} -void ModifyDomainClusterTypeResult::parse(const std::string &payload) +void DeleteProtectionModuleRuleResult::parse(const std::string &payload) { Json::Reader reader; Json::Value value; diff --git a/waf-openapi/src/model/DescribeDomainBasicConfigsRequest.cc b/waf-openapi/src/model/DescribeDomainBasicConfigsRequest.cc index b65bb9921..14c7953a0 100644 --- a/waf-openapi/src/model/DescribeDomainBasicConfigsRequest.cc +++ b/waf-openapi/src/model/DescribeDomainBasicConfigsRequest.cc @@ -82,6 +82,28 @@ void DescribeDomainBasicConfigsRequest::setLang(const std::string& lang) setParameter("Lang", lang); } +std::string DescribeDomainBasicConfigsRequest::getAccessType()const +{ + return accessType_; +} + +void DescribeDomainBasicConfigsRequest::setAccessType(const std::string& accessType) +{ + accessType_ = accessType; + setParameter("AccessType", accessType); +} + +int DescribeDomainBasicConfigsRequest::getCloudNativeProductId()const +{ + return cloudNativeProductId_; +} + +void DescribeDomainBasicConfigsRequest::setCloudNativeProductId(int cloudNativeProductId) +{ + cloudNativeProductId_ = cloudNativeProductId; + setParameter("CloudNativeProductId", std::to_string(cloudNativeProductId)); +} + std::string DescribeDomainBasicConfigsRequest::getInstanceId()const { return instanceId_; diff --git a/waf-openapi/src/model/DescribeDomainBasicConfigsResult.cc b/waf-openapi/src/model/DescribeDomainBasicConfigsResult.cc index 37716009e..34354c428 100644 --- a/waf-openapi/src/model/DescribeDomainBasicConfigsResult.cc +++ b/waf-openapi/src/model/DescribeDomainBasicConfigsResult.cc @@ -61,6 +61,8 @@ void DescribeDomainBasicConfigsResult::parse(const std::string &payload) domainConfigsObject.domain = valueDomainConfigsDomainConfig["Domain"].asString(); if(!valueDomainConfigsDomainConfig["Status"].isNull()) domainConfigsObject.status = std::stoi(valueDomainConfigsDomainConfig["Status"].asString()); + if(!valueDomainConfigsDomainConfig["AccessType"].isNull()) + domainConfigsObject.accessType = valueDomainConfigsDomainConfig["AccessType"].asString(); domainConfigs_.push_back(domainConfigsObject); } if(!value["TotalCount"].isNull()) diff --git a/waf-openapi/src/model/DescribeDomainResult.cc b/waf-openapi/src/model/DescribeDomainResult.cc index 61074db1a..1ab9109e9 100644 --- a/waf-openapi/src/model/DescribeDomainResult.cc +++ b/waf-openapi/src/model/DescribeDomainResult.cc @@ -40,6 +40,8 @@ void DescribeDomainResult::parse(const std::string &payload) reader.parse(payload, value); setRequestId(value["RequestId"].asString()); auto domainNode = value["Domain"]; + if(!domainNode["IpFollowStatus"].isNull()) + domain_.ipFollowStatus = std::stoi(domainNode["IpFollowStatus"].asString()); if(!domainNode["HttpToUserIp"].isNull()) domain_.httpToUserIp = std::stoi(domainNode["HttpToUserIp"].asString()); if(!domainNode["HttpsRedirect"].isNull()) @@ -62,6 +64,8 @@ void DescribeDomainResult::parse(const std::string &payload) domain_.writeTime = std::stoi(domainNode["WriteTime"].asString()); if(!domainNode["ResourceGroupId"].isNull()) domain_.resourceGroupId = domainNode["ResourceGroupId"].asString(); + if(!domainNode["AccessType"].isNull()) + domain_.accessType = domainNode["AccessType"].asString(); auto allLogHeadersNode = domainNode["LogHeaders"]["LogHeader"]; for (auto domainNodeLogHeadersLogHeader : allLogHeadersNode) { @@ -71,6 +75,28 @@ void DescribeDomainResult::parse(const std::string &payload) if(!domainNodeLogHeadersLogHeader["k"].isNull()) logHeaderObject.k = domainNodeLogHeadersLogHeader["k"].asString(); domain_.logHeaders.push_back(logHeaderObject); + } + auto allCloudNativeInstancesNode = domainNode["CloudNativeInstances"]["CloudNativeInstancesItem"]; + for (auto domainNodeCloudNativeInstancesCloudNativeInstancesItem : allCloudNativeInstancesNode) + { + Domain::CloudNativeInstancesItem cloudNativeInstancesItemObject; + if(!domainNodeCloudNativeInstancesCloudNativeInstancesItem["CloudNativeProductName"].isNull()) + cloudNativeInstancesItemObject.cloudNativeProductName = domainNodeCloudNativeInstancesCloudNativeInstancesItem["CloudNativeProductName"].asString(); + if(!domainNodeCloudNativeInstancesCloudNativeInstancesItem["InstanceId"].isNull()) + cloudNativeInstancesItemObject.instanceId = domainNodeCloudNativeInstancesCloudNativeInstancesItem["InstanceId"].asString(); + if(!domainNodeCloudNativeInstancesCloudNativeInstancesItem["IPAddressList"].isNull()) + cloudNativeInstancesItemObject.iPAddressList = domainNodeCloudNativeInstancesCloudNativeInstancesItem["IPAddressList"].asString(); + auto allProtocolPortConfigsNode = domainNodeCloudNativeInstancesCloudNativeInstancesItem["ProtocolPortConfigs"]["ProtocolPortConfigsItem"]; + for (auto domainNodeCloudNativeInstancesCloudNativeInstancesItemProtocolPortConfigsProtocolPortConfigsItem : allProtocolPortConfigsNode) + { + Domain::CloudNativeInstancesItem::ProtocolPortConfigsItem protocolPortConfigsObject; + if(!domainNodeCloudNativeInstancesCloudNativeInstancesItemProtocolPortConfigsProtocolPortConfigsItem["Protocol"].isNull()) + protocolPortConfigsObject.protocol = domainNodeCloudNativeInstancesCloudNativeInstancesItemProtocolPortConfigsProtocolPortConfigsItem["Protocol"].asString(); + if(!domainNodeCloudNativeInstancesCloudNativeInstancesItemProtocolPortConfigsProtocolPortConfigsItem["Ports"].isNull()) + protocolPortConfigsObject.ports = domainNodeCloudNativeInstancesCloudNativeInstancesItemProtocolPortConfigsProtocolPortConfigsItem["Ports"].asString(); + cloudNativeInstancesItemObject.protocolPortConfigs.push_back(protocolPortConfigsObject); + } + domain_.cloudNativeInstances.push_back(cloudNativeInstancesItemObject); } auto allSourceIps = domainNode["SourceIps"]["SourceIp"]; for (auto value : allSourceIps) diff --git a/waf-openapi/src/model/DescribeInstanceInfoResult.cc b/waf-openapi/src/model/DescribeInstanceInfoResult.cc index 79473ebd1..93e2ead81 100644 --- a/waf-openapi/src/model/DescribeInstanceInfoResult.cc +++ b/waf-openapi/src/model/DescribeInstanceInfoResult.cc @@ -58,6 +58,8 @@ void DescribeInstanceInfoResult::parse(const std::string &payload) instanceInfo_.status = std::stoi(instanceInfoNode["Status"].asString()); if(!instanceInfoNode["SubscriptionType"].isNull()) instanceInfo_.subscriptionType = instanceInfoNode["SubscriptionType"].asString(); + if(!instanceInfoNode["Version"].isNull()) + instanceInfo_.version = instanceInfoNode["Version"].asString(); } diff --git a/waf-openapi/src/model/DescribeProtectionModuleModeResult.cc b/waf-openapi/src/model/DescribeProtectionModuleModeResult.cc index 4d4919784..67e273c6a 100644 --- a/waf-openapi/src/model/DescribeProtectionModuleModeResult.cc +++ b/waf-openapi/src/model/DescribeProtectionModuleModeResult.cc @@ -41,9 +41,16 @@ void DescribeProtectionModuleModeResult::parse(const std::string &payload) setRequestId(value["RequestId"].asString()); if(!value["Mode"].isNull()) mode_ = std::stoi(value["Mode"].asString()); + if(!value["LearnStatus"].isNull()) + learnStatus_ = std::stoi(value["LearnStatus"].asString()); } +int DescribeProtectionModuleModeResult::getLearnStatus()const +{ + return learnStatus_; +} + int DescribeProtectionModuleModeResult::getMode()const { return mode_; diff --git a/waf-openapi/src/model/ModifyDomainClusterTypeRequest.cc b/waf-openapi/src/model/ModifyDomainClusterTypeRequest.cc deleted file mode 100644 index 72b9466a3..000000000 --- a/waf-openapi/src/model/ModifyDomainClusterTypeRequest.cc +++ /dev/null @@ -1,73 +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::Waf_openapi::Model::ModifyDomainClusterTypeRequest; - -ModifyDomainClusterTypeRequest::ModifyDomainClusterTypeRequest() : - RpcServiceRequest("waf-openapi", "2019-09-10", "ModifyDomainClusterType") -{ - setMethod(HttpRequest::Method::Post); -} - -ModifyDomainClusterTypeRequest::~ModifyDomainClusterTypeRequest() -{} - -int ModifyDomainClusterTypeRequest::getClusterType()const -{ - return clusterType_; -} - -void ModifyDomainClusterTypeRequest::setClusterType(int clusterType) -{ - clusterType_ = clusterType; - setParameter("ClusterType", std::to_string(clusterType)); -} - -std::string ModifyDomainClusterTypeRequest::getInstanceId()const -{ - return instanceId_; -} - -void ModifyDomainClusterTypeRequest::setInstanceId(const std::string& instanceId) -{ - instanceId_ = instanceId; - setParameter("InstanceId", instanceId); -} - -std::string ModifyDomainClusterTypeRequest::getSourceIp()const -{ - return sourceIp_; -} - -void ModifyDomainClusterTypeRequest::setSourceIp(const std::string& sourceIp) -{ - sourceIp_ = sourceIp; - setParameter("SourceIp", sourceIp); -} - -std::string ModifyDomainClusterTypeRequest::getDomain()const -{ - return domain_; -} - -void ModifyDomainClusterTypeRequest::setDomain(const std::string& domain) -{ - domain_ = domain; - setParameter("Domain", domain); -} - diff --git a/waf-openapi/src/model/ModifyDomainRequest.cc b/waf-openapi/src/model/ModifyDomainRequest.cc index 7292a1f2a..21b03c77f 100644 --- a/waf-openapi/src/model/ModifyDomainRequest.cc +++ b/waf-openapi/src/model/ModifyDomainRequest.cc @@ -27,6 +27,17 @@ ModifyDomainRequest::ModifyDomainRequest() : ModifyDomainRequest::~ModifyDomainRequest() {} +int ModifyDomainRequest::getIpFollowStatus()const +{ + return ipFollowStatus_; +} + +void ModifyDomainRequest::setIpFollowStatus(int ipFollowStatus) +{ + ipFollowStatus_ = ipFollowStatus; + setParameter("IpFollowStatus", std::to_string(ipFollowStatus)); +} + std::string ModifyDomainRequest::getSourceIp()const { return sourceIp_; @@ -104,6 +115,17 @@ void ModifyDomainRequest::setXffHeaders(const std::string& xffHeaders) setParameter("XffHeaders", xffHeaders); } +std::string ModifyDomainRequest::getAccessType()const +{ + return accessType_; +} + +void ModifyDomainRequest::setAccessType(const std::string& accessType) +{ + accessType_ = accessType; + setParameter("AccessType", accessType); +} + int ModifyDomainRequest::getBindingIpv6()const { return bindingIpv6_; @@ -148,6 +170,17 @@ void ModifyDomainRequest::setClusterType(int clusterType) setParameter("ClusterType", std::to_string(clusterType)); } +std::string ModifyDomainRequest::getCloudNativeInstances()const +{ + return cloudNativeInstances_; +} + +void ModifyDomainRequest::setCloudNativeInstances(const std::string& cloudNativeInstances) +{ + cloudNativeInstances_ = cloudNativeInstances; + setParameter("CloudNativeInstances", cloudNativeInstances); +} + int ModifyDomainRequest::getHttpsRedirect()const { return httpsRedirect_;