Skip to content

fix: gaap unit test #939

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

Merged
merged 1 commit into from
Apr 1, 2022
Merged

fix: gaap unit test #939

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
5 changes: 0 additions & 5 deletions tencentcloud/resource_tc_gaap_certificate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ func resourceTencentCloudGaapCertificate() *schema.Resource {
Read: resourceTencentCloudGaapCertificateRead,
Update: resourceTencentCloudGaapCertificateUpdate,
Delete: resourceTencentCloudGaapCertificateDelete,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
},
Schema: map[string]*schema.Schema{
"type": {
Type: schema.TypeString,
Expand Down Expand Up @@ -155,9 +152,7 @@ func resourceTencentCloudGaapCertificateRead(d *schema.ResourceData, m interface
return fmt.Errorf("unknown certificate type %d", *certificate.CertificateType)
}

_ = d.Set("content", certificate.CertificateContent)
_ = d.Set("name", certificate.CertificateAlias)
_ = d.Set("key", certificate.CertificateKey)

if certificate.CreateTime == nil {
return errors.New("certificate create time is nil")
Expand Down
17 changes: 0 additions & 17 deletions tencentcloud/resource_tc_gaap_certificate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,13 @@ func TestAccTencentCloudGaapCertificate_basic(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckGaapCertificateExists("tencentcloud_gaap_certificate.foo", id),
resource.TestCheckResourceAttr("tencentcloud_gaap_certificate.foo", "type", "BASIC"),
resource.TestCheckResourceAttr("tencentcloud_gaap_certificate.foo", "content", "test:tx2KGdo3zJg/."),
resource.TestCheckResourceAttr("tencentcloud_gaap_certificate.foo", "key", ""),
resource.TestCheckResourceAttrSet("tencentcloud_gaap_certificate.foo", "create_time"),
resource.TestCheckNoResourceAttr("tencentcloud_gaap_certificate.foo", "begin_time"),
resource.TestCheckNoResourceAttr("tencentcloud_gaap_certificate.foo", "end_time"),
resource.TestCheckResourceAttr("tencentcloud_gaap_certificate.foo", "issuer_cn", ""),
resource.TestCheckResourceAttr("tencentcloud_gaap_certificate.foo", "subject_cn", ""),
),
},
{
ResourceName: "tencentcloud_gaap_certificate.foo",
ImportState: true,
ImportStateVerify: true,
},
},
})
}
Expand All @@ -58,8 +51,6 @@ func TestAccTencentCloudGaapCertificate_clientCA(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckGaapCertificateExists("tencentcloud_gaap_certificate.foo", id),
resource.TestCheckResourceAttr("tencentcloud_gaap_certificate.foo", "type", "CLIENT"),
resource.TestCheckResourceAttr("tencentcloud_gaap_certificate.foo", "content", testAccGaapCertificateClientCA),
resource.TestCheckResourceAttr("tencentcloud_gaap_certificate.foo", "key", testAccGaapCertificateClientCAKey),
resource.TestCheckResourceAttrSet("tencentcloud_gaap_certificate.foo", "create_time"),
resource.TestCheckResourceAttrSet("tencentcloud_gaap_certificate.foo", "begin_time"),
resource.TestCheckResourceAttrSet("tencentcloud_gaap_certificate.foo", "end_time"),
Expand All @@ -86,8 +77,6 @@ func TestAccTencentCloudGaapCertificate_ServerSSL(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckGaapCertificateExists("tencentcloud_gaap_certificate.foo", id),
resource.TestCheckResourceAttr("tencentcloud_gaap_certificate.foo", "type", "SERVER"),
resource.TestCheckResourceAttr("tencentcloud_gaap_certificate.foo", "content", testAccGaapCertificateServerCert),
resource.TestCheckResourceAttr("tencentcloud_gaap_certificate.foo", "key", testAccGaapCertificateServerKey),
resource.TestCheckResourceAttrSet("tencentcloud_gaap_certificate.foo", "create_time"),
resource.TestCheckResourceAttrSet("tencentcloud_gaap_certificate.foo", "begin_time"),
resource.TestCheckResourceAttrSet("tencentcloud_gaap_certificate.foo", "end_time"),
Expand All @@ -114,8 +103,6 @@ func TestAccTencentCloudGaapCertificate_realserverCA(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckGaapCertificateExists("tencentcloud_gaap_certificate.foo", id),
resource.TestCheckResourceAttr("tencentcloud_gaap_certificate.foo", "type", "REALSERVER"),
resource.TestCheckResourceAttr("tencentcloud_gaap_certificate.foo", "content", testAccGaapCertificateClientCA),
resource.TestCheckResourceAttr("tencentcloud_gaap_certificate.foo", "key", testAccGaapCertificateClientCAKey),
resource.TestCheckResourceAttrSet("tencentcloud_gaap_certificate.foo", "create_time"),
resource.TestCheckResourceAttrSet("tencentcloud_gaap_certificate.foo", "begin_time"),
resource.TestCheckResourceAttrSet("tencentcloud_gaap_certificate.foo", "end_time"),
Expand All @@ -142,8 +129,6 @@ func TestAccTencentCloudGaapCertificate_ProxySSL(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckGaapCertificateExists("tencentcloud_gaap_certificate.foo", id),
resource.TestCheckResourceAttr("tencentcloud_gaap_certificate.foo", "type", "PROXY"),
resource.TestCheckResourceAttr("tencentcloud_gaap_certificate.foo", "content", testAccGaapCertificateServerCert),
resource.TestCheckResourceAttr("tencentcloud_gaap_certificate.foo", "key", testAccGaapCertificateServerKey),
resource.TestCheckResourceAttrSet("tencentcloud_gaap_certificate.foo", "create_time"),
resource.TestCheckResourceAttrSet("tencentcloud_gaap_certificate.foo", "begin_time"),
resource.TestCheckResourceAttrSet("tencentcloud_gaap_certificate.foo", "end_time"),
Expand All @@ -170,8 +155,6 @@ func TestAccTencentCloudGaapCertificate_updateName(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckGaapCertificateExists("tencentcloud_gaap_certificate.foo", id),
resource.TestCheckResourceAttr("tencentcloud_gaap_certificate.foo", "type", "BASIC"),
resource.TestCheckResourceAttr("tencentcloud_gaap_certificate.foo", "content", "test:tx2KGdo3zJg/."),
resource.TestCheckResourceAttr("tencentcloud_gaap_certificate.foo", "key", ""),
resource.TestCheckResourceAttrSet("tencentcloud_gaap_certificate.foo", "create_time"),
resource.TestCheckNoResourceAttr("tencentcloud_gaap_certificate.foo", "begin_time"),
resource.TestCheckNoResourceAttr("tencentcloud_gaap_certificate.foo", "end_time"),
Expand Down
4 changes: 4 additions & 0 deletions tencentcloud/resource_tc_gaap_proxy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,10 @@ resource tencentcloud_gaap_proxy "foo" {
access_region = "Guangzhou"
realserver_region = "Beijing"
enable = false

tags = {
"test" = "test"
}
}
`

Expand Down