From aff66353b7242f43deba72b65501643e3e8c321b Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Mon, 24 Mar 2025 15:37:36 +0800 Subject: [PATCH 1/2] add --- go.mod | 2 +- go.sum | 4 ++++ ...os_bucket_domain_certificate_attachment.go | 8 +++++++ ...os_bucket_domain_certificate_attachment.md | 23 +++++++++++++----- .../tencentyun/cos-go-sdk-v5/bucket_domain.go | 1 + .../tencentyun/cos-go-sdk-v5/cos.go | 2 +- vendor/modules.txt | 2 +- ...omain_certificate_attachment.html.markdown | 24 +++++++++++++++---- 8 files changed, 52 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index da7b6bdf45..c52a3e78b5 100644 --- a/go.mod +++ b/go.mod @@ -100,7 +100,7 @@ require ( github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.1037 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata v1.0.792 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199 - github.com/tencentyun/cos-go-sdk-v5 v0.7.42-0.20230629101357-7edd77448a0f + github.com/tencentyun/cos-go-sdk-v5 v0.7.43-0.20250323165138-7caf1417f17b github.com/yangwenmai/ratelimit v0.0.0-20180104140304-44221c2292e1 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/go.sum b/go.sum index d7c7e2d1b2..bbb5046f91 100644 --- a/go.sum +++ b/go.sum @@ -1063,6 +1063,10 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199 h1:hMBLtiJ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199/go.mod h1:nnY91/H3j/Gu7V/oCA6Zeg8T5D3q36EUdBh4EjmHwqY= github.com/tencentyun/cos-go-sdk-v5 v0.7.42-0.20230629101357-7edd77448a0f h1:yTMDoBvFuXjZat10d98DIKbPnN9FQG+drt1SbNfMW5U= github.com/tencentyun/cos-go-sdk-v5 v0.7.42-0.20230629101357-7edd77448a0f/go.mod h1:LUFnaqRmGk6pEHOaRmdn2dCZR2j0cSsM5xowWFPTPao= +github.com/tencentyun/cos-go-sdk-v5 v0.7.42 h1:Up1704BJjI5orycXKjpVpvuOInt9GC5pqY4knyE9Uds= +github.com/tencentyun/cos-go-sdk-v5 v0.7.42/go.mod h1:LUFnaqRmGk6pEHOaRmdn2dCZR2j0cSsM5xowWFPTPao= +github.com/tencentyun/cos-go-sdk-v5 v0.7.43-0.20250323165138-7caf1417f17b h1:cyj7Mh5Df+I3YqFupRPgGKPyZGbhO6oCGVpKBuVWy+I= +github.com/tencentyun/cos-go-sdk-v5 v0.7.43-0.20250323165138-7caf1417f17b/go.mod h1:LUFnaqRmGk6pEHOaRmdn2dCZR2j0cSsM5xowWFPTPao= github.com/tenntenn/modver v1.0.1 h1:2klLppGhDgzJrScMpkj9Ujy3rXPUspSjAcev9tSEBgA= github.com/tenntenn/modver v1.0.1/go.mod h1:bePIyQPb7UeioSRkw3Q0XeMhYZSMx9B8ePqg6SAMGH0= github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3 h1:f+jULpRQGxTSkNYKJ51yaw6ChIqO+Je8UqsTKN/cDag= diff --git a/tencentcloud/services/cos/resource_tc_cos_bucket_domain_certificate_attachment.go b/tencentcloud/services/cos/resource_tc_cos_bucket_domain_certificate_attachment.go index c2b0c2ff4e..8c4947d78a 100644 --- a/tencentcloud/services/cos/resource_tc_cos_bucket_domain_certificate_attachment.go +++ b/tencentcloud/services/cos/resource_tc_cos_bucket_domain_certificate_attachment.go @@ -61,6 +61,11 @@ func ResourceTencentCloudCosBucketDomainCertificateAttachment() *schema.Resource Description: "Custom certificate.", Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ + "cert_id": { + Type: schema.TypeString, + Optional: true, + Description: "ID of certificate.", + }, "cert": { Type: schema.TypeString, Required: true, @@ -112,6 +117,9 @@ func resourceTencentCloudCosBucketDomainCertificateAttachmentCreate(d *schema.Re } if CustomCertMap, ok := helper.InterfaceToMap(certMap, "custom_cert"); ok { customCert := cos.BucketDomainCustomCert{} + if v, ok := CustomCertMap["cert_id"]; ok { + customCert.CertId = v.(string) + } if v, ok := CustomCertMap["cert"]; ok { customCert.Cert = v.(string) } diff --git a/tencentcloud/services/cos/resource_tc_cos_bucket_domain_certificate_attachment.md b/tencentcloud/services/cos/resource_tc_cos_bucket_domain_certificate_attachment.md index f7ca0909fa..cec467b8fd 100644 --- a/tencentcloud/services/cos/resource_tc_cos_bucket_domain_certificate_attachment.md +++ b/tencentcloud/services/cos/resource_tc_cos_bucket_domain_certificate_attachment.md @@ -5,19 +5,30 @@ Provides a resource to attach/detach the corresponding certificate for the domai Example Usage ```hcl +data "tencentcloud_user_info" "info" {} -resource "tencentcloud_cos_bucket_domain_certificate_attachment" "foo" { - bucket = "" +locals { + app_id = data.tencentcloud_user_info.info.app_id +} + +resource "tencentcloud_cos_bucket" "example" { + bucket = "private-bucket-${local.app_id}" + acl = "private" + force_clean = true +} + +resource "tencentcloud_cos_bucket_domain_certificate_attachment" "example" { + bucket = tencentcloud_cos_bucket.example.id domain_certificate { - domain = "domain_name" + domain = "www.example.com" certificate { cert_type = "CustomCert" custom_cert { - cert = "===CERTIFICATE===" - private_key = "===PRIVATE_KEY===" + cert_id = "Mbx45wts" + cert = "-----BEGIN CERTIFICATE-----" + private_key = "-----BEGIN RSA PRIVATE_KEY-----" } } } } - ``` \ No newline at end of file diff --git a/vendor/github.com/tencentyun/cos-go-sdk-v5/bucket_domain.go b/vendor/github.com/tencentyun/cos-go-sdk-v5/bucket_domain.go index a89068e25d..02e440b272 100644 --- a/vendor/github.com/tencentyun/cos-go-sdk-v5/bucket_domain.go +++ b/vendor/github.com/tencentyun/cos-go-sdk-v5/bucket_domain.go @@ -63,6 +63,7 @@ type BucketDomainCertificateInfo struct { CustomCert *BucketDomainCustomCert `xml:"CustomCert,omitempty"` } type BucketDomainCustomCert struct { + CertId string `xml:"CertId,omitempty"` Cert string `xml:"Cert,omitempty"` PrivateKey string `xml:"PrivateKey,omitempty"` } diff --git a/vendor/github.com/tencentyun/cos-go-sdk-v5/cos.go b/vendor/github.com/tencentyun/cos-go-sdk-v5/cos.go index 84ceb12592..ca2da1bbba 100644 --- a/vendor/github.com/tencentyun/cos-go-sdk-v5/cos.go +++ b/vendor/github.com/tencentyun/cos-go-sdk-v5/cos.go @@ -24,7 +24,7 @@ import ( const ( // Version current go sdk version - Version = "0.7.42" + Version = "0.7.42.1" UserAgent = "cos-go-sdk-v5/" + Version contentTypeXML = "application/xml" defaultServiceBaseURL = "http://service.cos.myqcloud.com" diff --git a/vendor/modules.txt b/vendor/modules.txt index 0c5e6ff8fe..a7552cc7e0 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1358,7 +1358,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata/v20210820 # github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199 ## explicit; go 1.14 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss/v20180426 -# github.com/tencentyun/cos-go-sdk-v5 v0.7.42-0.20230629101357-7edd77448a0f +# github.com/tencentyun/cos-go-sdk-v5 v0.7.43-0.20250323165138-7caf1417f17b ## explicit; go 1.12 github.com/tencentyun/cos-go-sdk-v5 # github.com/tetafro/godot v1.4.11 diff --git a/website/docs/r/cos_bucket_domain_certificate_attachment.html.markdown b/website/docs/r/cos_bucket_domain_certificate_attachment.html.markdown index 748dd9cb64..921f872764 100644 --- a/website/docs/r/cos_bucket_domain_certificate_attachment.html.markdown +++ b/website/docs/r/cos_bucket_domain_certificate_attachment.html.markdown @@ -16,15 +16,28 @@ Provides a resource to attach/detach the corresponding certificate for the domai ## Example Usage ```hcl -resource "tencentcloud_cos_bucket_domain_certificate_attachment" "foo" { - bucket = "" +data "tencentcloud_user_info" "info" {} + +locals { + app_id = data.tencentcloud_user_info.info.app_id +} + +resource "tencentcloud_cos_bucket" "example" { + bucket = "private-bucket-${local.app_id}" + acl = "private" + force_clean = true +} + +resource "tencentcloud_cos_bucket_domain_certificate_attachment" "example" { + bucket = tencentcloud_cos_bucket.example.id domain_certificate { - domain = "domain_name" + domain = "www.example.com" certificate { cert_type = "CustomCert" custom_cert { - cert = "===CERTIFICATE===" - private_key = "===PRIVATE_KEY===" + cert_id = "Mbx45wts" + cert = "-----BEGIN CERTIFICATE-----" + private_key = "-----BEGIN RSA PRIVATE_KEY-----" } } } @@ -47,6 +60,7 @@ The `custom_cert` object of `certificate` supports the following: * `cert` - (Required, String) Public key of certificate. * `private_key` - (Required, String) Private key of certificate. +* `cert_id` - (Optional, String) ID of certificate. The `domain_certificate` object supports the following: From 7ee66ebedcd415c89f8d96997da0573edd19cfc9 Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Mon, 24 Mar 2025 15:40:38 +0800 Subject: [PATCH 2/2] add --- .changelog/3235.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/3235.txt diff --git a/.changelog/3235.txt b/.changelog/3235.txt new file mode 100644 index 0000000000..19362e5f94 --- /dev/null +++ b/.changelog/3235.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/tencentcloud_cos_bucket_domain_certificate_attachment: support `cert_id` params +``` \ No newline at end of file