From e660f66f683a2537a8992c5e833b29e471cbd8c2 Mon Sep 17 00:00:00 2001 From: sdk-team Date: Fri, 28 Jul 2023 03:43:38 +0000 Subject: [PATCH] PatchBaseline Support Tags. --- VERSION | 2 +- .../oos/model/CreateApplicationRequest.h | 10 ++++++ .../oos/model/GetApplicationResult.h | 7 ++++ .../oos/model/UpdateApplicationRequest.h | 19 ++++++++-- oos/src/model/CreateApplicationRequest.cc | 15 ++++++++ oos/src/model/GetApplicationResult.cc | 9 +++++ oos/src/model/UpdateApplicationRequest.cc | 36 +++++++++++++++---- 7 files changed, 88 insertions(+), 10 deletions(-) diff --git a/VERSION b/VERSION index 00ca04a2c..e795d3504 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1691 \ No newline at end of file +1.36.1692 \ No newline at end of file diff --git a/oos/include/alibabacloud/oos/model/CreateApplicationRequest.h b/oos/include/alibabacloud/oos/model/CreateApplicationRequest.h index 64b830ee5..fa6ef5631 100644 --- a/oos/include/alibabacloud/oos/model/CreateApplicationRequest.h +++ b/oos/include/alibabacloud/oos/model/CreateApplicationRequest.h @@ -28,12 +28,21 @@ namespace Oos { namespace Model { class ALIBABACLOUD_OOS_EXPORT CreateApplicationRequest : public RpcServiceRequest { public: + struct AlarmConfig { + std::string string; + std::vector templateIds; + std::string string; + std::vector contactGroups; + std::string healthCheckUrl; + }; CreateApplicationRequest(); ~CreateApplicationRequest(); std::string getClientToken() const; void setClientToken(const std::string &clientToken); std::string getDescription() const; void setDescription(const std::string &description); + AlarmConfig getAlarmConfig() const; + void setAlarmConfig(const AlarmConfig &alarmConfig); std::string getResourceGroupId() const; void setResourceGroupId(const std::string &resourceGroupId); std::string getRegionId() const; @@ -46,6 +55,7 @@ public: private: std::string clientToken_; std::string description_; + AlarmConfig alarmConfig_; std::string resourceGroupId_; std::string regionId_; std::string tags_; diff --git a/oos/include/alibabacloud/oos/model/GetApplicationResult.h b/oos/include/alibabacloud/oos/model/GetApplicationResult.h index 4b3a6f9c3..57cc2b759 100644 --- a/oos/include/alibabacloud/oos/model/GetApplicationResult.h +++ b/oos/include/alibabacloud/oos/model/GetApplicationResult.h @@ -34,12 +34,19 @@ namespace AlibabaCloud public: struct Application { + struct AlarmConfig + { + std::vector contactGroups; + std::string healthCheckUrl; + std::vector templateIds; + }; std::string updateDate; std::string applicationType; std::string description; std::string resourceGroupId; std::string createDate; std::string tags; + AlarmConfig alarmConfig; std::string name; }; diff --git a/oos/include/alibabacloud/oos/model/UpdateApplicationRequest.h b/oos/include/alibabacloud/oos/model/UpdateApplicationRequest.h index 090fce37e..da0a0b489 100644 --- a/oos/include/alibabacloud/oos/model/UpdateApplicationRequest.h +++ b/oos/include/alibabacloud/oos/model/UpdateApplicationRequest.h @@ -28,21 +28,34 @@ namespace Oos { namespace Model { class ALIBABACLOUD_OOS_EXPORT UpdateApplicationRequest : public RpcServiceRequest { public: + struct AlarmConfig { + std::string string; + std::vector templateIds; + std::string string; + std::vector contactGroups; + std::string healthCheckUrl; + }; UpdateApplicationRequest(); ~UpdateApplicationRequest(); std::string getDescription() const; void setDescription(const std::string &description); - std::map getTags() const; - void setTags(const std::map &tags); + AlarmConfig getAlarmConfig() const; + void setAlarmConfig(const AlarmConfig &alarmConfig); + bool getDeleteAlarmRulesBeforeUpdate() const; + void setDeleteAlarmRulesBeforeUpdate(bool deleteAlarmRulesBeforeUpdate); std::string getRegionId() const; void setRegionId(const std::string ®ionId); + std::map getTags() const; + void setTags(const std::map &tags); std::string getName() const; void setName(const std::string &name); private: std::string description_; - std::map tags_; + AlarmConfig alarmConfig_; + bool deleteAlarmRulesBeforeUpdate_; std::string regionId_; + std::map tags_; std::string name_; }; } // namespace Model diff --git a/oos/src/model/CreateApplicationRequest.cc b/oos/src/model/CreateApplicationRequest.cc index 88eb93df2..a7ec7d023 100644 --- a/oos/src/model/CreateApplicationRequest.cc +++ b/oos/src/model/CreateApplicationRequest.cc @@ -43,6 +43,21 @@ void CreateApplicationRequest::setDescription(const std::string &description) { setParameter(std::string("Description"), description); } +CreateApplicationRequest::AlarmConfig CreateApplicationRequest::getAlarmConfig() const { + return alarmConfig_; +} + +void CreateApplicationRequest::setAlarmConfig(const CreateApplicationRequest::AlarmConfig &alarmConfig) { + alarmConfig_ = alarmConfig; + for(int dep1 = 0; dep1 != alarmConfig.templateIds.size(); dep1++) { + setParameter(std::string("AlarmConfig") + ".TemplateIds." + std::to_string(dep1 + 1), alarmConfig.templateIds[dep1]); + } + for(int dep1 = 0; dep1 != alarmConfig.contactGroups.size(); dep1++) { + setParameter(std::string("AlarmConfig") + ".ContactGroups." + std::to_string(dep1 + 1), alarmConfig.contactGroups[dep1]); + } + setParameter(std::string("AlarmConfig") + ".HealthCheckUrl", alarmConfig.healthCheckUrl); +} + std::string CreateApplicationRequest::getResourceGroupId() const { return resourceGroupId_; } diff --git a/oos/src/model/GetApplicationResult.cc b/oos/src/model/GetApplicationResult.cc index e6b208b80..e4a2af0dd 100644 --- a/oos/src/model/GetApplicationResult.cc +++ b/oos/src/model/GetApplicationResult.cc @@ -54,6 +54,15 @@ void GetApplicationResult::parse(const std::string &payload) application_.createDate = applicationNode["CreateDate"].asString(); if(!applicationNode["ApplicationType"].isNull()) application_.applicationType = applicationNode["ApplicationType"].asString(); + auto alarmConfigNode = applicationNode["AlarmConfig"]; + if(!alarmConfigNode["HealthCheckUrl"].isNull()) + application_.alarmConfig.healthCheckUrl = alarmConfigNode["HealthCheckUrl"].asString(); + auto allContactGroups = alarmConfigNode["ContactGroups"]["ContactGroup"]; + for (auto value : allContactGroups) + application_.alarmConfig.contactGroups.push_back(value.asString()); + auto allTemplateIds = alarmConfigNode["TemplateIds"]["TemplateId"]; + for (auto value : allTemplateIds) + application_.alarmConfig.templateIds.push_back(value.asString()); } diff --git a/oos/src/model/UpdateApplicationRequest.cc b/oos/src/model/UpdateApplicationRequest.cc index 944ab94e8..0d51f6948 100644 --- a/oos/src/model/UpdateApplicationRequest.cc +++ b/oos/src/model/UpdateApplicationRequest.cc @@ -34,15 +34,28 @@ void UpdateApplicationRequest::setDescription(const std::string &description) { setParameter(std::string("Description"), description); } -std::map UpdateApplicationRequest::getTags() const { - return tags_; +UpdateApplicationRequest::AlarmConfig UpdateApplicationRequest::getAlarmConfig() const { + return alarmConfig_; } -void UpdateApplicationRequest::setTags(const std::map &tags) { - tags_ = tags; - for(auto const &iter1 : tags) { - setParameter(std::string("Tags") + "." + iter1.first, iter1.second); +void UpdateApplicationRequest::setAlarmConfig(const UpdateApplicationRequest::AlarmConfig &alarmConfig) { + alarmConfig_ = alarmConfig; + for(int dep1 = 0; dep1 != alarmConfig.templateIds.size(); dep1++) { + setParameter(std::string("AlarmConfig") + ".TemplateIds." + std::to_string(dep1 + 1), alarmConfig.templateIds[dep1]); } + for(int dep1 = 0; dep1 != alarmConfig.contactGroups.size(); dep1++) { + setParameter(std::string("AlarmConfig") + ".ContactGroups." + std::to_string(dep1 + 1), alarmConfig.contactGroups[dep1]); + } + setParameter(std::string("AlarmConfig") + ".HealthCheckUrl", alarmConfig.healthCheckUrl); +} + +bool UpdateApplicationRequest::getDeleteAlarmRulesBeforeUpdate() const { + return deleteAlarmRulesBeforeUpdate_; +} + +void UpdateApplicationRequest::setDeleteAlarmRulesBeforeUpdate(bool deleteAlarmRulesBeforeUpdate) { + deleteAlarmRulesBeforeUpdate_ = deleteAlarmRulesBeforeUpdate; + setParameter(std::string("DeleteAlarmRulesBeforeUpdate"), deleteAlarmRulesBeforeUpdate ? "true" : "false"); } std::string UpdateApplicationRequest::getRegionId() const { @@ -54,6 +67,17 @@ void UpdateApplicationRequest::setRegionId(const std::string ®ionId) { setParameter(std::string("RegionId"), regionId); } +std::map UpdateApplicationRequest::getTags() const { + return tags_; +} + +void UpdateApplicationRequest::setTags(const std::map &tags) { + tags_ = tags; + for(auto const &iter1 : tags) { + setParameter(std::string("Tags") + "." + iter1.first, iter1.second); + } +} + std::string UpdateApplicationRequest::getName() const { return name_; }