From d69dbe00449c8daecbd80c292910c41e5eb384c3 Mon Sep 17 00:00:00 2001 From: mikatong Date: Fri, 1 Apr 2022 15:16:06 +0800 Subject: [PATCH] fix: gaap unit test --- tencentcloud/resource_tc_gaap_certificate.go | 5 ----- .../resource_tc_gaap_certificate_test.go | 17 ----------------- tencentcloud/resource_tc_gaap_proxy_test.go | 4 ++++ 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/tencentcloud/resource_tc_gaap_certificate.go b/tencentcloud/resource_tc_gaap_certificate.go index fe654276f7..432cc8d676 100644 --- a/tencentcloud/resource_tc_gaap_certificate.go +++ b/tencentcloud/resource_tc_gaap_certificate.go @@ -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, @@ -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") diff --git a/tencentcloud/resource_tc_gaap_certificate_test.go b/tencentcloud/resource_tc_gaap_certificate_test.go index cc3ef4e5cb..ea6c002eeb 100644 --- a/tencentcloud/resource_tc_gaap_certificate_test.go +++ b/tencentcloud/resource_tc_gaap_certificate_test.go @@ -25,8 +25,6 @@ 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"), @@ -34,11 +32,6 @@ func TestAccTencentCloudGaapCertificate_basic(t *testing.T) { resource.TestCheckResourceAttr("tencentcloud_gaap_certificate.foo", "subject_cn", ""), ), }, - { - ResourceName: "tencentcloud_gaap_certificate.foo", - ImportState: true, - ImportStateVerify: true, - }, }, }) } @@ -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"), @@ -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"), @@ -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"), @@ -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"), @@ -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"), diff --git a/tencentcloud/resource_tc_gaap_proxy_test.go b/tencentcloud/resource_tc_gaap_proxy_test.go index 4ab49fe458..50da699137 100644 --- a/tencentcloud/resource_tc_gaap_proxy_test.go +++ b/tencentcloud/resource_tc_gaap_proxy_test.go @@ -237,6 +237,10 @@ resource tencentcloud_gaap_proxy "foo" { access_region = "Guangzhou" realserver_region = "Beijing" enable = false + + tags = { + "test" = "test" + } } `