resource/alicloud_oss_bucket: Server side encryption support SM4

Author: dddinary

alicloud/common.go

@@ -563,6 +563,7 @@ func IntMin(x, y int) int {
 
 const ServerSideEncryptionAes256 = "AES256"
 const ServerSideEncryptionKMS = "KMS"
+const ServerSideEncryptionSM4 = "SM4"
 
 type OptimizedType string
 

alicloud/resource_alicloud_oss_bucket.go

@@ -404,12 +404,21 @@ func resourceAlicloudOssBucket() *schema.Resource {
 							ValidateFunc: StringInSlice([]string{
 								ServerSideEncryptionAes256,
 								ServerSideEncryptionKMS,
+								ServerSideEncryptionSM4,
 							}, false),
 						},
 						"kms_master_key_id": {
 							Type:     schema.TypeString,
 							Optional: true,
 						},
+						"kms_data_encryption": {
+							Type:     schema.TypeString,
+							Optional: true,
+							ValidateFunc: StringInSlice([]string{
+								ServerSideEncryptionSM4,
+								"",
+							}, false),
+						},
 					},
 				},
 				MaxItems: 1,
@@ -534,9 +543,13 @@ func resourceAlicloudOssBucketCreate(d *schema.ResourceData, meta interface{}) e
 				options = append(options, oss.SetHeader("x-oss-server-side-encryption", sse_algorithm))
 			}
 
-			if sse_kms_id, ok := sse_rule["kms_master_key_id"].(string); ok {
+			if sse_kms_id, ok := sse_rule["kms_master_key_id"].(string); ok && sse_kms_id != "" {
 				options = append(options, oss.SetHeader("x-oss-server-side-encryption-key-id", sse_kms_id))
 			}
+
+			if kms_data_encryption, ok := sse_rule["kms_data_encryption"].(string); ok && kms_data_encryption != "" {
+				options = append(options, oss.SetHeader("x-oss-server-side-data-encryption", kms_data_encryption))
+			}
 		}
 	}
 
@@ -610,6 +623,9 @@ func resourceAlicloudOssBucketRead(d *schema.ResourceData, meta interface{}) err
 			if object.BucketInfo.SseRule.KMSMasterKeyID != "" {
 				rule["kms_master_key_id"] = object.BucketInfo.SseRule.KMSMasterKeyID
 			}
+			if object.BucketInfo.SseRule.KMSDataEncryption != "" {
+				rule["kms_data_encryption"] = object.BucketInfo.SseRule.KMSDataEncryption
+			}
 			data := make([]map[string]interface{}, 0)
 			data = append(data, rule)
 			d.Set("server_side_encryption_rule", data)
@@ -1577,6 +1593,10 @@ func resourceAlicloudOssBucketEncryptionUpdate(client *connectivity.AliyunClient
 		sseRule.SSEDefault.KMSMasterKeyID = v.(string)
 	}
 
+	if v, ok := c["kms_data_encryption"]; ok {
+		sseRule.SSEDefault.KMSDataEncryption = v.(string)
+	}
+
 	raw, err := client.WithOssClient(func(ossClient *oss.Client) (interface{}, error) {
 		requestInfo = ossClient
 		return nil, ossClient.SetBucketEncryption(d.Id(), sseRule)