From 1682e58f98e9c7337444a30d1aca9ac07555e8fc Mon Sep 17 00:00:00 2001 From: sdk-team Date: Fri, 28 Oct 2022 05:22:21 +0000 Subject: [PATCH] Support Latest APIs. --- VERSION | 2 +- alb/include/alibabacloud/alb/model/CreateListenerRequest.h | 2 ++ alb/include/alibabacloud/alb/model/CreateRuleRequest.h | 1 + alb/include/alibabacloud/alb/model/CreateRulesRequest.h | 1 + .../alibabacloud/alb/model/GetListenerAttributeResult.h | 2 ++ alb/include/alibabacloud/alb/model/ListListenersResult.h | 2 ++ alb/include/alibabacloud/alb/model/ListRulesResult.h | 1 + .../alibabacloud/alb/model/UpdateListenerAttributeRequest.h | 2 ++ .../alibabacloud/alb/model/UpdateRuleAttributeRequest.h | 1 + .../alibabacloud/alb/model/UpdateRulesAttributeRequest.h | 1 + alb/src/model/CreateListenerRequest.cc | 2 ++ alb/src/model/CreateRuleRequest.cc | 1 + alb/src/model/CreateRulesRequest.cc | 1 + alb/src/model/GetListenerAttributeResult.cc | 4 ++++ alb/src/model/ListListenersResult.cc | 4 ++++ alb/src/model/ListRulesResult.cc | 2 ++ alb/src/model/UpdateListenerAttributeRequest.cc | 2 ++ alb/src/model/UpdateRuleAttributeRequest.cc | 1 + alb/src/model/UpdateRulesAttributeRequest.cc | 1 + 19 files changed, 32 insertions(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 83b4e5f59..f55a1df9b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1315 \ No newline at end of file +1.36.1316 \ No newline at end of file diff --git a/alb/include/alibabacloud/alb/model/CreateListenerRequest.h b/alb/include/alibabacloud/alb/model/CreateListenerRequest.h index 2768f475b..b1528d0c7 100644 --- a/alb/include/alibabacloud/alb/model/CreateListenerRequest.h +++ b/alb/include/alibabacloud/alb/model/CreateListenerRequest.h @@ -47,7 +47,9 @@ public: std::string certificateId; }; struct XForwardedForConfig { + std::string xForwardedForClientSourceIpsTrusted; std::string xForwardedForClientCertSubjectDNAlias; + bool xForwardedForClientSourceIpsEnabled; bool xForwardedForClientCertIssuerDNEnabled; bool xForwardedForClientCertFingerprintEnabled; std::string xForwardedForClientCertIssuerDNAlias; diff --git a/alb/include/alibabacloud/alb/model/CreateRuleRequest.h b/alb/include/alibabacloud/alb/model/CreateRuleRequest.h index 082a44e74..a77d9d033 100644 --- a/alb/include/alibabacloud/alb/model/CreateRuleRequest.h +++ b/alb/include/alibabacloud/alb/model/CreateRuleRequest.h @@ -74,6 +74,7 @@ public: InsertHeaderConfig insertHeaderConfig; struct TrafficLimitConfig { int qPS; + int perIpQps; }; TrafficLimitConfig trafficLimitConfig; struct CorsConfig { diff --git a/alb/include/alibabacloud/alb/model/CreateRulesRequest.h b/alb/include/alibabacloud/alb/model/CreateRulesRequest.h index 4390259f9..6cbf43d55 100644 --- a/alb/include/alibabacloud/alb/model/CreateRulesRequest.h +++ b/alb/include/alibabacloud/alb/model/CreateRulesRequest.h @@ -137,6 +137,7 @@ public: InsertHeaderConfig insertHeaderConfig; struct TrafficLimitConfig { int qPS; + int perIpQps; }; TrafficLimitConfig trafficLimitConfig; struct CorsConfig { diff --git a/alb/include/alibabacloud/alb/model/GetListenerAttributeResult.h b/alb/include/alibabacloud/alb/model/GetListenerAttributeResult.h index 4305495e0..6a79a708f 100644 --- a/alb/include/alibabacloud/alb/model/GetListenerAttributeResult.h +++ b/alb/include/alibabacloud/alb/model/GetListenerAttributeResult.h @@ -60,8 +60,10 @@ namespace AlibabaCloud }; struct XForwardedForConfig { + bool xForwardedForClientSourceIpsEnabled; std::string xForwardedForClientCertFingerprintAlias; bool xForwardedForClientCertFingerprintEnabled; + std::string xForwardedForClientSourceIpsTrusted; std::string xForwardedForClientCertIssuerDNAlias; std::string xForwardedForClientCertClientVerifyAlias; bool xForwardedForClientCertSubjectDNEnabled; diff --git a/alb/include/alibabacloud/alb/model/ListListenersResult.h b/alb/include/alibabacloud/alb/model/ListListenersResult.h index 33a83ba6b..0227a0290 100644 --- a/alb/include/alibabacloud/alb/model/ListListenersResult.h +++ b/alb/include/alibabacloud/alb/model/ListListenersResult.h @@ -52,8 +52,10 @@ namespace AlibabaCloud }; struct XForwardedForConfig { + bool xForwardedForClientSourceIpsEnabled; std::string xForwardedForClientCertFingerprintAlias; bool xForwardedForClientCertFingerprintEnabled; + std::string xForwardedForClientSourceIpsTrusted; std::string xForwardedForClientCertIssuerDNAlias; std::string xForwardedForClientCertClientVerifyAlias; bool xForwardedForClientCertSubjectDNEnabled; diff --git a/alb/include/alibabacloud/alb/model/ListRulesResult.h b/alb/include/alibabacloud/alb/model/ListRulesResult.h index 96248b2c9..3b4faba2c 100644 --- a/alb/include/alibabacloud/alb/model/ListRulesResult.h +++ b/alb/include/alibabacloud/alb/model/ListRulesResult.h @@ -99,6 +99,7 @@ namespace AlibabaCloud }; struct TrafficLimitConfig { + int perIpQps; int qPS; }; struct CorsConfig diff --git a/alb/include/alibabacloud/alb/model/UpdateListenerAttributeRequest.h b/alb/include/alibabacloud/alb/model/UpdateListenerAttributeRequest.h index 3d6bbb88c..daef5e14a 100644 --- a/alb/include/alibabacloud/alb/model/UpdateListenerAttributeRequest.h +++ b/alb/include/alibabacloud/alb/model/UpdateListenerAttributeRequest.h @@ -47,7 +47,9 @@ public: std::string certificateId; }; struct XForwardedForConfig { + std::string xForwardedForClientSourceIpsTrusted; std::string xForwardedForClientCertSubjectDNAlias; + bool xForwardedForClientSourceIpsEnabled; bool xForwardedForClientCertIssuerDNEnabled; bool xForwardedForClientCertFingerprintEnabled; std::string xForwardedForClientCertIssuerDNAlias; diff --git a/alb/include/alibabacloud/alb/model/UpdateRuleAttributeRequest.h b/alb/include/alibabacloud/alb/model/UpdateRuleAttributeRequest.h index 85aad5f92..eb5e5f937 100644 --- a/alb/include/alibabacloud/alb/model/UpdateRuleAttributeRequest.h +++ b/alb/include/alibabacloud/alb/model/UpdateRuleAttributeRequest.h @@ -74,6 +74,7 @@ public: InsertHeaderConfig insertHeaderConfig; struct TrafficLimitConfig { int qPS; + int perIpQps; }; TrafficLimitConfig trafficLimitConfig; struct CorsConfig { diff --git a/alb/include/alibabacloud/alb/model/UpdateRulesAttributeRequest.h b/alb/include/alibabacloud/alb/model/UpdateRulesAttributeRequest.h index 5df99f0c1..47827cb1c 100644 --- a/alb/include/alibabacloud/alb/model/UpdateRulesAttributeRequest.h +++ b/alb/include/alibabacloud/alb/model/UpdateRulesAttributeRequest.h @@ -138,6 +138,7 @@ public: InsertHeaderConfig insertHeaderConfig; struct TrafficLimitConfig { int qPS; + int perIpQps; }; TrafficLimitConfig trafficLimitConfig; struct CorsConfig { diff --git a/alb/src/model/CreateListenerRequest.cc b/alb/src/model/CreateListenerRequest.cc index 78a3c6681..d89abdc33 100644 --- a/alb/src/model/CreateListenerRequest.cc +++ b/alb/src/model/CreateListenerRequest.cc @@ -120,7 +120,9 @@ CreateListenerRequest::XForwardedForConfig CreateListenerRequest::getXForwardedF void CreateListenerRequest::setXForwardedForConfig(const CreateListenerRequest::XForwardedForConfig &xForwardedForConfig) { xForwardedForConfig_ = xForwardedForConfig; + setParameter(std::string("XForwardedForConfig") + ".XForwardedForClientSourceIpsTrusted", xForwardedForConfig.xForwardedForClientSourceIpsTrusted); setParameter(std::string("XForwardedForConfig") + ".XForwardedForClientCertSubjectDNAlias", xForwardedForConfig.xForwardedForClientCertSubjectDNAlias); + setParameter(std::string("XForwardedForConfig") + ".XForwardedForClientSourceIpsEnabled", xForwardedForConfig.xForwardedForClientSourceIpsEnabled ? "true" : "false"); setParameter(std::string("XForwardedForConfig") + ".XForwardedForClientCertIssuerDNEnabled", xForwardedForConfig.xForwardedForClientCertIssuerDNEnabled ? "true" : "false"); setParameter(std::string("XForwardedForConfig") + ".XForwardedForClientCertFingerprintEnabled", xForwardedForConfig.xForwardedForClientCertFingerprintEnabled ? "true" : "false"); setParameter(std::string("XForwardedForConfig") + ".XForwardedForClientCertIssuerDNAlias", xForwardedForConfig.xForwardedForClientCertIssuerDNAlias); diff --git a/alb/src/model/CreateRuleRequest.cc b/alb/src/model/CreateRuleRequest.cc index c7b8b84f6..765eebad3 100644 --- a/alb/src/model/CreateRuleRequest.cc +++ b/alb/src/model/CreateRuleRequest.cc @@ -87,6 +87,7 @@ void CreateRuleRequest::setRuleActions(const std::vector & setParameter(std::string("Rules") + "." + std::to_string(dep1 + 1) + ".RuleActions." + std::to_string(dep2 + 1) + ".InsertHeaderConfig.Value", rules[dep1].ruleActions[dep2].insertHeaderConfig.value); setParameter(std::string("Rules") + "." + std::to_string(dep1 + 1) + ".RuleActions." + std::to_string(dep2 + 1) + ".InsertHeaderConfig.Key", rules[dep1].ruleActions[dep2].insertHeaderConfig.key); setParameter(std::string("Rules") + "." + std::to_string(dep1 + 1) + ".RuleActions." + std::to_string(dep2 + 1) + ".TrafficLimitConfig.QPS", std::to_string(rules[dep1].ruleActions[dep2].trafficLimitConfig.qPS)); + setParameter(std::string("Rules") + "." + std::to_string(dep1 + 1) + ".RuleActions." + std::to_string(dep2 + 1) + ".TrafficLimitConfig.PerIpQps", std::to_string(rules[dep1].ruleActions[dep2].trafficLimitConfig.perIpQps)); setParameter(std::string("Rules") + "." + std::to_string(dep1 + 1) + ".RuleActions." + std::to_string(dep2 + 1) + ".CorsConfig.AllowCredentials", rules[dep1].ruleActions[dep2].corsConfig.allowCredentials); for(int dep3 = 0; dep3 != rules[dep1].ruleActions[dep2].corsConfig.allowOrigin.size(); dep3++) { setParameter(std::string("Rules") + "." + std::to_string(dep1 + 1) + ".RuleActions." + std::to_string(dep2 + 1) + ".CorsConfig.AllowOrigin." + std::to_string(dep3 + 1), rules[dep1].ruleActions[dep2].corsConfig.allowOrigin[dep3]); diff --git a/alb/src/model/GetListenerAttributeResult.cc b/alb/src/model/GetListenerAttributeResult.cc index 92afd3b8d..da61ceea0 100644 --- a/alb/src/model/GetListenerAttributeResult.cc +++ b/alb/src/model/GetListenerAttributeResult.cc @@ -131,6 +131,10 @@ void GetListenerAttributeResult::parse(const std::string &payload) xForwardedForConfig_.xForwardedForSLBIdEnabled = xForwardedForConfigNode["XForwardedForSLBIdEnabled"].asString() == "true"; if(!xForwardedForConfigNode["XForwardedForSLBPortEnabled"].isNull()) xForwardedForConfig_.xForwardedForSLBPortEnabled = xForwardedForConfigNode["XForwardedForSLBPortEnabled"].asString() == "true"; + if(!xForwardedForConfigNode["XForwardedForClientSourceIpsEnabled"].isNull()) + xForwardedForConfig_.xForwardedForClientSourceIpsEnabled = xForwardedForConfigNode["XForwardedForClientSourceIpsEnabled"].asString() == "true"; + if(!xForwardedForConfigNode["XForwardedForClientSourceIpsTrusted"].isNull()) + xForwardedForConfig_.xForwardedForClientSourceIpsTrusted = xForwardedForConfigNode["XForwardedForClientSourceIpsTrusted"].asString(); if(!value["CaEnabled"].isNull()) caEnabled_ = value["CaEnabled"].asString() == "true"; if(!value["GzipEnabled"].isNull()) diff --git a/alb/src/model/ListListenersResult.cc b/alb/src/model/ListListenersResult.cc index 9090c6acb..ea318eba7 100644 --- a/alb/src/model/ListListenersResult.cc +++ b/alb/src/model/ListListenersResult.cc @@ -128,6 +128,10 @@ void ListListenersResult::parse(const std::string &payload) listenersObject.xForwardedForConfig.xForwardedForSLBIdEnabled = xForwardedForConfigNode["XForwardedForSLBIdEnabled"].asString() == "true"; if(!xForwardedForConfigNode["XForwardedForSLBPortEnabled"].isNull()) listenersObject.xForwardedForConfig.xForwardedForSLBPortEnabled = xForwardedForConfigNode["XForwardedForSLBPortEnabled"].asString() == "true"; + if(!xForwardedForConfigNode["XForwardedForClientSourceIpsEnabled"].isNull()) + listenersObject.xForwardedForConfig.xForwardedForClientSourceIpsEnabled = xForwardedForConfigNode["XForwardedForClientSourceIpsEnabled"].asString() == "true"; + if(!xForwardedForConfigNode["XForwardedForClientSourceIpsTrusted"].isNull()) + listenersObject.xForwardedForConfig.xForwardedForClientSourceIpsTrusted = xForwardedForConfigNode["XForwardedForClientSourceIpsTrusted"].asString(); listeners_.push_back(listenersObject); } if(!value["MaxResults"].isNull()) diff --git a/alb/src/model/ListRulesResult.cc b/alb/src/model/ListRulesResult.cc index a06db9dcf..8b79304d5 100644 --- a/alb/src/model/ListRulesResult.cc +++ b/alb/src/model/ListRulesResult.cc @@ -141,6 +141,8 @@ void ListRulesResult::parse(const std::string &payload) auto trafficLimitConfigNode = value["TrafficLimitConfig"]; if(!trafficLimitConfigNode["QPS"].isNull()) ruleActionsObject.trafficLimitConfig.qPS = std::stoi(trafficLimitConfigNode["QPS"].asString()); + if(!trafficLimitConfigNode["PerIpQps"].isNull()) + ruleActionsObject.trafficLimitConfig.perIpQps = std::stoi(trafficLimitConfigNode["PerIpQps"].asString()); auto corsConfigNode = value["CorsConfig"]; if(!corsConfigNode["AllowCredentials"].isNull()) ruleActionsObject.corsConfig.allowCredentials = corsConfigNode["AllowCredentials"].asString(); diff --git a/alb/src/model/UpdateListenerAttributeRequest.cc b/alb/src/model/UpdateListenerAttributeRequest.cc index 0687ec08d..c4cb08e95 100644 --- a/alb/src/model/UpdateListenerAttributeRequest.cc +++ b/alb/src/model/UpdateListenerAttributeRequest.cc @@ -120,7 +120,9 @@ UpdateListenerAttributeRequest::XForwardedForConfig UpdateListenerAttributeReque void UpdateListenerAttributeRequest::setXForwardedForConfig(const UpdateListenerAttributeRequest::XForwardedForConfig &xForwardedForConfig) { xForwardedForConfig_ = xForwardedForConfig; + setParameter(std::string("XForwardedForConfig") + ".XForwardedForClientSourceIpsTrusted", xForwardedForConfig.xForwardedForClientSourceIpsTrusted); setParameter(std::string("XForwardedForConfig") + ".XForwardedForClientCertSubjectDNAlias", xForwardedForConfig.xForwardedForClientCertSubjectDNAlias); + setParameter(std::string("XForwardedForConfig") + ".XForwardedForClientSourceIpsEnabled", xForwardedForConfig.xForwardedForClientSourceIpsEnabled ? "true" : "false"); setParameter(std::string("XForwardedForConfig") + ".XForwardedForClientCertIssuerDNEnabled", xForwardedForConfig.xForwardedForClientCertIssuerDNEnabled ? "true" : "false"); setParameter(std::string("XForwardedForConfig") + ".XForwardedForClientCertFingerprintEnabled", xForwardedForConfig.xForwardedForClientCertFingerprintEnabled ? "true" : "false"); setParameter(std::string("XForwardedForConfig") + ".XForwardedForClientCertIssuerDNAlias", xForwardedForConfig.xForwardedForClientCertIssuerDNAlias); diff --git a/alb/src/model/UpdateRuleAttributeRequest.cc b/alb/src/model/UpdateRuleAttributeRequest.cc index 0803ec4e1..5681bc0b1 100644 --- a/alb/src/model/UpdateRuleAttributeRequest.cc +++ b/alb/src/model/UpdateRuleAttributeRequest.cc @@ -69,6 +69,7 @@ void UpdateRuleAttributeRequest::setRuleActions(const std::vector