diff --git a/CHANGELOG b/CHANGELOG index 01ec5d420..a064b2cd3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2021-02-19 Version: patch +- Generated 2020-01-11 for `servicemesh`. + 2021-02-19 Version: patch - Add new API for recording. diff --git a/servicemesh/CMakeLists.txt b/servicemesh/CMakeLists.txt index 57906b293..b4f187b14 100644 --- a/servicemesh/CMakeLists.txt +++ b/servicemesh/CMakeLists.txt @@ -49,6 +49,8 @@ set(servicemesh_public_header_model include/alibabacloud/servicemesh/model/DescribeServiceMeshesResult.h include/alibabacloud/servicemesh/model/DescribeUpgradeVersionRequest.h include/alibabacloud/servicemesh/model/DescribeUpgradeVersionResult.h + include/alibabacloud/servicemesh/model/GetAutoInjectionLabelSyncStatusRequest.h + include/alibabacloud/servicemesh/model/GetAutoInjectionLabelSyncStatusResult.h include/alibabacloud/servicemesh/model/GetDiagnosisRequest.h include/alibabacloud/servicemesh/model/GetDiagnosisResult.h include/alibabacloud/servicemesh/model/GetRegisteredServiceEndpointsRequest.h @@ -59,6 +61,8 @@ set(servicemesh_public_header_model include/alibabacloud/servicemesh/model/GetRegisteredServicesResult.h include/alibabacloud/servicemesh/model/GetServiceMeshSlbRequest.h include/alibabacloud/servicemesh/model/GetServiceMeshSlbResult.h + include/alibabacloud/servicemesh/model/GetServiceRegistrySourceRequest.h + include/alibabacloud/servicemesh/model/GetServiceRegistrySourceResult.h include/alibabacloud/servicemesh/model/GetVmAppMeshInfoRequest.h include/alibabacloud/servicemesh/model/GetVmAppMeshInfoResult.h include/alibabacloud/servicemesh/model/GetVmMetaRequest.h @@ -69,6 +73,8 @@ set(servicemesh_public_header_model include/alibabacloud/servicemesh/model/RemoveVmAppFromMeshResult.h include/alibabacloud/servicemesh/model/RunDiagnosisRequest.h include/alibabacloud/servicemesh/model/RunDiagnosisResult.h + include/alibabacloud/servicemesh/model/SetServiceRegistrySourceRequest.h + include/alibabacloud/servicemesh/model/SetServiceRegistrySourceResult.h include/alibabacloud/servicemesh/model/UpdateIstioInjectionConfigRequest.h include/alibabacloud/servicemesh/model/UpdateIstioInjectionConfigResult.h include/alibabacloud/servicemesh/model/UpdateMeshFeatureRequest.h @@ -106,6 +112,8 @@ set(servicemesh_src src/model/DescribeServiceMeshesResult.cc src/model/DescribeUpgradeVersionRequest.cc src/model/DescribeUpgradeVersionResult.cc + src/model/GetAutoInjectionLabelSyncStatusRequest.cc + src/model/GetAutoInjectionLabelSyncStatusResult.cc src/model/GetDiagnosisRequest.cc src/model/GetDiagnosisResult.cc src/model/GetRegisteredServiceEndpointsRequest.cc @@ -116,6 +124,8 @@ set(servicemesh_src src/model/GetRegisteredServicesResult.cc src/model/GetServiceMeshSlbRequest.cc src/model/GetServiceMeshSlbResult.cc + src/model/GetServiceRegistrySourceRequest.cc + src/model/GetServiceRegistrySourceResult.cc src/model/GetVmAppMeshInfoRequest.cc src/model/GetVmAppMeshInfoResult.cc src/model/GetVmMetaRequest.cc @@ -126,6 +136,8 @@ set(servicemesh_src src/model/RemoveVmAppFromMeshResult.cc src/model/RunDiagnosisRequest.cc src/model/RunDiagnosisResult.cc + src/model/SetServiceRegistrySourceRequest.cc + src/model/SetServiceRegistrySourceResult.cc src/model/UpdateIstioInjectionConfigRequest.cc src/model/UpdateIstioInjectionConfigResult.cc src/model/UpdateMeshFeatureRequest.cc diff --git a/servicemesh/include/alibabacloud/servicemesh/ServicemeshClient.h b/servicemesh/include/alibabacloud/servicemesh/ServicemeshClient.h index 179ad87df..fae901db7 100644 --- a/servicemesh/include/alibabacloud/servicemesh/ServicemeshClient.h +++ b/servicemesh/include/alibabacloud/servicemesh/ServicemeshClient.h @@ -50,6 +50,8 @@ #include "model/DescribeServiceMeshesResult.h" #include "model/DescribeUpgradeVersionRequest.h" #include "model/DescribeUpgradeVersionResult.h" +#include "model/GetAutoInjectionLabelSyncStatusRequest.h" +#include "model/GetAutoInjectionLabelSyncStatusResult.h" #include "model/GetDiagnosisRequest.h" #include "model/GetDiagnosisResult.h" #include "model/GetRegisteredServiceEndpointsRequest.h" @@ -60,6 +62,8 @@ #include "model/GetRegisteredServicesResult.h" #include "model/GetServiceMeshSlbRequest.h" #include "model/GetServiceMeshSlbResult.h" +#include "model/GetServiceRegistrySourceRequest.h" +#include "model/GetServiceRegistrySourceResult.h" #include "model/GetVmAppMeshInfoRequest.h" #include "model/GetVmAppMeshInfoResult.h" #include "model/GetVmMetaRequest.h" @@ -70,6 +74,8 @@ #include "model/RemoveVmAppFromMeshResult.h" #include "model/RunDiagnosisRequest.h" #include "model/RunDiagnosisResult.h" +#include "model/SetServiceRegistrySourceRequest.h" +#include "model/SetServiceRegistrySourceResult.h" #include "model/UpdateIstioInjectionConfigRequest.h" #include "model/UpdateIstioInjectionConfigResult.h" #include "model/UpdateMeshFeatureRequest.h" @@ -127,6 +133,9 @@ namespace AlibabaCloud typedef Outcome DescribeUpgradeVersionOutcome; typedef std::future DescribeUpgradeVersionOutcomeCallable; typedef std::function&)> DescribeUpgradeVersionAsyncHandler; + typedef Outcome GetAutoInjectionLabelSyncStatusOutcome; + typedef std::future GetAutoInjectionLabelSyncStatusOutcomeCallable; + typedef std::function&)> GetAutoInjectionLabelSyncStatusAsyncHandler; typedef Outcome GetDiagnosisOutcome; typedef std::future GetDiagnosisOutcomeCallable; typedef std::function&)> GetDiagnosisAsyncHandler; @@ -142,6 +151,9 @@ namespace AlibabaCloud typedef Outcome GetServiceMeshSlbOutcome; typedef std::future GetServiceMeshSlbOutcomeCallable; typedef std::function&)> GetServiceMeshSlbAsyncHandler; + typedef Outcome GetServiceRegistrySourceOutcome; + typedef std::future GetServiceRegistrySourceOutcomeCallable; + typedef std::function&)> GetServiceRegistrySourceAsyncHandler; typedef Outcome GetVmAppMeshInfoOutcome; typedef std::future GetVmAppMeshInfoOutcomeCallable; typedef std::function&)> GetVmAppMeshInfoAsyncHandler; @@ -157,6 +169,9 @@ namespace AlibabaCloud typedef Outcome RunDiagnosisOutcome; typedef std::future RunDiagnosisOutcomeCallable; typedef std::function&)> RunDiagnosisAsyncHandler; + typedef Outcome SetServiceRegistrySourceOutcome; + typedef std::future SetServiceRegistrySourceOutcomeCallable; + typedef std::function&)> SetServiceRegistrySourceAsyncHandler; typedef Outcome UpdateIstioInjectionConfigOutcome; typedef std::future UpdateIstioInjectionConfigOutcomeCallable; typedef std::function&)> UpdateIstioInjectionConfigAsyncHandler; @@ -213,6 +228,9 @@ namespace AlibabaCloud DescribeUpgradeVersionOutcome describeUpgradeVersion(const Model::DescribeUpgradeVersionRequest &request)const; void describeUpgradeVersionAsync(const Model::DescribeUpgradeVersionRequest& request, const DescribeUpgradeVersionAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; DescribeUpgradeVersionOutcomeCallable describeUpgradeVersionCallable(const Model::DescribeUpgradeVersionRequest& request) const; + GetAutoInjectionLabelSyncStatusOutcome getAutoInjectionLabelSyncStatus(const Model::GetAutoInjectionLabelSyncStatusRequest &request)const; + void getAutoInjectionLabelSyncStatusAsync(const Model::GetAutoInjectionLabelSyncStatusRequest& request, const GetAutoInjectionLabelSyncStatusAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; + GetAutoInjectionLabelSyncStatusOutcomeCallable getAutoInjectionLabelSyncStatusCallable(const Model::GetAutoInjectionLabelSyncStatusRequest& request) const; GetDiagnosisOutcome getDiagnosis(const Model::GetDiagnosisRequest &request)const; void getDiagnosisAsync(const Model::GetDiagnosisRequest& request, const GetDiagnosisAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; GetDiagnosisOutcomeCallable getDiagnosisCallable(const Model::GetDiagnosisRequest& request) const; @@ -228,6 +246,9 @@ namespace AlibabaCloud GetServiceMeshSlbOutcome getServiceMeshSlb(const Model::GetServiceMeshSlbRequest &request)const; void getServiceMeshSlbAsync(const Model::GetServiceMeshSlbRequest& request, const GetServiceMeshSlbAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; GetServiceMeshSlbOutcomeCallable getServiceMeshSlbCallable(const Model::GetServiceMeshSlbRequest& request) const; + GetServiceRegistrySourceOutcome getServiceRegistrySource(const Model::GetServiceRegistrySourceRequest &request)const; + void getServiceRegistrySourceAsync(const Model::GetServiceRegistrySourceRequest& request, const GetServiceRegistrySourceAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; + GetServiceRegistrySourceOutcomeCallable getServiceRegistrySourceCallable(const Model::GetServiceRegistrySourceRequest& request) const; GetVmAppMeshInfoOutcome getVmAppMeshInfo(const Model::GetVmAppMeshInfoRequest &request)const; void getVmAppMeshInfoAsync(const Model::GetVmAppMeshInfoRequest& request, const GetVmAppMeshInfoAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; GetVmAppMeshInfoOutcomeCallable getVmAppMeshInfoCallable(const Model::GetVmAppMeshInfoRequest& request) const; @@ -243,6 +264,9 @@ namespace AlibabaCloud RunDiagnosisOutcome runDiagnosis(const Model::RunDiagnosisRequest &request)const; void runDiagnosisAsync(const Model::RunDiagnosisRequest& request, const RunDiagnosisAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; RunDiagnosisOutcomeCallable runDiagnosisCallable(const Model::RunDiagnosisRequest& request) const; + SetServiceRegistrySourceOutcome setServiceRegistrySource(const Model::SetServiceRegistrySourceRequest &request)const; + void setServiceRegistrySourceAsync(const Model::SetServiceRegistrySourceRequest& request, const SetServiceRegistrySourceAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; + SetServiceRegistrySourceOutcomeCallable setServiceRegistrySourceCallable(const Model::SetServiceRegistrySourceRequest& request) const; UpdateIstioInjectionConfigOutcome updateIstioInjectionConfig(const Model::UpdateIstioInjectionConfigRequest &request)const; void updateIstioInjectionConfigAsync(const Model::UpdateIstioInjectionConfigRequest& request, const UpdateIstioInjectionConfigAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; UpdateIstioInjectionConfigOutcomeCallable updateIstioInjectionConfigCallable(const Model::UpdateIstioInjectionConfigRequest& request) const; diff --git a/servicemesh/include/alibabacloud/servicemesh/model/CreateServiceMeshRequest.h b/servicemesh/include/alibabacloud/servicemesh/model/CreateServiceMeshRequest.h index 7f7e06d2d..d1d6a271b 100644 --- a/servicemesh/include/alibabacloud/servicemesh/model/CreateServiceMeshRequest.h +++ b/servicemesh/include/alibabacloud/servicemesh/model/CreateServiceMeshRequest.h @@ -45,8 +45,12 @@ namespace AlibabaCloud void setOpaEnabled(bool opaEnabled); std::string getProxyLimitMemory()const; void setProxyLimitMemory(const std::string& proxyLimitMemory); + bool getCustomizedPrometheus()const; + void setCustomizedPrometheus(bool customizedPrometheus); bool getStrictMTLS()const; void setStrictMTLS(bool strictMTLS); + bool getAccessLogEnabled()const; + void setAccessLogEnabled(bool accessLogEnabled); std::string getOPALogLevel()const; void setOPALogLevel(const std::string& oPALogLevel); std::string getExcludeIPRanges()const; @@ -61,6 +65,8 @@ namespace AlibabaCloud void setExcludeInboundPorts(const std::string& excludeInboundPorts); std::string getOPALimitMemory()const; void setOPALimitMemory(const std::string& oPALimitMemory); + std::string getPrometheusUrl()const; + void setPrometheusUrl(const std::string& prometheusUrl); std::string getVSwitches()const; void setVSwitches(const std::string& vSwitches); bool getCADisableSecretAutoGeneration()const; @@ -93,6 +99,8 @@ namespace AlibabaCloud void setTraceSampling(float traceSampling); std::string getAppNamespaces()const; void setAppNamespaces(const std::string& appNamespaces); + bool getKialiEnabled()const; + void setKialiEnabled(bool kialiEnabled); bool getPilotPublicEip()const; void setPilotPublicEip(bool pilotPublicEip); std::string getAuditProject()const; @@ -110,7 +118,9 @@ namespace AlibabaCloud bool openAgentPolicy_; bool opaEnabled_; std::string proxyLimitMemory_; + bool customizedPrometheus_; bool strictMTLS_; + bool accessLogEnabled_; std::string oPALogLevel_; std::string excludeIPRanges_; std::string istioVersion_; @@ -118,6 +128,7 @@ namespace AlibabaCloud std::string includeIPRanges_; std::string excludeInboundPorts_; std::string oPALimitMemory_; + std::string prometheusUrl_; std::string vSwitches_; bool cADisableSecretAutoGeneration_; std::string cAListenedNamespaces_; @@ -134,6 +145,7 @@ namespace AlibabaCloud bool apiServerPublicEip_; float traceSampling_; std::string appNamespaces_; + bool kialiEnabled_; bool pilotPublicEip_; std::string auditProject_; std::string outboundTrafficPolicy_; diff --git a/servicemesh/include/alibabacloud/servicemesh/model/DescribeClustersInServiceMeshResult.h b/servicemesh/include/alibabacloud/servicemesh/model/DescribeClustersInServiceMeshResult.h index 969491dce..5e5929214 100644 --- a/servicemesh/include/alibabacloud/servicemesh/model/DescribeClustersInServiceMeshResult.h +++ b/servicemesh/include/alibabacloud/servicemesh/model/DescribeClustersInServiceMeshResult.h @@ -34,18 +34,24 @@ namespace AlibabaCloud public: struct Cluster { - std::string vpcId; + struct AccessLogDashboardInfo + { + std::string title; + std::string url; + }; std::string clusterId; - std::string version; - std::string state; std::string clusterDomain; - std::string creationTime; - std::string updateTime; std::string sgId; std::string clusterType; + std::vector accessLogDashboards; + std::string name; + std::string vpcId; + std::string version; + std::string state; + std::string creationTime; + std::string updateTime; std::string regionId; std::string errorMessage; - std::string name; }; diff --git a/servicemesh/include/alibabacloud/servicemesh/model/DescribeServiceMeshDetailResult.h b/servicemesh/include/alibabacloud/servicemesh/model/DescribeServiceMeshDetailResult.h index 65448330a..d259f7fee 100644 --- a/servicemesh/include/alibabacloud/servicemesh/model/DescribeServiceMeshDetailResult.h +++ b/servicemesh/include/alibabacloud/servicemesh/model/DescribeServiceMeshDetailResult.h @@ -106,16 +106,34 @@ namespace AlibabaCloud std::string requestCPU; std::string sidecarInjectorWebhookAsYaml; }; + struct Kiali + { + bool enabled; + std::string url; + }; + struct Prometheus + { + bool useExternal; + std::string externalUrl; + }; + struct AccessLog + { + bool enabled; + }; Pilot pilot; - SidecarInjector sidecarInjector; + AccessLog accessLog; OPA oPA; + Prometheus prometheus; + bool telemetry; + std::string outboundTrafficPolicy; + std::string edition; + SidecarInjector sidecarInjector; Audit audit; Proxy proxy; + Kiali kiali; std::string includeIPRanges; bool enableLocalityLB; bool tracing; - bool telemetry; - std::string outboundTrafficPolicy; bool customizedZipkin; }; struct Network diff --git a/servicemesh/include/alibabacloud/servicemesh/model/GetAutoInjectionLabelSyncStatusRequest.h b/servicemesh/include/alibabacloud/servicemesh/model/GetAutoInjectionLabelSyncStatusRequest.h new file mode 100644 index 000000000..bf58727f0 --- /dev/null +++ b/servicemesh/include/alibabacloud/servicemesh/model/GetAutoInjectionLabelSyncStatusRequest.h @@ -0,0 +1,48 @@ +/* + * 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. + */ + +#ifndef ALIBABACLOUD_SERVICEMESH_MODEL_GETAUTOINJECTIONLABELSYNCSTATUSREQUEST_H_ +#define ALIBABACLOUD_SERVICEMESH_MODEL_GETAUTOINJECTIONLABELSYNCSTATUSREQUEST_H_ + +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace Servicemesh + { + namespace Model + { + class ALIBABACLOUD_SERVICEMESH_EXPORT GetAutoInjectionLabelSyncStatusRequest : public RpcServiceRequest + { + + public: + GetAutoInjectionLabelSyncStatusRequest(); + ~GetAutoInjectionLabelSyncStatusRequest(); + + std::string getServiceMeshId()const; + void setServiceMeshId(const std::string& serviceMeshId); + + private: + std::string serviceMeshId_; + + }; + } + } +} +#endif // !ALIBABACLOUD_SERVICEMESH_MODEL_GETAUTOINJECTIONLABELSYNCSTATUSREQUEST_H_ \ No newline at end of file diff --git a/servicemesh/include/alibabacloud/servicemesh/model/GetAutoInjectionLabelSyncStatusResult.h b/servicemesh/include/alibabacloud/servicemesh/model/GetAutoInjectionLabelSyncStatusResult.h new file mode 100644 index 000000000..2b5b55b7c --- /dev/null +++ b/servicemesh/include/alibabacloud/servicemesh/model/GetAutoInjectionLabelSyncStatusResult.h @@ -0,0 +1,51 @@ +/* + * 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. + */ + +#ifndef ALIBABACLOUD_SERVICEMESH_MODEL_GETAUTOINJECTIONLABELSYNCSTATUSRESULT_H_ +#define ALIBABACLOUD_SERVICEMESH_MODEL_GETAUTOINJECTIONLABELSYNCSTATUSRESULT_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace Servicemesh + { + namespace Model + { + class ALIBABACLOUD_SERVICEMESH_EXPORT GetAutoInjectionLabelSyncStatusResult : public ServiceResult + { + public: + + + GetAutoInjectionLabelSyncStatusResult(); + explicit GetAutoInjectionLabelSyncStatusResult(const std::string &payload); + ~GetAutoInjectionLabelSyncStatusResult(); + std::string getStatus()const; + + protected: + void parse(const std::string &payload); + private: + std::string status_; + + }; + } + } +} +#endif // !ALIBABACLOUD_SERVICEMESH_MODEL_GETAUTOINJECTIONLABELSYNCSTATUSRESULT_H_ \ No newline at end of file diff --git a/servicemesh/include/alibabacloud/servicemesh/model/GetDiagnosisResult.h b/servicemesh/include/alibabacloud/servicemesh/model/GetDiagnosisResult.h index 17ed89da7..60e4130cc 100644 --- a/servicemesh/include/alibabacloud/servicemesh/model/GetDiagnosisResult.h +++ b/servicemesh/include/alibabacloud/servicemesh/model/GetDiagnosisResult.h @@ -37,12 +37,14 @@ namespace AlibabaCloud GetDiagnosisResult(); explicit GetDiagnosisResult(const std::string &payload); ~GetDiagnosisResult(); + std::string getStatus()const; std::string getRunAt()const; std::string getResult()const; protected: void parse(const std::string &payload); private: + std::string status_; std::string runAt_; std::string result_; diff --git a/servicemesh/include/alibabacloud/servicemesh/model/GetServiceRegistrySourceRequest.h b/servicemesh/include/alibabacloud/servicemesh/model/GetServiceRegistrySourceRequest.h new file mode 100644 index 000000000..3c50e248f --- /dev/null +++ b/servicemesh/include/alibabacloud/servicemesh/model/GetServiceRegistrySourceRequest.h @@ -0,0 +1,48 @@ +/* + * 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. + */ + +#ifndef ALIBABACLOUD_SERVICEMESH_MODEL_GETSERVICEREGISTRYSOURCEREQUEST_H_ +#define ALIBABACLOUD_SERVICEMESH_MODEL_GETSERVICEREGISTRYSOURCEREQUEST_H_ + +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace Servicemesh + { + namespace Model + { + class ALIBABACLOUD_SERVICEMESH_EXPORT GetServiceRegistrySourceRequest : public RpcServiceRequest + { + + public: + GetServiceRegistrySourceRequest(); + ~GetServiceRegistrySourceRequest(); + + std::string getServiceMeshId()const; + void setServiceMeshId(const std::string& serviceMeshId); + + private: + std::string serviceMeshId_; + + }; + } + } +} +#endif // !ALIBABACLOUD_SERVICEMESH_MODEL_GETSERVICEREGISTRYSOURCEREQUEST_H_ \ No newline at end of file diff --git a/servicemesh/include/alibabacloud/servicemesh/model/GetServiceRegistrySourceResult.h b/servicemesh/include/alibabacloud/servicemesh/model/GetServiceRegistrySourceResult.h new file mode 100644 index 000000000..bdb191c58 --- /dev/null +++ b/servicemesh/include/alibabacloud/servicemesh/model/GetServiceRegistrySourceResult.h @@ -0,0 +1,53 @@ +/* + * 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. + */ + +#ifndef ALIBABACLOUD_SERVICEMESH_MODEL_GETSERVICEREGISTRYSOURCERESULT_H_ +#define ALIBABACLOUD_SERVICEMESH_MODEL_GETSERVICEREGISTRYSOURCERESULT_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace Servicemesh + { + namespace Model + { + class ALIBABACLOUD_SERVICEMESH_EXPORT GetServiceRegistrySourceResult : public ServiceResult + { + public: + + + GetServiceRegistrySourceResult(); + explicit GetServiceRegistrySourceResult(const std::string &payload); + ~GetServiceRegistrySourceResult(); + std::string getStatus()const; + std::string getResult()const; + + protected: + void parse(const std::string &payload); + private: + std::string status_; + std::string result_; + + }; + } + } +} +#endif // !ALIBABACLOUD_SERVICEMESH_MODEL_GETSERVICEREGISTRYSOURCERESULT_H_ \ No newline at end of file diff --git a/servicemesh/include/alibabacloud/servicemesh/model/SetServiceRegistrySourceRequest.h b/servicemesh/include/alibabacloud/servicemesh/model/SetServiceRegistrySourceRequest.h new file mode 100644 index 000000000..4b6f14d54 --- /dev/null +++ b/servicemesh/include/alibabacloud/servicemesh/model/SetServiceRegistrySourceRequest.h @@ -0,0 +1,51 @@ +/* + * 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. + */ + +#ifndef ALIBABACLOUD_SERVICEMESH_MODEL_SETSERVICEREGISTRYSOURCEREQUEST_H_ +#define ALIBABACLOUD_SERVICEMESH_MODEL_SETSERVICEREGISTRYSOURCEREQUEST_H_ + +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace Servicemesh + { + namespace Model + { + class ALIBABACLOUD_SERVICEMESH_EXPORT SetServiceRegistrySourceRequest : public RpcServiceRequest + { + + public: + SetServiceRegistrySourceRequest(); + ~SetServiceRegistrySourceRequest(); + + std::string getServiceMeshId()const; + void setServiceMeshId(const std::string& serviceMeshId); + std::string getConfig()const; + void setConfig(const std::string& config); + + private: + std::string serviceMeshId_; + std::string config_; + + }; + } + } +} +#endif // !ALIBABACLOUD_SERVICEMESH_MODEL_SETSERVICEREGISTRYSOURCEREQUEST_H_ \ No newline at end of file diff --git a/servicemesh/include/alibabacloud/servicemesh/model/SetServiceRegistrySourceResult.h b/servicemesh/include/alibabacloud/servicemesh/model/SetServiceRegistrySourceResult.h new file mode 100644 index 000000000..4bfd4cc0e --- /dev/null +++ b/servicemesh/include/alibabacloud/servicemesh/model/SetServiceRegistrySourceResult.h @@ -0,0 +1,51 @@ +/* + * 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. + */ + +#ifndef ALIBABACLOUD_SERVICEMESH_MODEL_SETSERVICEREGISTRYSOURCERESULT_H_ +#define ALIBABACLOUD_SERVICEMESH_MODEL_SETSERVICEREGISTRYSOURCERESULT_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace Servicemesh + { + namespace Model + { + class ALIBABACLOUD_SERVICEMESH_EXPORT SetServiceRegistrySourceResult : public ServiceResult + { + public: + + + SetServiceRegistrySourceResult(); + explicit SetServiceRegistrySourceResult(const std::string &payload); + ~SetServiceRegistrySourceResult(); + std::string getResult()const; + + protected: + void parse(const std::string &payload); + private: + std::string result_; + + }; + } + } +} +#endif // !ALIBABACLOUD_SERVICEMESH_MODEL_SETSERVICEREGISTRYSOURCERESULT_H_ \ No newline at end of file diff --git a/servicemesh/include/alibabacloud/servicemesh/model/UpdateMeshFeatureRequest.h b/servicemesh/include/alibabacloud/servicemesh/model/UpdateMeshFeatureRequest.h index ea7da6c9c..90b076f20 100644 --- a/servicemesh/include/alibabacloud/servicemesh/model/UpdateMeshFeatureRequest.h +++ b/servicemesh/include/alibabacloud/servicemesh/model/UpdateMeshFeatureRequest.h @@ -45,8 +45,12 @@ namespace AlibabaCloud void setOpaEnabled(bool opaEnabled); std::string getProxyLimitMemory()const; void setProxyLimitMemory(const std::string& proxyLimitMemory); + bool getCustomizedPrometheus()const; + void setCustomizedPrometheus(bool customizedPrometheus); std::string getCniExcludeNamespaces()const; void setCniExcludeNamespaces(const std::string& cniExcludeNamespaces); + bool getAccessLogEnabled()const; + void setAccessLogEnabled(bool accessLogEnabled); std::string getOPALogLevel()const; void setOPALogLevel(const std::string& oPALogLevel); bool getCustomizedZipkin()const; @@ -61,6 +65,8 @@ namespace AlibabaCloud void setIncludeIPRanges(const std::string& includeIPRanges); std::string getOPALimitMemory()const; void setOPALimitMemory(const std::string& oPALimitMemory); + std::string getPrometheusUrl()const; + void setPrometheusUrl(const std::string& prometheusUrl); bool getCADisableSecretAutoGeneration()const; void setCADisableSecretAutoGeneration(bool cADisableSecretAutoGeneration); std::string getCAListenedNamespaces()const; @@ -99,6 +105,8 @@ namespace AlibabaCloud void setHttp10Enabled(bool http10Enabled); std::string getAppNamespaces()const; void setAppNamespaces(const std::string& appNamespaces); + bool getKialiEnabled()const; + void setKialiEnabled(bool kialiEnabled); bool getPilotPublicEip()const; void setPilotPublicEip(bool pilotPublicEip); std::string getAuditProject()const; @@ -114,7 +122,9 @@ namespace AlibabaCloud bool openAgentPolicy_; bool opaEnabled_; std::string proxyLimitMemory_; + bool customizedPrometheus_; std::string cniExcludeNamespaces_; + bool accessLogEnabled_; std::string oPALogLevel_; bool customizedZipkin_; std::string sidecarInjectorRequestCPU_; @@ -122,6 +132,7 @@ namespace AlibabaCloud bool tracing_; std::string includeIPRanges_; std::string oPALimitMemory_; + std::string prometheusUrl_; bool cADisableSecretAutoGeneration_; std::string cAListenedNamespaces_; std::string proxyLimitCPU_; @@ -141,6 +152,7 @@ namespace AlibabaCloud float traceSampling_; bool http10Enabled_; std::string appNamespaces_; + bool kialiEnabled_; bool pilotPublicEip_; std::string auditProject_; std::string outboundTrafficPolicy_; diff --git a/servicemesh/src/ServicemeshClient.cc b/servicemesh/src/ServicemeshClient.cc index 5dd9070fe..5d0c948a0 100644 --- a/servicemesh/src/ServicemeshClient.cc +++ b/servicemesh/src/ServicemeshClient.cc @@ -555,6 +555,42 @@ ServicemeshClient::DescribeUpgradeVersionOutcomeCallable ServicemeshClient::desc return task->get_future(); } +ServicemeshClient::GetAutoInjectionLabelSyncStatusOutcome ServicemeshClient::getAutoInjectionLabelSyncStatus(const GetAutoInjectionLabelSyncStatusRequest &request) const +{ + auto endpointOutcome = endpointProvider_->getEndpoint(); + if (!endpointOutcome.isSuccess()) + return GetAutoInjectionLabelSyncStatusOutcome(endpointOutcome.error()); + + auto outcome = makeRequest(endpointOutcome.result(), request); + + if (outcome.isSuccess()) + return GetAutoInjectionLabelSyncStatusOutcome(GetAutoInjectionLabelSyncStatusResult(outcome.result())); + else + return GetAutoInjectionLabelSyncStatusOutcome(outcome.error()); +} + +void ServicemeshClient::getAutoInjectionLabelSyncStatusAsync(const GetAutoInjectionLabelSyncStatusRequest& request, const GetAutoInjectionLabelSyncStatusAsyncHandler& handler, const std::shared_ptr& context) const +{ + auto fn = [this, request, handler, context]() + { + handler(this, request, getAutoInjectionLabelSyncStatus(request), context); + }; + + asyncExecute(new Runnable(fn)); +} + +ServicemeshClient::GetAutoInjectionLabelSyncStatusOutcomeCallable ServicemeshClient::getAutoInjectionLabelSyncStatusCallable(const GetAutoInjectionLabelSyncStatusRequest &request) const +{ + auto task = std::make_shared>( + [this, request]() + { + return this->getAutoInjectionLabelSyncStatus(request); + }); + + asyncExecute(new Runnable([task]() { (*task)(); })); + return task->get_future(); +} + ServicemeshClient::GetDiagnosisOutcome ServicemeshClient::getDiagnosis(const GetDiagnosisRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); @@ -735,6 +771,42 @@ ServicemeshClient::GetServiceMeshSlbOutcomeCallable ServicemeshClient::getServic return task->get_future(); } +ServicemeshClient::GetServiceRegistrySourceOutcome ServicemeshClient::getServiceRegistrySource(const GetServiceRegistrySourceRequest &request) const +{ + auto endpointOutcome = endpointProvider_->getEndpoint(); + if (!endpointOutcome.isSuccess()) + return GetServiceRegistrySourceOutcome(endpointOutcome.error()); + + auto outcome = makeRequest(endpointOutcome.result(), request); + + if (outcome.isSuccess()) + return GetServiceRegistrySourceOutcome(GetServiceRegistrySourceResult(outcome.result())); + else + return GetServiceRegistrySourceOutcome(outcome.error()); +} + +void ServicemeshClient::getServiceRegistrySourceAsync(const GetServiceRegistrySourceRequest& request, const GetServiceRegistrySourceAsyncHandler& handler, const std::shared_ptr& context) const +{ + auto fn = [this, request, handler, context]() + { + handler(this, request, getServiceRegistrySource(request), context); + }; + + asyncExecute(new Runnable(fn)); +} + +ServicemeshClient::GetServiceRegistrySourceOutcomeCallable ServicemeshClient::getServiceRegistrySourceCallable(const GetServiceRegistrySourceRequest &request) const +{ + auto task = std::make_shared>( + [this, request]() + { + return this->getServiceRegistrySource(request); + }); + + asyncExecute(new Runnable([task]() { (*task)(); })); + return task->get_future(); +} + ServicemeshClient::GetVmAppMeshInfoOutcome ServicemeshClient::getVmAppMeshInfo(const GetVmAppMeshInfoRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); @@ -915,6 +987,42 @@ ServicemeshClient::RunDiagnosisOutcomeCallable ServicemeshClient::runDiagnosisCa return task->get_future(); } +ServicemeshClient::SetServiceRegistrySourceOutcome ServicemeshClient::setServiceRegistrySource(const SetServiceRegistrySourceRequest &request) const +{ + auto endpointOutcome = endpointProvider_->getEndpoint(); + if (!endpointOutcome.isSuccess()) + return SetServiceRegistrySourceOutcome(endpointOutcome.error()); + + auto outcome = makeRequest(endpointOutcome.result(), request); + + if (outcome.isSuccess()) + return SetServiceRegistrySourceOutcome(SetServiceRegistrySourceResult(outcome.result())); + else + return SetServiceRegistrySourceOutcome(outcome.error()); +} + +void ServicemeshClient::setServiceRegistrySourceAsync(const SetServiceRegistrySourceRequest& request, const SetServiceRegistrySourceAsyncHandler& handler, const std::shared_ptr& context) const +{ + auto fn = [this, request, handler, context]() + { + handler(this, request, setServiceRegistrySource(request), context); + }; + + asyncExecute(new Runnable(fn)); +} + +ServicemeshClient::SetServiceRegistrySourceOutcomeCallable ServicemeshClient::setServiceRegistrySourceCallable(const SetServiceRegistrySourceRequest &request) const +{ + auto task = std::make_shared>( + [this, request]() + { + return this->setServiceRegistrySource(request); + }); + + asyncExecute(new Runnable([task]() { (*task)(); })); + return task->get_future(); +} + ServicemeshClient::UpdateIstioInjectionConfigOutcome ServicemeshClient::updateIstioInjectionConfig(const UpdateIstioInjectionConfigRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); diff --git a/servicemesh/src/model/CreateServiceMeshRequest.cc b/servicemesh/src/model/CreateServiceMeshRequest.cc index 9b34a17c9..690f7ddb4 100644 --- a/servicemesh/src/model/CreateServiceMeshRequest.cc +++ b/servicemesh/src/model/CreateServiceMeshRequest.cc @@ -82,6 +82,17 @@ void CreateServiceMeshRequest::setProxyLimitMemory(const std::string& proxyLimit setBodyParameter("ProxyLimitMemory", proxyLimitMemory); } +bool CreateServiceMeshRequest::getCustomizedPrometheus()const +{ + return customizedPrometheus_; +} + +void CreateServiceMeshRequest::setCustomizedPrometheus(bool customizedPrometheus) +{ + customizedPrometheus_ = customizedPrometheus; + setBodyParameter("CustomizedPrometheus", customizedPrometheus ? "true" : "false"); +} + bool CreateServiceMeshRequest::getStrictMTLS()const { return strictMTLS_; @@ -93,6 +104,17 @@ void CreateServiceMeshRequest::setStrictMTLS(bool strictMTLS) setBodyParameter("StrictMTLS", strictMTLS ? "true" : "false"); } +bool CreateServiceMeshRequest::getAccessLogEnabled()const +{ + return accessLogEnabled_; +} + +void CreateServiceMeshRequest::setAccessLogEnabled(bool accessLogEnabled) +{ + accessLogEnabled_ = accessLogEnabled; + setBodyParameter("AccessLogEnabled", accessLogEnabled ? "true" : "false"); +} + std::string CreateServiceMeshRequest::getOPALogLevel()const { return oPALogLevel_; @@ -170,6 +192,17 @@ void CreateServiceMeshRequest::setOPALimitMemory(const std::string& oPALimitMemo setBodyParameter("OPALimitMemory", oPALimitMemory); } +std::string CreateServiceMeshRequest::getPrometheusUrl()const +{ + return prometheusUrl_; +} + +void CreateServiceMeshRequest::setPrometheusUrl(const std::string& prometheusUrl) +{ + prometheusUrl_ = prometheusUrl; + setBodyParameter("PrometheusUrl", prometheusUrl); +} + std::string CreateServiceMeshRequest::getVSwitches()const { return vSwitches_; @@ -346,6 +379,17 @@ void CreateServiceMeshRequest::setAppNamespaces(const std::string& appNamespaces setBodyParameter("AppNamespaces", appNamespaces); } +bool CreateServiceMeshRequest::getKialiEnabled()const +{ + return kialiEnabled_; +} + +void CreateServiceMeshRequest::setKialiEnabled(bool kialiEnabled) +{ + kialiEnabled_ = kialiEnabled; + setBodyParameter("KialiEnabled", kialiEnabled ? "true" : "false"); +} + bool CreateServiceMeshRequest::getPilotPublicEip()const { return pilotPublicEip_; diff --git a/servicemesh/src/model/DescribeClustersInServiceMeshResult.cc b/servicemesh/src/model/DescribeClustersInServiceMeshResult.cc index a3318a149..c93a83973 100644 --- a/servicemesh/src/model/DescribeClustersInServiceMeshResult.cc +++ b/servicemesh/src/model/DescribeClustersInServiceMeshResult.cc @@ -67,6 +67,16 @@ void DescribeClustersInServiceMeshResult::parse(const std::string &payload) clustersObject.sgId = valueClustersCluster["SgId"].asString(); if(!valueClustersCluster["ClusterDomain"].isNull()) clustersObject.clusterDomain = valueClustersCluster["ClusterDomain"].asString(); + auto allAccessLogDashboardsNode = valueClustersCluster["AccessLogDashboards"]["AccessLogDashboardInfo"]; + for (auto valueClustersClusterAccessLogDashboardsAccessLogDashboardInfo : allAccessLogDashboardsNode) + { + Cluster::AccessLogDashboardInfo accessLogDashboardsObject; + if(!valueClustersClusterAccessLogDashboardsAccessLogDashboardInfo["Title"].isNull()) + accessLogDashboardsObject.title = valueClustersClusterAccessLogDashboardsAccessLogDashboardInfo["Title"].asString(); + if(!valueClustersClusterAccessLogDashboardsAccessLogDashboardInfo["Url"].isNull()) + accessLogDashboardsObject.url = valueClustersClusterAccessLogDashboardsAccessLogDashboardInfo["Url"].asString(); + clustersObject.accessLogDashboards.push_back(accessLogDashboardsObject); + } clusters_.push_back(clustersObject); } diff --git a/servicemesh/src/model/DescribeServiceMeshDetailResult.cc b/servicemesh/src/model/DescribeServiceMeshDetailResult.cc index a0d446c57..56d4db580 100644 --- a/servicemesh/src/model/DescribeServiceMeshDetailResult.cc +++ b/servicemesh/src/model/DescribeServiceMeshDetailResult.cc @@ -89,6 +89,8 @@ void DescribeServiceMeshDetailResult::parse(const std::string &payload) serviceMesh_.spec.meshConfig.outboundTrafficPolicy = meshConfigNode["OutboundTrafficPolicy"].asString(); if(!meshConfigNode["IncludeIPRanges"].isNull()) serviceMesh_.spec.meshConfig.includeIPRanges = meshConfigNode["IncludeIPRanges"].asString(); + if(!meshConfigNode["Edition"].isNull()) + serviceMesh_.spec.meshConfig.edition = meshConfigNode["Edition"].asString(); auto pilotNode = meshConfigNode["Pilot"]; if(!pilotNode["TraceSampling"].isNull()) serviceMesh_.spec.meshConfig.pilot.traceSampling = std::stof(pilotNode["TraceSampling"].asString()); @@ -143,6 +145,19 @@ void DescribeServiceMeshDetailResult::parse(const std::string &payload) serviceMesh_.spec.meshConfig.sidecarInjector.initCNIConfiguration.enabled = initCNIConfigurationNode["Enabled"].asString() == "true"; if(!initCNIConfigurationNode["ExcludeNamespaces"].isNull()) serviceMesh_.spec.meshConfig.sidecarInjector.initCNIConfiguration.excludeNamespaces = initCNIConfigurationNode["ExcludeNamespaces"].asString(); + auto kialiNode = meshConfigNode["Kiali"]; + if(!kialiNode["Enabled"].isNull()) + serviceMesh_.spec.meshConfig.kiali.enabled = kialiNode["Enabled"].asString() == "true"; + if(!kialiNode["Url"].isNull()) + serviceMesh_.spec.meshConfig.kiali.url = kialiNode["Url"].asString(); + auto prometheusNode = meshConfigNode["Prometheus"]; + if(!prometheusNode["UseExternal"].isNull()) + serviceMesh_.spec.meshConfig.prometheus.useExternal = prometheusNode["UseExternal"].asString() == "true"; + if(!prometheusNode["ExternalUrl"].isNull()) + serviceMesh_.spec.meshConfig.prometheus.externalUrl = prometheusNode["ExternalUrl"].asString(); + auto accessLogNode = meshConfigNode["AccessLog"]; + if(!accessLogNode["Enabled"].isNull()) + serviceMesh_.spec.meshConfig.accessLog.enabled = accessLogNode["Enabled"].asString() == "true"; auto networkNode = specNode["Network"]; if(!networkNode["SecurityGroupId"].isNull()) serviceMesh_.spec.network.securityGroupId = networkNode["SecurityGroupId"].asString(); diff --git a/servicemesh/src/model/GetAutoInjectionLabelSyncStatusRequest.cc b/servicemesh/src/model/GetAutoInjectionLabelSyncStatusRequest.cc new file mode 100644 index 000000000..837f1f0d4 --- /dev/null +++ b/servicemesh/src/model/GetAutoInjectionLabelSyncStatusRequest.cc @@ -0,0 +1,40 @@ +/* + * 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::Servicemesh::Model::GetAutoInjectionLabelSyncStatusRequest; + +GetAutoInjectionLabelSyncStatusRequest::GetAutoInjectionLabelSyncStatusRequest() : + RpcServiceRequest("servicemesh", "2020-01-11", "GetAutoInjectionLabelSyncStatus") +{ + setMethod(HttpRequest::Method::Post); +} + +GetAutoInjectionLabelSyncStatusRequest::~GetAutoInjectionLabelSyncStatusRequest() +{} + +std::string GetAutoInjectionLabelSyncStatusRequest::getServiceMeshId()const +{ + return serviceMeshId_; +} + +void GetAutoInjectionLabelSyncStatusRequest::setServiceMeshId(const std::string& serviceMeshId) +{ + serviceMeshId_ = serviceMeshId; + setParameter("ServiceMeshId", serviceMeshId); +} + diff --git a/servicemesh/src/model/GetAutoInjectionLabelSyncStatusResult.cc b/servicemesh/src/model/GetAutoInjectionLabelSyncStatusResult.cc new file mode 100644 index 000000000..289129cda --- /dev/null +++ b/servicemesh/src/model/GetAutoInjectionLabelSyncStatusResult.cc @@ -0,0 +1,51 @@ +/* + * 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 +#include + +using namespace AlibabaCloud::Servicemesh; +using namespace AlibabaCloud::Servicemesh::Model; + +GetAutoInjectionLabelSyncStatusResult::GetAutoInjectionLabelSyncStatusResult() : + ServiceResult() +{} + +GetAutoInjectionLabelSyncStatusResult::GetAutoInjectionLabelSyncStatusResult(const std::string &payload) : + ServiceResult() +{ + parse(payload); +} + +GetAutoInjectionLabelSyncStatusResult::~GetAutoInjectionLabelSyncStatusResult() +{} + +void GetAutoInjectionLabelSyncStatusResult::parse(const std::string &payload) +{ + Json::Reader reader; + Json::Value value; + reader.parse(payload, value); + setRequestId(value["RequestId"].asString()); + if(!value["Status"].isNull()) + status_ = value["Status"].asString(); + +} + +std::string GetAutoInjectionLabelSyncStatusResult::getStatus()const +{ + return status_; +} + diff --git a/servicemesh/src/model/GetDiagnosisResult.cc b/servicemesh/src/model/GetDiagnosisResult.cc index f3fee8fb6..deafca128 100644 --- a/servicemesh/src/model/GetDiagnosisResult.cc +++ b/servicemesh/src/model/GetDiagnosisResult.cc @@ -43,9 +43,16 @@ void GetDiagnosisResult::parse(const std::string &payload) result_ = value["Result"].asString(); if(!value["RunAt"].isNull()) runAt_ = value["RunAt"].asString(); + if(!value["Status"].isNull()) + status_ = value["Status"].asString(); } +std::string GetDiagnosisResult::getStatus()const +{ + return status_; +} + std::string GetDiagnosisResult::getRunAt()const { return runAt_; diff --git a/servicemesh/src/model/GetServiceRegistrySourceRequest.cc b/servicemesh/src/model/GetServiceRegistrySourceRequest.cc new file mode 100644 index 000000000..3aa35ffd3 --- /dev/null +++ b/servicemesh/src/model/GetServiceRegistrySourceRequest.cc @@ -0,0 +1,40 @@ +/* + * 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::Servicemesh::Model::GetServiceRegistrySourceRequest; + +GetServiceRegistrySourceRequest::GetServiceRegistrySourceRequest() : + RpcServiceRequest("servicemesh", "2020-01-11", "GetServiceRegistrySource") +{ + setMethod(HttpRequest::Method::Post); +} + +GetServiceRegistrySourceRequest::~GetServiceRegistrySourceRequest() +{} + +std::string GetServiceRegistrySourceRequest::getServiceMeshId()const +{ + return serviceMeshId_; +} + +void GetServiceRegistrySourceRequest::setServiceMeshId(const std::string& serviceMeshId) +{ + serviceMeshId_ = serviceMeshId; + setParameter("ServiceMeshId", serviceMeshId); +} + diff --git a/servicemesh/src/model/GetServiceRegistrySourceResult.cc b/servicemesh/src/model/GetServiceRegistrySourceResult.cc new file mode 100644 index 000000000..053cd4c97 --- /dev/null +++ b/servicemesh/src/model/GetServiceRegistrySourceResult.cc @@ -0,0 +1,58 @@ +/* + * 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 +#include + +using namespace AlibabaCloud::Servicemesh; +using namespace AlibabaCloud::Servicemesh::Model; + +GetServiceRegistrySourceResult::GetServiceRegistrySourceResult() : + ServiceResult() +{} + +GetServiceRegistrySourceResult::GetServiceRegistrySourceResult(const std::string &payload) : + ServiceResult() +{ + parse(payload); +} + +GetServiceRegistrySourceResult::~GetServiceRegistrySourceResult() +{} + +void GetServiceRegistrySourceResult::parse(const std::string &payload) +{ + Json::Reader reader; + Json::Value value; + reader.parse(payload, value); + setRequestId(value["RequestId"].asString()); + if(!value["Result"].isNull()) + result_ = value["Result"].asString(); + if(!value["Status"].isNull()) + status_ = value["Status"].asString(); + +} + +std::string GetServiceRegistrySourceResult::getStatus()const +{ + return status_; +} + +std::string GetServiceRegistrySourceResult::getResult()const +{ + return result_; +} + diff --git a/servicemesh/src/model/SetServiceRegistrySourceRequest.cc b/servicemesh/src/model/SetServiceRegistrySourceRequest.cc new file mode 100644 index 000000000..d823ff5a2 --- /dev/null +++ b/servicemesh/src/model/SetServiceRegistrySourceRequest.cc @@ -0,0 +1,51 @@ +/* + * 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::Servicemesh::Model::SetServiceRegistrySourceRequest; + +SetServiceRegistrySourceRequest::SetServiceRegistrySourceRequest() : + RpcServiceRequest("servicemesh", "2020-01-11", "SetServiceRegistrySource") +{ + setMethod(HttpRequest::Method::Post); +} + +SetServiceRegistrySourceRequest::~SetServiceRegistrySourceRequest() +{} + +std::string SetServiceRegistrySourceRequest::getServiceMeshId()const +{ + return serviceMeshId_; +} + +void SetServiceRegistrySourceRequest::setServiceMeshId(const std::string& serviceMeshId) +{ + serviceMeshId_ = serviceMeshId; + setBodyParameter("ServiceMeshId", serviceMeshId); +} + +std::string SetServiceRegistrySourceRequest::getConfig()const +{ + return config_; +} + +void SetServiceRegistrySourceRequest::setConfig(const std::string& config) +{ + config_ = config; + setBodyParameter("Config", config); +} + diff --git a/servicemesh/src/model/SetServiceRegistrySourceResult.cc b/servicemesh/src/model/SetServiceRegistrySourceResult.cc new file mode 100644 index 000000000..fd596e3ae --- /dev/null +++ b/servicemesh/src/model/SetServiceRegistrySourceResult.cc @@ -0,0 +1,51 @@ +/* + * 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 +#include + +using namespace AlibabaCloud::Servicemesh; +using namespace AlibabaCloud::Servicemesh::Model; + +SetServiceRegistrySourceResult::SetServiceRegistrySourceResult() : + ServiceResult() +{} + +SetServiceRegistrySourceResult::SetServiceRegistrySourceResult(const std::string &payload) : + ServiceResult() +{ + parse(payload); +} + +SetServiceRegistrySourceResult::~SetServiceRegistrySourceResult() +{} + +void SetServiceRegistrySourceResult::parse(const std::string &payload) +{ + Json::Reader reader; + Json::Value value; + reader.parse(payload, value); + setRequestId(value["RequestId"].asString()); + if(!value["Result"].isNull()) + result_ = value["Result"].asString(); + +} + +std::string SetServiceRegistrySourceResult::getResult()const +{ + return result_; +} + diff --git a/servicemesh/src/model/UpdateMeshFeatureRequest.cc b/servicemesh/src/model/UpdateMeshFeatureRequest.cc index 91de002b8..32e83f1b1 100644 --- a/servicemesh/src/model/UpdateMeshFeatureRequest.cc +++ b/servicemesh/src/model/UpdateMeshFeatureRequest.cc @@ -82,6 +82,17 @@ void UpdateMeshFeatureRequest::setProxyLimitMemory(const std::string& proxyLimit setBodyParameter("ProxyLimitMemory", proxyLimitMemory); } +bool UpdateMeshFeatureRequest::getCustomizedPrometheus()const +{ + return customizedPrometheus_; +} + +void UpdateMeshFeatureRequest::setCustomizedPrometheus(bool customizedPrometheus) +{ + customizedPrometheus_ = customizedPrometheus; + setBodyParameter("CustomizedPrometheus", customizedPrometheus ? "true" : "false"); +} + std::string UpdateMeshFeatureRequest::getCniExcludeNamespaces()const { return cniExcludeNamespaces_; @@ -93,6 +104,17 @@ void UpdateMeshFeatureRequest::setCniExcludeNamespaces(const std::string& cniExc setBodyParameter("CniExcludeNamespaces", cniExcludeNamespaces); } +bool UpdateMeshFeatureRequest::getAccessLogEnabled()const +{ + return accessLogEnabled_; +} + +void UpdateMeshFeatureRequest::setAccessLogEnabled(bool accessLogEnabled) +{ + accessLogEnabled_ = accessLogEnabled; + setBodyParameter("AccessLogEnabled", accessLogEnabled ? "true" : "false"); +} + std::string UpdateMeshFeatureRequest::getOPALogLevel()const { return oPALogLevel_; @@ -170,6 +192,17 @@ void UpdateMeshFeatureRequest::setOPALimitMemory(const std::string& oPALimitMemo setBodyParameter("OPALimitMemory", oPALimitMemory); } +std::string UpdateMeshFeatureRequest::getPrometheusUrl()const +{ + return prometheusUrl_; +} + +void UpdateMeshFeatureRequest::setPrometheusUrl(const std::string& prometheusUrl) +{ + prometheusUrl_ = prometheusUrl; + setBodyParameter("PrometheusUrl", prometheusUrl); +} + bool UpdateMeshFeatureRequest::getCADisableSecretAutoGeneration()const { return cADisableSecretAutoGeneration_; @@ -379,6 +412,17 @@ void UpdateMeshFeatureRequest::setAppNamespaces(const std::string& appNamespaces setBodyParameter("AppNamespaces", appNamespaces); } +bool UpdateMeshFeatureRequest::getKialiEnabled()const +{ + return kialiEnabled_; +} + +void UpdateMeshFeatureRequest::setKialiEnabled(bool kialiEnabled) +{ + kialiEnabled_ = kialiEnabled; + setBodyParameter("KialiEnabled", kialiEnabled ? "true" : "false"); +} + bool UpdateMeshFeatureRequest::getPilotPublicEip()const { return pilotPublicEip_;