Merge pull request #2075 from tencentcloudstack/feat/ssm

Feat/ssm

Author: andrew-tx

.changelog/2075.txt

@@ -0,0 +1,15 @@
+```release-note:enhancement
+data_source/tencentcloud_ssm_secrets: Support `secret_type`, `product_name`, Update return value
+```
+
+```release-note:enhancement
+resource/tencentcloud_ssm_product_secret: Support `tags`, Update return value
+```
+
+```release-note:enhancement
+resource/tencentcloud_ssm_secret: Support `tags`
+```
+
+```release-note:enhancement
+resource/tencentcloud_ssm_ssh_key_pair_secret: Support `tags`
+```

tencentcloud/data_source_tc_ssm_products.go

@@ -22,14 +22,11 @@ func dataSourceTencentCloudSsmProducts() *schema.Resource {
 		Read: dataSourceTencentCloudSsmProductsRead,
 		Schema: map[string]*schema.Schema{
 			"products": {
-				Computed: true,
-				Type:     schema.TypeSet,
-				Elem: &schema.Schema{
-					Type: schema.TypeString,
-				},
+				Computed:    true,
+				Type:        schema.TypeSet,
+				Elem:        &schema.Schema{Type: schema.TypeString},
 				Description: "List of supported services.",
 			},
-
 			"result_output_file": {
 				Type:        schema.TypeString,
 				Optional:    true,
@@ -43,37 +40,38 @@ func dataSourceTencentCloudSsmProductsRead(d *schema.ResourceData, meta interfac
 	defer logElapsed("data_source.tencentcloud_ssm_products.read")()
 	defer inconsistentCheck(d, meta)()
 
-	logId := getLogId(contextNil)
-
-	ctx := context.WithValue(context.TODO(), logIdKey, logId)
-
-	service := SsmService{client: meta.(*TencentCloudClient).apiV3Conn}
-
-	var products []*string
+	var (
+		logId    = getLogId(contextNil)
+		ctx      = context.WithValue(context.TODO(), logIdKey, logId)
+		service  = SsmService{client: meta.(*TencentCloudClient).apiV3Conn}
+		products []*string
+	)
 
 	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
 		result, e := service.DescribeSsmProductsByFilter(ctx)
 		if e != nil {
 			return retryError(e)
 		}
+
 		products = result
 		return nil
 	})
+
 	if err != nil {
 		return err
 	}
 
 	if products != nil {
 		_ = d.Set("products", products)
 	}
-	ids := helper.StrListToStr(products)
 
-	d.SetId(ids)
+	d.SetId(helper.StrListToStr(products))
 	output, ok := d.GetOk("result_output_file")
 	if ok && output.(string) != "" {
 		if e := writeToFile(output.(string), products); e != nil {
 			return e
 		}
 	}
+
 	return nil
 }

tencentcloud/data_source_tc_ssm_products_test.go

@@ -6,6 +6,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
+// go test -i; go test -test.run TestAccTencentCloudSsmProductsDataSource_basic -v
 func TestAccTencentCloudSsmProductsDataSource_basic(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
@@ -16,13 +17,14 @@ func TestAccTencentCloudSsmProductsDataSource_basic(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: testAccSsmProductsDataSource,
-				Check:  resource.ComposeTestCheckFunc(testAccCheckTencentCloudDataSourceID("data.tencentcloud_ssm_products.products")),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckTencentCloudDataSourceID("data.tencentcloud_ssm_products.products"),
+				),
 			},
 		},
 	})
 }
 
 const testAccSsmProductsDataSource = `
-
 data "tencentcloud_ssm_products" "products" {}
 `

tencentcloud/data_source_tc_ssm_secret_versions.go

@@ -1,11 +1,27 @@
 /*
 Use this data source to query detailed information of SSM secret version
+
 Example Usage
+
 ```hcl
+data "tencentcloud_ssm_secret_versions" "example" {
+  secret_name = tencentcloud_ssm_secret_version.v1.secret_name
+  version_id  = tencentcloud_ssm_secret_version.v1.version_id
+}
+
+resource "tencentcloud_ssm_secret" "example" {
+  secret_name = "tf-example"
+  description = "desc."
 
-data "tencentcloud_ssm_secret_versions" "foo" {
-  secret_name = "test"
-  version_id = "v1"
+  tags = {
+    createdBy = "terraform"
+  }
+}
+
+resource "tencentcloud_ssm_secret_version" "v1" {
+  secret_name   = tencentcloud_ssm_secret.example.secret_name
+  version_id    = "v1"
+  secret_binary = "MTIzMTIzMTIzMTIzMTIzQQ=="
 }
 ```
 */
@@ -72,22 +88,24 @@ func dataSourceTencentCloudSsmSecretVersions() *schema.Resource {
 func dataSourceTencentCloudSsmSecretVersionsRead(d *schema.ResourceData, meta interface{}) error {
 	defer logElapsed("data_source.tencentcloud_ssm_secret_versions.read")()
 
-	logId := getLogId(contextNil)
-	ctx := context.WithValue(context.TODO(), logIdKey, logId)
-	ssmService := SsmService{
-		client: meta.(*TencentCloudClient).apiV3Conn,
-	}
+	var (
+		logId         = getLogId(contextNil)
+		ctx           = context.WithValue(context.TODO(), logIdKey, logId)
+		ssmService    = SsmService{client: meta.(*TencentCloudClient).apiV3Conn}
+		secretName    = d.Get("secret_name").(string)
+		outErr, inErr error
+		secretInfo    *SecretInfo
+	)
 
-	secretName := d.Get("secret_name").(string)
-	var outErr, inErr error
-	var secretInfo *SecretInfo
 	outErr = resource.Retry(readRetryTimeout, func() *resource.RetryError {
 		secretInfo, inErr = ssmService.DescribeSecretByName(ctx, secretName)
 		if inErr != nil {
 			return retryError(inErr)
 		}
+
 		return nil
 	})
+
 	if outErr != nil {
 		sdkErr, ok := outErr.(*sdkError.TencentCloudSDKError)
 		if ok && sdkErr.Code == SSMResourceNotFound {
@@ -99,10 +117,12 @@ func dataSourceTencentCloudSsmSecretVersionsRead(d *schema.ResourceData, meta in
 		log.Printf("[CRITAL]%s read SSM secret failed, reason:%+v", logId, outErr)
 		return outErr
 	}
+
 	if secretInfo.status != SSM_STATUS_ENABLED {
 		log.Printf("[CRITAL]%s read SSM secret version failed, reason: secret status is not Enabled", logId)
 		return nil
 	}
+
 	var secretVersionInfos []*SecretVersionInfo
 	var versionIds []string
 	if v, ok := d.GetOk("version_id"); ok {
@@ -154,8 +174,10 @@ func dataSourceTencentCloudSsmSecretVersionsRead(d *schema.ResourceData, meta in
 		log.Printf("[CRITAL]%s provider set SSM secret version list fail, reason:%+v", logId, e)
 		return e
 	}
+
 	if output, ok := d.GetOk("result_output_file"); ok && output.(string) != "" {
 		return writeToFile(output.(string), secretVersionList)
 	}
+
 	return nil
 }

tencentcloud/data_source_tc_ssm_secret_versions_test.go

@@ -6,9 +6,10 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
+// go test -i; go test -test.run TestAccTencentCloudSsmSecretVersionsDataSource -v
 func TestAccTencentCloudSsmSecretVersionsDataSource(t *testing.T) {
 	t.Parallel()
-	dataSourceName := "data.tencentcloud_ssm_secret_versions.secret_version"
+	dataSourceName := "data.tencentcloud_ssm_secret_versions.example"
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:  func() { testAccPreCheck(t) },
@@ -27,23 +28,23 @@ func TestAccTencentCloudSsmSecretVersionsDataSource(t *testing.T) {
 }
 
 const TestAccTencentCloudSsmSecretVersionsDataSourceConfig = `
-resource "tencentcloud_ssm_secret" "secret" {
-  secret_name = "unit-test-ver-data"
-  description = "test secret"
+data "tencentcloud_ssm_secret_versions" "example" {
+  secret_name = tencentcloud_ssm_secret_version.v1.secret_name
+  version_id  = tencentcloud_ssm_secret_version.v1.version_id
+}
+
+resource "tencentcloud_ssm_secret" "example" {
+  secret_name = "tf-example-ssm-unit-test"
+  description = "desc."
 
   tags = {
-    test-tag = "test"
+    createdBy = "terraform"
   }
 }
 
 resource "tencentcloud_ssm_secret_version" "v1" {
-  secret_name = tencentcloud_ssm_secret.secret.secret_name
-  version_id = "v1"
+  secret_name   = tencentcloud_ssm_secret.example.secret_name
+  version_id    = "v1"
   secret_binary = "MTIzMTIzMTIzMTIzMTIzQQ=="
 }
-
-data "tencentcloud_ssm_secret_versions" "secret_version" {
-  secret_name = tencentcloud_ssm_secret_version.v1.secret_name
-  version_id = tencentcloud_ssm_secret_version.v1.version_id
-}
 `