Generated 2016-04-08 for Emr.

CHANGELOG

@@ -1,3 +1,6 @@
+2021-11-23 Version: 1.36.941
+- Generated 2016-04-08 for `Emr`.
+
 2021-11-23 Version: 1.36.940
 - Fix BdsColdStorage.
 

VERSION

@@ -1 +1 @@
-1.36.940
+1.36.941

emr/include/alibabacloud/emr/model/CreateClusterTemplateRequest.h

@@ -144,6 +144,8 @@ namespace AlibabaCloud
 				void setDepositType(const std::string& depositType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getDataDiskKMSKeyId()const;
+				void setDataDiskKMSKeyId(const std::string& dataDiskKMSKeyId);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				bool getUseLocalMetaDb()const;
@@ -152,6 +154,8 @@ namespace AlibabaCloud
 				void setTemplateName(const std::string& templateName);
 				std::string getUserDefinedEmrEcsRole()const;
 				void setUserDefinedEmrEcsRole(const std::string& userDefinedEmrEcsRole);
+				bool getDataDiskEncrypted()const;
+				void setDataDiskEncrypted(bool dataDiskEncrypted);
 				std::string getVpcId()const;
 				void setVpcId(const std::string& vpcId);
 				std::vector<HostGroup> getHostGroup()const;
@@ -193,10 +197,12 @@ namespace AlibabaCloud
 				bool easEnable_;
 				std::string depositType_;
 				std::string accessKeyId_;
+				std::string dataDiskKMSKeyId_;
 				std::string regionId_;
 				bool useLocalMetaDb_;
 				std::string templateName_;
 				std::string userDefinedEmrEcsRole_;
+				bool dataDiskEncrypted_;
 				std::string vpcId_;
 				std::vector<HostGroup> hostGroup_;
 				std::vector<Config> config_;

emr/include/alibabacloud/emr/model/CreateClusterV2Request.h

@@ -179,6 +179,8 @@ namespace AlibabaCloud
 				void setDepositType(const std::string& depositType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getDataDiskKMSKeyId()const;
+				void setDataDiskKMSKeyId(const std::string& dataDiskKMSKeyId);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				bool getUseLocalMetaDb()const;
@@ -187,6 +189,8 @@ namespace AlibabaCloud
 				void setUserInfo(const std::vector<UserInfo>& userInfo);
 				std::string getUserDefinedEmrEcsRole()const;
 				void setUserDefinedEmrEcsRole(const std::string& userDefinedEmrEcsRole);
+				bool getDataDiskEncrypted()const;
+				void setDataDiskEncrypted(bool dataDiskEncrypted);
 				std::string getWhiteListType()const;
 				void setWhiteListType(const std::string& whiteListType);
 				std::string getRelatedClusterId()const;
@@ -244,10 +248,12 @@ namespace AlibabaCloud
 				bool easEnable_;
 				std::string depositType_;
 				std::string accessKeyId_;
+				std::string dataDiskKMSKeyId_;
 				std::string regionId_;
 				bool useLocalMetaDb_;
 				std::vector<UserInfo> userInfo_;
 				std::string userDefinedEmrEcsRole_;
+				bool dataDiskEncrypted_;
 				std::string whiteListType_;
 				std::string relatedClusterId_;
 				std::string vpcId_;

emr/include/alibabacloud/emr/model/DescribeClusterBasicInfoResult.h

@@ -138,11 +138,13 @@ namespace AlibabaCloud
 					std::string securityGroupId;
 					std::string machineType;
 					int taskNodeTotal;
+					bool dataDiskEncrypted;
 					AccessInfo accessInfo;
 					std::string extraInfo;
 					int masterNodeTotal;
 					std::string userId;
 					std::string chargeType;
+					std::string dataDiskKMSKeyId;
 					bool autoScalingEnable;
 					std::string instanceGeneration;
 					std::string regionId;

emr/include/alibabacloud/emr/model/DescribeClusterTemplateResult.h

@@ -95,6 +95,7 @@ namespace AlibabaCloud
 					std::string securityGroupId;
 					std::string depositType;
 					std::string machineType;
+					bool dataDiskEncrypted;
 					std::string metaStoreType;
 					std::string emrVer;
 					int masterNodeTotal;
@@ -105,6 +106,7 @@ namespace AlibabaCloud
 					bool useCustomHiveMetaDb;
 					std::string userId;
 					std::string metaStoreConf;
+					std::string dataDiskKMSKeyId;
 					std::vector<HostGroup> hostGroupList;
 					std::string instanceGeneration;
 					std::string id;

emr/include/alibabacloud/emr/model/DescribeClusterV2Result.h

@@ -184,11 +184,13 @@ namespace AlibabaCloud
 					std::string securityGroupId;
 					std::string machineType;
 					int taskNodeTotal;
+					bool dataDiskEncrypted;
 					AccessInfo accessInfo;
 					std::string extraInfo;
 					int masterNodeTotal;
 					std::string userId;
 					std::string chargeType;
+					std::string dataDiskKMSKeyId;
 					bool autoScalingEnable;
 					std::string instanceGeneration;
 					std::string regionId;

emr/src/model/CreateClusterTemplateRequest.cc

@@ -384,6 +384,17 @@ void CreateClusterTemplateRequest::setAccessKeyId(const std::string& accessKeyId
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string CreateClusterTemplateRequest::getDataDiskKMSKeyId()const
+{
+	return dataDiskKMSKeyId_;
+}
+
+void CreateClusterTemplateRequest::setDataDiskKMSKeyId(const std::string& dataDiskKMSKeyId)
+{
+	dataDiskKMSKeyId_ = dataDiskKMSKeyId;
+	setParameter("DataDiskKMSKeyId", dataDiskKMSKeyId);
+}
+
 std::string CreateClusterTemplateRequest::getRegionId()const
 {
 	return regionId_;
@@ -428,6 +439,17 @@ void CreateClusterTemplateRequest::setUserDefinedEmrEcsRole(const std::string& u
 	setParameter("UserDefinedEmrEcsRole", userDefinedEmrEcsRole);
 }
 
+bool CreateClusterTemplateRequest::getDataDiskEncrypted()const
+{
+	return dataDiskEncrypted_;
+}
+
+void CreateClusterTemplateRequest::setDataDiskEncrypted(bool dataDiskEncrypted)
+{
+	dataDiskEncrypted_ = dataDiskEncrypted;
+	setParameter("DataDiskEncrypted", dataDiskEncrypted ? "true" : "false");
+}
+
 std::string CreateClusterTemplateRequest::getVpcId()const
 {
 	return vpcId_;

emr/src/model/CreateClusterV2Request.cc

@@ -458,6 +458,17 @@ void CreateClusterV2Request::setAccessKeyId(const std::string& accessKeyId)
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string CreateClusterV2Request::getDataDiskKMSKeyId()const
+{
+	return dataDiskKMSKeyId_;
+}
+
+void CreateClusterV2Request::setDataDiskKMSKeyId(const std::string& dataDiskKMSKeyId)
+{
+	dataDiskKMSKeyId_ = dataDiskKMSKeyId;
+	setParameter("DataDiskKMSKeyId", dataDiskKMSKeyId);
+}
+
 std::string CreateClusterV2Request::getRegionId()const
 {
 	return regionId_;
@@ -508,6 +519,17 @@ void CreateClusterV2Request::setUserDefinedEmrEcsRole(const std::string& userDef
 	setParameter("UserDefinedEmrEcsRole", userDefinedEmrEcsRole);
 }
 
+bool CreateClusterV2Request::getDataDiskEncrypted()const
+{
+	return dataDiskEncrypted_;
+}
+
+void CreateClusterV2Request::setDataDiskEncrypted(bool dataDiskEncrypted)
+{
+	dataDiskEncrypted_ = dataDiskEncrypted;
+	setParameter("DataDiskEncrypted", dataDiskEncrypted ? "true" : "false");
+}
+
 std::string CreateClusterV2Request::getWhiteListType()const
 {
 	return whiteListType_;

emr/src/model/DescribeClusterBasicInfoResult.cc

@@ -148,6 +148,10 @@ void DescribeClusterBasicInfoResult::parse(const std::string &payload)
 		clusterInfo_.operationId = clusterInfoNode["OperationId"].asString();
 	if(!clusterInfoNode["ClickhouseConf"].isNull())
 		clusterInfo_.clickhouseConf = clusterInfoNode["ClickhouseConf"].asString();
+	if(!clusterInfoNode["DataDiskEncrypted"].isNull())
+		clusterInfo_.dataDiskEncrypted = clusterInfoNode["DataDiskEncrypted"].asString() == "true";
+	if(!clusterInfoNode["DataDiskKMSKeyId"].isNull())
+		clusterInfo_.dataDiskKMSKeyId = clusterInfoNode["DataDiskKMSKeyId"].asString();
 	auto allGatewayClusterInfoListNode = clusterInfoNode["GatewayClusterInfoList"]["GatewayClusterInfo"];
 	for (auto clusterInfoNodeGatewayClusterInfoListGatewayClusterInfo : allGatewayClusterInfoListNode)
 	{

emr/src/model/DescribeClusterTemplateResult.cc

@@ -110,6 +110,10 @@ void DescribeClusterTemplateResult::parse(const std::string &payload)
 		templateInfo_.metaStoreType = templateInfoNode["MetaStoreType"].asString();
 	if(!templateInfoNode["MetaStoreConf"].isNull())
 		templateInfo_.metaStoreConf = templateInfoNode["MetaStoreConf"].asString();
+	if(!templateInfoNode["DataDiskEncrypted"].isNull())
+		templateInfo_.dataDiskEncrypted = templateInfoNode["DataDiskEncrypted"].asString() == "true";
+	if(!templateInfoNode["DataDiskKMSKeyId"].isNull())
+		templateInfo_.dataDiskKMSKeyId = templateInfoNode["DataDiskKMSKeyId"].asString();
 	auto allBootstrapActionListNode = templateInfoNode["BootstrapActionList"]["BootstrapAction"];
 	for (auto templateInfoNodeBootstrapActionListBootstrapAction : allBootstrapActionListNode)
 	{

emr/src/model/DescribeClusterV2Result.cc

@@ -142,6 +142,10 @@ void DescribeClusterV2Result::parse(const std::string &payload)
 		clusterInfo_.metaStoreType = clusterInfoNode["MetaStoreType"].asString();
 	if(!clusterInfoNode["K8sClusterId"].isNull())
 		clusterInfo_.k8sClusterId = clusterInfoNode["K8sClusterId"].asString();
+	if(!clusterInfoNode["DataDiskEncrypted"].isNull())
+		clusterInfo_.dataDiskEncrypted = clusterInfoNode["DataDiskEncrypted"].asString() == "true";
+	if(!clusterInfoNode["DataDiskKMSKeyId"].isNull())
+		clusterInfo_.dataDiskKMSKeyId = clusterInfoNode["DataDiskKMSKeyId"].asString();
 	auto allGatewayClusterInfoListNode = clusterInfoNode["GatewayClusterInfoList"]["GatewayClusterInfo"];
 	for (auto clusterInfoNodeGatewayClusterInfoListGatewayClusterInfo : allGatewayClusterInfoListNode)
 	{