Browse Source

Support Latest APIs.

sdk-team 3 years ago
parent
commit
1682e58f98

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.36.1315
+1.36.1316

+ 2 - 0
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;

+ 1 - 0
alb/include/alibabacloud/alb/model/CreateRuleRequest.h

@@ -74,6 +74,7 @@ public:
 		InsertHeaderConfig insertHeaderConfig;
 		struct TrafficLimitConfig {
 			int qPS;
+			int perIpQps;
 		};
 		TrafficLimitConfig trafficLimitConfig;
 		struct CorsConfig {

+ 1 - 0
alb/include/alibabacloud/alb/model/CreateRulesRequest.h

@@ -137,6 +137,7 @@ public:
 			InsertHeaderConfig insertHeaderConfig;
 			struct TrafficLimitConfig {
 				int qPS;
+				int perIpQps;
 			};
 			TrafficLimitConfig trafficLimitConfig;
 			struct CorsConfig {

+ 2 - 0
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;

+ 2 - 0
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;

+ 1 - 0
alb/include/alibabacloud/alb/model/ListRulesResult.h

@@ -99,6 +99,7 @@ namespace AlibabaCloud
 						};
 						struct TrafficLimitConfig
 						{
+							int perIpQps;
 							int qPS;
 						};
 						struct CorsConfig

+ 2 - 0
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;

+ 1 - 0
alb/include/alibabacloud/alb/model/UpdateRuleAttributeRequest.h

@@ -74,6 +74,7 @@ public:
 		InsertHeaderConfig insertHeaderConfig;
 		struct TrafficLimitConfig {
 			int qPS;
+			int perIpQps;
 		};
 		TrafficLimitConfig trafficLimitConfig;
 		struct CorsConfig {

+ 1 - 0
alb/include/alibabacloud/alb/model/UpdateRulesAttributeRequest.h

@@ -138,6 +138,7 @@ public:
 			InsertHeaderConfig insertHeaderConfig;
 			struct TrafficLimitConfig {
 				int qPS;
+				int perIpQps;
 			};
 			TrafficLimitConfig trafficLimitConfig;
 			struct CorsConfig {

+ 2 - 0
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);

+ 1 - 0
alb/src/model/CreateRuleRequest.cc

@@ -87,6 +87,7 @@ void CreateRuleRequest::setRuleActions(const std::vector<CreateRuleRequest::Rule
     setParameter(std::string("RuleActions") + "." + std::to_string(dep1 + 1) + ".InsertHeaderConfig.Value", ruleActions[dep1].insertHeaderConfig.value);
     setParameter(std::string("RuleActions") + "." + std::to_string(dep1 + 1) + ".InsertHeaderConfig.Key", ruleActions[dep1].insertHeaderConfig.key);
     setParameter(std::string("RuleActions") + "." + std::to_string(dep1 + 1) + ".TrafficLimitConfig.QPS", std::to_string(ruleActions[dep1].trafficLimitConfig.qPS));
+    setParameter(std::string("RuleActions") + "." + std::to_string(dep1 + 1) + ".TrafficLimitConfig.PerIpQps", std::to_string(ruleActions[dep1].trafficLimitConfig.perIpQps));
     setParameter(std::string("RuleActions") + "." + std::to_string(dep1 + 1) + ".CorsConfig.AllowCredentials", ruleActions[dep1].corsConfig.allowCredentials);
     for(int dep2 = 0; dep2 != ruleActions[dep1].corsConfig.allowOrigin.size(); dep2++) {
       setParameter(std::string("RuleActions") + "." + std::to_string(dep1 + 1) + ".CorsConfig.AllowOrigin." + std::to_string(dep2 + 1), ruleActions[dep1].corsConfig.allowOrigin[dep2]);

+ 1 - 0
alb/src/model/CreateRulesRequest.cc

@@ -97,6 +97,7 @@ void CreateRulesRequest::setRules(const std::vector<CreateRulesRequest::Rules> &
       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]);

+ 4 - 0
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())

+ 4 - 0
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())

+ 2 - 0
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();

+ 2 - 0
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);

+ 1 - 0
alb/src/model/UpdateRuleAttributeRequest.cc

@@ -69,6 +69,7 @@ void UpdateRuleAttributeRequest::setRuleActions(const std::vector<UpdateRuleAttr
     setParameter(std::string("RuleActions") + "." + std::to_string(dep1 + 1) + ".InsertHeaderConfig.Value", ruleActions[dep1].insertHeaderConfig.value);
     setParameter(std::string("RuleActions") + "." + std::to_string(dep1 + 1) + ".InsertHeaderConfig.Key", ruleActions[dep1].insertHeaderConfig.key);
     setParameter(std::string("RuleActions") + "." + std::to_string(dep1 + 1) + ".TrafficLimitConfig.QPS", std::to_string(ruleActions[dep1].trafficLimitConfig.qPS));
+    setParameter(std::string("RuleActions") + "." + std::to_string(dep1 + 1) + ".TrafficLimitConfig.PerIpQps", std::to_string(ruleActions[dep1].trafficLimitConfig.perIpQps));
     setParameter(std::string("RuleActions") + "." + std::to_string(dep1 + 1) + ".CorsConfig.AllowCredentials", ruleActions[dep1].corsConfig.allowCredentials);
     for(int dep2 = 0; dep2 != ruleActions[dep1].corsConfig.allowOrigin.size(); dep2++) {
       setParameter(std::string("RuleActions") + "." + std::to_string(dep1 + 1) + ".CorsConfig.AllowOrigin." + std::to_string(dep2 + 1), ruleActions[dep1].corsConfig.allowOrigin[dep2]);

+ 1 - 0
alb/src/model/UpdateRulesAttributeRequest.cc

@@ -98,6 +98,7 @@ void UpdateRulesAttributeRequest::setRules(const std::vector<UpdateRulesAttribut
       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]);