Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

resource/alicloud_oss_bucket: Server side encryption support SM4 #8521

Merged
merged 1 commit into from
Mar 20, 2025
Merged

resource/alicloud_oss_bucket: Server side encryption support SM4 #8521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions alicloud/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,7 @@ func IntMin(x, y int) int {

const ServerSideEncryptionAes256 = "AES256"
const ServerSideEncryptionKMS = "KMS"
const ServerSideEncryptionSM4 = "SM4"

type OptimizedType string

Expand Down
22 changes: 21 additions & 1 deletion alicloud/resource_alicloud_oss_bucket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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))
}
}
}

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
Loading
Loading