Skip to content

Commit 3b9742a

Browse files
WeiMengXSWeiMengXS
WeiMengXS
and
WeiMengXS
authored
Fix/ssl reapply certificate (#2133)
* fix: ssl * fix: ssl * fix: rebase * fix: ssl * fix: ssl * fix: ssl * doc: changelog * doc: changelog * doc: changelog * feat: fix err message * feat: fix err message * feat: fix err message * feat: fix err message * feat: fix err message * feat: fix err message --------- Co-authored-by: WeiMengXS <nickcchen@tencent.com>
1 parent 709c62a commit 3b9742a

16 files changed

+2142
-1459
lines changed

‎.changelog/2133.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
resource/tencentcloud_tdmq_rocketmq_group: Fix certificate import issue
3+
```

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ require (
7575
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ses v1.0.748
7676
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sms v1.0.486
7777
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sqlserver v1.0.689
78-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl v1.0.737
78+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl v1.0.750
7979
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssm v1.0.691
8080
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sts v1.0.524
8181
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tag v1.0.677

‎go.sum‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -860,12 +860,21 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.730/go.mod
860860
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.732/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
861861
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.734/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
862862
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.736/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
863+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.741 h1:lQMXqycdqNkCq6HkAA8yi3CHcRar+leQ8XN1fMvceRg=
864+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.741/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
865+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.742 h1:Qno5G08Ppz9nfi0M9yLNnyY+9vsr4TqvWLEp4xnX7yw=
866+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.742/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
867+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.743/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
868+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.744/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
869+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.745 h1:esd+b4fHf6ZgaryrrEN9Sz7QBTpnozl1cIuZ+bRgZbk=
863870
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.737/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
864871
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.745/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
865872
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.746/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
866873
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.748/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
867874
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.749 h1:zqRnwIFnylN9TF+Rsds8JCLZr/ZugEEJcr7mpClbVS4=
868875
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.749/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
876+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.750 h1:zATJQLrw+i0NRosWvoAZ4FM+GbloqovVJGxLCdcjr/w=
877+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.750/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
869878
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.751 h1:sHCCpDtSIT2DlFNm0PHmoWuUL9np0u6XReVkyoXWfc8=
870879
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.751/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
871880
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624 h1:nEZqsoqt1pEoaP9JjkHQy3/H00suCfzlHW1qOm2nYD8=
@@ -936,6 +945,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sqlserver v1.0.689 h1:S
936945
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sqlserver v1.0.689/go.mod h1:nRLv9M2dJm5gH5xlwg8KSJ30g5qOO07mkAePzXoEGVM=
937946
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl v1.0.737 h1:jwXNUvSfYkSMMqdNtpXvWBxRFG6Vo2Zq55pT0pmUEb4=
938947
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl v1.0.737/go.mod h1:8GgTEIpk5TW0mDB/FVV/vNSzijtEMiF42AcHf/NpfRA=
948+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl v1.0.750 h1:NjStL4fGljYfdmlvUxAROKmZFiagWXKNo4KOMWwxUag=
949+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl v1.0.750/go.mod h1:Z/ycmVll9kddil+V9p5QFtQTcwKycwr3C8AagDjZ9Gk=
939950
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssm v1.0.691 h1:UE55TqueOP889MDcJ+cBW+MBjtzvWUw5fuOBWGCBIjs=
940951
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssm v1.0.691/go.mod h1:IRaYO5mSpBMPX8ydImTcL3jyuEkALEu/55Myb0a+GMs=
941952
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sts v1.0.524 h1:Hda8mBEoQVwkRAaZqztUAWn/n4HCYHZYEwzFBwYKaaM=

‎tencentcloud/extension_ssl.go‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,22 @@ package tencentcloud
33
const (
44
SSL_MODULE_TYPE = "ssl"
55
SSL_WITH_CERT = "1"
6+
)
67

7-
SSL_STATUS_AVAILABLE = 1
8-
SSL_STATUS_TO_BE_COMMIT = 5
8+
const (
9+
SSL_STATUS_PENDING = iota
10+
SSL_STATUS_AVAILABLE
11+
SSL_STATUS_REJECTED
12+
SSL_STATUS_EXPIRED
13+
SSL_STATUS_DNS_ADDED
14+
SSL_STATUS_PENDING_SUB
15+
SSL_STATUS_CANCELING
16+
SSL_STATUS_CANCELED
17+
SSL_STATUS_DATA_PENDING
18+
SSL_STATUS_REVOKING
19+
SSL_STATUS_REVOKED
20+
SSL_STATUS_REISSUING
21+
SSL_STATUS_REVOCATION_PENDING
922
)
1023

1124
const (
@@ -31,6 +44,10 @@ const (
3144
InvalidParameterValue = "InvalidParameterValue"
3245
CertificateInvalid = "FailedOperation.CertificateInvalid"
3346
)
47+
const SSL_ERR_CANCELING = `
48+
The update of the information field is still ongoing. Please retry the "terraform apply" later and then check whether the update process is complete.
49+
For more information, please refer to the documentation:
50+
https://registry.terraform.io/providers/tencentcloudstack/tencentcloud/latest/docs/resources/ssl_pay_certificate.`
3451

3552
var CsrTypeArr = []string{
3653
CsrTypeOnline,
@@ -47,6 +64,12 @@ var SSL_CERT_TYPE = []string{
4764
SSL_CERT_TYPE_SERVER,
4865
SSL_CERT_TYPE_CA,
4966
}
67+
68+
var SslCanCancelStatus = map[uint64]struct{}{
69+
SSL_STATUS_PENDING: {},
70+
SSL_STATUS_DNS_ADDED: {},
71+
SSL_STATUS_DATA_PENDING: {},
72+
}
5073
var DNSPOD_OV_EV_TYPE = []int64{51, 52, 53}
5174
var GEOTRUST_OV_EV_TYPE = []int64{8, 9, 10}
5275
var SECURESITE_OV_EV_TYPE = []int64{3, 4, 5, 6, 7}

‎tencentcloud/provider.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -884,7 +884,6 @@ SSL Certificates
884884
tencentcloud_ssl_certificate
885885
tencentcloud_ssl_pay_certificate
886886
tencentcloud_ssl_free_certificate
887-
tencentcloud_ssl_commit_certificate_information
888887
889888
Secrets Manager(SSM)
890889
Data Source
@@ -3052,7 +3051,6 @@ func Provider() *schema.Provider {
30523051
"tencentcloud_dlc_work_group": resourceTencentCloudDlcWorkGroup(),
30533052
"tencentcloud_dlc_user": resourceTencentCloudDlcUser(),
30543053
"tencentcloud_wedata_rule_template": resourceTencentCloudWedataRuleTemplate(),
3055-
"tencentcloud_ssl_commit_certificate_information": resourceTencentCloudSslCommitCertificateInformation(),
30563054
},
30573055

30583056
ConfigureFunc: providerConfigure,

‎tencentcloud/resource_tc_ssl_commit_certificate_information.go‎

Lines changed: 0 additions & 191 deletions
This file was deleted.

‎tencentcloud/resource_tc_ssl_commit_certificate_information_test.go‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

0 commit comments

Comments
 (0)