Create AppGroup Support Set AppVersion.

aliyun · Jun 25, 2024 · b2cade3 · b2cade3
1 parent 5d8d514
commit b2cade3
Show file tree

Hide file tree

Showing 20 changed files with 154 additions and 88 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.36.1939
+1.36.1940
diff --git a/schedulerx2/include/alibabacloud/schedulerx2/model/CreateAppGroupRequest.h b/schedulerx2/include/alibabacloud/schedulerx2/model/CreateAppGroupRequest.h
@@ -54,6 +54,8 @@ class ALIBABACLOUD_SCHEDULERX2_EXPORT CreateAppGroupRequest : public RpcServiceR
 	void setGroupId(const std::string &groupId);
 	int getAppType() const;
 	void setAppType(int appType);
+	int getAppVersion() const;
+	void setAppVersion(int appVersion);
 	std::string getMonitorConfigJson() const;
 	void setMonitorConfigJson(const std::string &monitorConfigJson);
 	std::string get_Namespace() const;
@@ -78,6 +80,7 @@ class ALIBABACLOUD_SCHEDULERX2_EXPORT CreateAppGroupRequest : public RpcServiceR
 	std::string metricsThresholdJson_;
 	std::string groupId_;
 	int appType_;
+	int appVersion_;
 	std::string monitorConfigJson_;
 	std::string _namespace_;
 	std::string xattrs_;

diff --git a/schedulerx2/include/alibabacloud/schedulerx2/model/CreateRouteStrategyRequest.h b/schedulerx2/include/alibabacloud/schedulerx2/model/CreateRouteStrategyRequest.h
@@ -30,16 +30,16 @@ class ALIBABACLOUD_SCHEDULERX2_EXPORT CreateRouteStrategyRequest : public RpcSer
 public:
 	CreateRouteStrategyRequest();
 	~CreateRouteStrategyRequest();
-	std::string getGroupId() const;
-	void setGroupId(const std::string &groupId);
-	std::string getStrategyContent() const;
-	void setStrategyContent(const std::string &strategyContent);
 	int getType() const;
 	void setType(int type);
 	long getJobId() const;
 	void setJobId(long jobId);
 	std::string getRegionId() const;
 	void setRegionId(const std::string &regionId);
+	std::string getGroupId() const;
+	void setGroupId(const std::string &groupId);
+	std::string getStrategyContent() const;
+	void setStrategyContent(const std::string &strategyContent);
 	std::string getName() const;
 	void setName(const std::string &name);
 	std::string get_Namespace() const;
@@ -48,11 +48,11 @@ class ALIBABACLOUD_SCHEDULERX2_EXPORT CreateRouteStrategyRequest : public RpcSer
 	void setStatus(int status);
 
 private:
-	std::string groupId_;
-	std::string strategyContent_;
 	int type_;
 	long jobId_;
 	std::string regionId_;
+	std::string groupId_;
+	std::string strategyContent_;
 	std::string name_;
 	std::string _namespace_;
 	int status_;

diff --git a/schedulerx2/include/alibabacloud/schedulerx2/model/DescribeRegionsRequest.h b/schedulerx2/include/alibabacloud/schedulerx2/model/DescribeRegionsRequest.h
@@ -30,8 +30,11 @@ class ALIBABACLOUD_SCHEDULERX2_EXPORT DescribeRegionsRequest : public RpcService
 public:
 	DescribeRegionsRequest();
 	~DescribeRegionsRequest();
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 
 private:
+	std::string regionId_;
 };
 } // namespace Model
 } // namespace Schedulerx2

diff --git a/schedulerx2/include/alibabacloud/schedulerx2/model/GetAppGroupResult.h b/schedulerx2/include/alibabacloud/schedulerx2/model/GetAppGroupResult.h
@@ -39,6 +39,7 @@ namespace AlibabaCloud
 					int maxConcurrency;
 					std::string appName;
 					std::string groupId;
+					std::string appVersion;
 					std::string monitorConfigJson;
 					int readyInstanceNum;
 					long appGroupId;

diff --git a/schedulerx2/include/alibabacloud/schedulerx2/model/GetJobInstanceListRequest.h b/schedulerx2/include/alibabacloud/schedulerx2/model/GetJobInstanceListRequest.h
@@ -32,28 +32,34 @@ class ALIBABACLOUD_SCHEDULERX2_EXPORT GetJobInstanceListRequest : public RpcServ
 	~GetJobInstanceListRequest();
 	std::string getNamespaceSource() const;
 	void setNamespaceSource(const std::string &namespaceSource);
-	std::string getGroupId() const;
-	void setGroupId(const std::string &groupId);
 	long getStartTimestamp() const;
 	void setStartTimestamp(long startTimestamp);
+	int getPageNum() const;
+	void setPageNum(int pageNum);
 	long getEndTimestamp() const;
 	void setEndTimestamp(long endTimestamp);
 	long getJobId() const;
 	void setJobId(long jobId);
 	std::string getRegionId() const;
 	void setRegionId(const std::string &regionId);
+	int getPageSize() const;
+	void setPageSize(int pageSize);
+	std::string getGroupId() const;
+	void setGroupId(const std::string &groupId);
 	std::string get_Namespace() const;
 	void set_Namespace(const std::string &_namespace);
 	int getStatus() const;
 	void setStatus(int status);
 
 private:
 	std::string namespaceSource_;
-	std::string groupId_;
 	long startTimestamp_;
+	int pageNum_;
 	long endTimestamp_;
 	long jobId_;
 	std::string regionId_;
+	int pageSize_;
+	std::string groupId_;
 	std::string _namespace_;
 	int status_;
 };

diff --git a/schedulerx2/include/alibabacloud/schedulerx2/model/GetOverviewRequest.h b/schedulerx2/include/alibabacloud/schedulerx2/model/GetOverviewRequest.h
@@ -34,27 +34,27 @@ class ALIBABACLOUD_SCHEDULERX2_EXPORT GetOverviewRequest : public RpcServiceRequ
 	void setMetricType(int metricType);
 	std::string getNamespaceSource() const;
 	void setNamespaceSource(const std::string &namespaceSource);
+	long getStartTime() const;
+	void setStartTime(long startTime);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
 	std::string getGroupId() const;
 	void setGroupId(const std::string &groupId);
 	long getEndTime() const;
 	void setEndTime(long endTime);
-	long getStartTime() const;
-	void setStartTime(long startTime);
 	std::string getOperate() const;
 	void setOperate(const std::string &operate);
-	std::string getRegionId() const;
-	void setRegionId(const std::string &regionId);
 	std::string get_Namespace() const;
 	void set_Namespace(const std::string &_namespace);
 
 private:
 	int metricType_;
 	std::string namespaceSource_;
+	long startTime_;
+	std::string regionId_;
 	std::string groupId_;
 	long endTime_;
-	long startTime_;
 	std::string operate_;
-	std::string regionId_;
 	std::string _namespace_;
 };
 } // namespace Model

diff --git a/schedulerx2/include/alibabacloud/schedulerx2/model/ListGroupsResult.h b/schedulerx2/include/alibabacloud/schedulerx2/model/ListGroupsResult.h
@@ -36,6 +36,7 @@ namespace AlibabaCloud
 				{
 					struct AppGroup
 					{
+						int appVersion;
 						std::string description;
 						long appGroupId;
 						std::string appKey;

diff --git a/schedulerx2/include/alibabacloud/schedulerx2/model/RerunJobRequest.h b/schedulerx2/include/alibabacloud/schedulerx2/model/RerunJobRequest.h
@@ -34,27 +34,27 @@ class ALIBABACLOUD_SCHEDULERX2_EXPORT RerunJobRequest : public RpcServiceRequest
 	void setNamespaceSource(const std::string &namespaceSource);
 	std::string getDataTime() const;
 	void setDataTime(const std::string &dataTime);
-	std::string getGroupId() const;
-	void setGroupId(const std::string &groupId);
 	long getStartDate() const;
 	void setStartDate(long startDate);
 	long getJobId() const;
 	void setJobId(long jobId);
-	long getEndDate() const;
-	void setEndDate(long endDate);
 	std::string getRegionId() const;
 	void setRegionId(const std::string &regionId);
+	std::string getGroupId() const;
+	void setGroupId(const std::string &groupId);
+	long getEndDate() const;
+	void setEndDate(long endDate);
 	std::string get_Namespace() const;
 	void set_Namespace(const std::string &_namespace);
 
 private:
 	std::string namespaceSource_;
 	std::string dataTime_;
-	std::string groupId_;
 	long startDate_;
 	long jobId_;
-	long endDate_;
 	std::string regionId_;
+	std::string groupId_;
+	long endDate_;
 	std::string _namespace_;
 };
 } // namespace Model

diff --git a/schedulerx2/include/alibabacloud/schedulerx2/model/UpdateAppGroupRequest.h b/schedulerx2/include/alibabacloud/schedulerx2/model/UpdateAppGroupRequest.h
@@ -44,6 +44,8 @@ class ALIBABACLOUD_SCHEDULERX2_EXPORT UpdateAppGroupRequest : public RpcServiceR
 	void setMetricsThresholdJson(const std::string &metricsThresholdJson);
 	std::string getGroupId() const;
 	void setGroupId(const std::string &groupId);
+	int getAppVersion() const;
+	void setAppVersion(int appVersion);
 	std::string get_Namespace() const;
 	void set_Namespace(const std::string &_namespace);
 	std::string getXattrs() const;
@@ -59,6 +61,7 @@ class ALIBABACLOUD_SCHEDULERX2_EXPORT UpdateAppGroupRequest : public RpcServiceR
 	int maxJobs_;
 	std::string metricsThresholdJson_;
 	std::string groupId_;
+	int appVersion_;
 	std::string _namespace_;
 	std::string xattrs_;
 	int maxConcurrency_;

diff --git a/schedulerx2/src/Schedulerx2Client.cc b/schedulerx2/src/Schedulerx2Client.cc
@@ -31,21 +31,21 @@ Schedulerx2Client::Schedulerx2Client(const Credentials &credentials, const Clien
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(credentials), configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(credentials, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "schedulerx2");
 }
 
 Schedulerx2Client::Schedulerx2Client(const std::shared_ptr<CredentialsProvider>& credentialsProvider, const ClientConfiguration & configuration) :
 	RpcServiceClient(SERVICE_NAME, credentialsProvider, configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(credentialsProvider, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "schedulerx2");
 }
 
 Schedulerx2Client::Schedulerx2Client(const std::string & accessKeyId, const std::string & accessKeySecret, const ClientConfiguration & configuration) :
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(accessKeyId, accessKeySecret), configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(accessKeyId, accessKeySecret, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "schedulerx2");
 }
 
 Schedulerx2Client::~Schedulerx2Client()

diff --git a/schedulerx2/src/model/CreateAppGroupRequest.cc b/schedulerx2/src/model/CreateAppGroupRequest.cc
@@ -133,6 +133,15 @@ void CreateAppGroupRequest::setAppType(int appType) {
   setParameter(std::string("AppType"), std::to_string(appType));
 }
 
+int CreateAppGroupRequest::getAppVersion() const {
+  return appVersion_;
+}
+
+void CreateAppGroupRequest::setAppVersion(int appVersion) {
+  appVersion_ = appVersion;
+  setParameter(std::string("AppVersion"), std::to_string(appVersion));
+}
+
 std::string CreateAppGroupRequest::getMonitorConfigJson() const {
   return monitorConfigJson_;
 }

diff --git a/schedulerx2/src/model/CreateRouteStrategyRequest.cc b/schedulerx2/src/model/CreateRouteStrategyRequest.cc
@@ -25,24 +25,6 @@ CreateRouteStrategyRequest::CreateRouteStrategyRequest()
 
 CreateRouteStrategyRequest::~CreateRouteStrategyRequest() {}
 
-std::string CreateRouteStrategyRequest::getGroupId() const {
-  return groupId_;
-}
-
-void CreateRouteStrategyRequest::setGroupId(const std::string &groupId) {
-  groupId_ = groupId;
-  setParameter(std::string("GroupId"), groupId);
-}
-
-std::string CreateRouteStrategyRequest::getStrategyContent() const {
-  return strategyContent_;
-}
-
-void CreateRouteStrategyRequest::setStrategyContent(const std::string &strategyContent) {
-  strategyContent_ = strategyContent;
-  setParameter(std::string("StrategyContent"), strategyContent);
-}
-
 int CreateRouteStrategyRequest::getType() const {
   return type_;
 }
@@ -70,6 +52,24 @@ void CreateRouteStrategyRequest::setRegionId(const std::string &regionId) {
   setParameter(std::string("RegionId"), regionId);
 }
 
+std::string CreateRouteStrategyRequest::getGroupId() const {
+  return groupId_;
+}
+
+void CreateRouteStrategyRequest::setGroupId(const std::string &groupId) {
+  groupId_ = groupId;
+  setParameter(std::string("GroupId"), groupId);
+}
+
+std::string CreateRouteStrategyRequest::getStrategyContent() const {
+  return strategyContent_;
+}
+
+void CreateRouteStrategyRequest::setStrategyContent(const std::string &strategyContent) {
+  strategyContent_ = strategyContent;
+  setParameter(std::string("StrategyContent"), strategyContent);
+}
+
 std::string CreateRouteStrategyRequest::getName() const {
   return name_;
 }

diff --git a/schedulerx2/src/model/DescribeRegionsRequest.cc b/schedulerx2/src/model/DescribeRegionsRequest.cc
@@ -25,3 +25,12 @@ DescribeRegionsRequest::DescribeRegionsRequest()
 
 DescribeRegionsRequest::~DescribeRegionsRequest() {}
 
+std::string DescribeRegionsRequest::getRegionId() const {
+  return regionId_;
+}
+
+void DescribeRegionsRequest::setRegionId(const std::string &regionId) {
+  regionId_ = regionId;
+  setParameter(std::string("RegionId"), regionId);
+}
+
diff --git a/schedulerx2/src/model/GetAppGroupResult.cc b/schedulerx2/src/model/GetAppGroupResult.cc
@@ -68,6 +68,8 @@ void GetAppGroupResult::parse(const std::string &payload)
 		data_.appKey = dataNode["AppKey"].asString();
 	if(!dataNode["Xattrs"].isNull())
 		data_.xattrs = dataNode["Xattrs"].asString();
+	if(!dataNode["AppVersion"].isNull())
+		data_.appVersion = dataNode["AppVersion"].asString();
 	if(!value["Code"].isNull())
 		code_ = std::stoi(value["Code"].asString());
 	if(!value["Message"].isNull())

diff --git a/schedulerx2/src/model/GetJobInstanceListRequest.cc b/schedulerx2/src/model/GetJobInstanceListRequest.cc
@@ -34,15 +34,6 @@ void GetJobInstanceListRequest::setNamespaceSource(const std::string &namespaceS
   setParameter(std::string("NamespaceSource"), namespaceSource);
 }
 
-std::string GetJobInstanceListRequest::getGroupId() const {
-  return groupId_;
-}
-
-void GetJobInstanceListRequest::setGroupId(const std::string &groupId) {
-  groupId_ = groupId;
-  setParameter(std::string("GroupId"), groupId);
-}
-
 long GetJobInstanceListRequest::getStartTimestamp() const {
   return startTimestamp_;
 }
@@ -52,6 +43,15 @@ void GetJobInstanceListRequest::setStartTimestamp(long startTimestamp) {
   setParameter(std::string("StartTimestamp"), std::to_string(startTimestamp));
 }
 
+int GetJobInstanceListRequest::getPageNum() const {
+  return pageNum_;
+}
+
+void GetJobInstanceListRequest::setPageNum(int pageNum) {
+  pageNum_ = pageNum;
+  setParameter(std::string("PageNum"), std::to_string(pageNum));
+}
+
 long GetJobInstanceListRequest::getEndTimestamp() const {
   return endTimestamp_;
 }
@@ -79,6 +79,24 @@ void GetJobInstanceListRequest::setRegionId(const std::string &regionId) {
   setParameter(std::string("RegionId"), regionId);
 }
 
+int GetJobInstanceListRequest::getPageSize() const {
+  return pageSize_;
+}
+
+void GetJobInstanceListRequest::setPageSize(int pageSize) {
+  pageSize_ = pageSize;
+  setParameter(std::string("PageSize"), std::to_string(pageSize));
+}
+
+std::string GetJobInstanceListRequest::getGroupId() const {
+  return groupId_;
+}
+
+void GetJobInstanceListRequest::setGroupId(const std::string &groupId) {
+  groupId_ = groupId;
+  setParameter(std::string("GroupId"), groupId);
+}
+
 std::string GetJobInstanceListRequest::get_Namespace() const {
   return _namespace_;
 }