Merge branch 'master' into feat/cynosdb-transparent_encrypt

Author: gitmkn

.changelog/3618.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+tencentcloud_cynosdb_audit_service
+```

.changelog/3619.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_tdmq_rabbitmq_vip_instance: update doc
+```

.changelog/3621.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_cfw_nat_policy: optimiz update function code logic
+```

tencentcloud/provider.go

@@ -1808,6 +1808,9 @@ func Provider() *schema.Provider {
 			"tencentcloud_cynosdb_backup_config":                                                    cynosdb.ResourceTencentCloudCynosdbBackupConfig(),
 			"tencentcloud_cynosdb_ssl":                                                              cynosdb.ResourceTencentCloudCynosdbSsl(),
 			"tencentcloud_cynosdb_cluster_transparent_encrypt":                                      cynosdb.ResourceTencentCloudCynosdbClusterTransparentEncrypt(),
+			"tencentcloud_cynosdb_audit_log_file":                                                   cynosdb.ResourceTencentCloudCynosdbAuditLogFile(),
+			"tencentcloud_cynosdb_security_group":                                                   cynosdb.ResourceTencentCloudCynosdbSecurityGroup(),
+			"tencentcloud_cynosdb_audit_service":                                                    cynosdb.ResourceTencentCloudCynosdbAuditService(),
 			"tencentcloud_vod_adaptive_dynamic_streaming_template":                                  vod.ResourceTencentCloudVodAdaptiveDynamicStreamingTemplate(),
 			"tencentcloud_vod_image_sprite_template":                                                vod.ResourceTencentCloudVodImageSpriteTemplate(),
 			"tencentcloud_vod_procedure_template":                                                   vod.ResourceTencentCloudVodProcedureTemplate(),
@@ -2162,8 +2165,6 @@ func Provider() *schema.Provider {
 			"tencentcloud_ci_media_speech_recognition_template":                                     ci.ResourceTencentCloudCiMediaSpeechRecognitionTemplate(),
 			"tencentcloud_ci_guetzli":                                                               ci.ResourceTencentCloudCIGuetzli(),
 			"tencentcloud_ci_original_image_protection":                                             ci.ResourceTencentCloudCIOriginalImageProtection(),
-			"tencentcloud_cynosdb_audit_log_file":                                                   cynosdb.ResourceTencentCloudCynosdbAuditLogFile(),
-			"tencentcloud_cynosdb_security_group":                                                   cynosdb.ResourceTencentCloudCynosdbSecurityGroup(),
 			"tencentcloud_dayu_ddos_ip_attachment_v2":                                               dayuv2.ResourceTencentCloudDayuDDosIpAttachmentV2(),
 			"tencentcloud_antiddos_ddos_black_white_ip":                                             dayuv2.ResourceTencentCloudAntiddosDdosBlackWhiteIp(),
 			"tencentcloud_antiddos_ddos_geo_ip_block_config":                                        dayuv2.ResourceTencentCloudAntiddosDdosGeoIpBlockConfig(),

tencentcloud/provider.md

@@ -547,6 +547,7 @@ tencentcloud_cynosdb_upgrade_proxy_version
 tencentcloud_cynosdb_backup_config
 tencentcloud_cynosdb_ssl
 tencentcloud_cynosdb_cluster_transparent_encrypt
+tencentcloud_cynosdb_audit_service
 
 Direct Connect(DC)
 Data Source

tencentcloud/services/cfw/resource_tc_cfw_nat_policy.go

@@ -165,7 +165,6 @@ func resourceTencentCloudCfwNatPolicyCreate(d *schema.ResourceData, meta interfa
 	}
 
 	request.Rules = append(request.Rules, &createNatRuleItem)
-
 	err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
 		result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseCfwClient().AddNatAcRule(request)
 		if e != nil {
@@ -174,6 +173,10 @@ func resourceTencentCloudCfwNatPolicyCreate(d *schema.ResourceData, meta interfa
 			log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
 		}
 
+		if result == nil || result.Response == nil || response.Response.RuleUuid == nil || len(result.Response.RuleUuid) == 0 {
+			return resource.NonRetryableError(fmt.Errorf("Create cfw natPolicy failed, Response is nil."))
+		}
+
 		response = result
 		return nil
 	})
@@ -207,8 +210,8 @@ func resourceTencentCloudCfwNatPolicyRead(d *schema.ResourceData, meta interface
 	}
 
 	if natPolicy == nil {
+		log.Printf("[WARN]%s resource `tencentcloud_cfw_nat_policy` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
 		d.SetId("")
-		log.Printf("[WARN]%s resource `CfwNatPolicy` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
 		return nil
 	}
 
@@ -282,8 +285,7 @@ func resourceTencentCloudCfwNatPolicyUpdate(d *schema.ResourceData, meta interfa
 		uuid           = d.Id()
 	)
 
-	immutableArgs := []string{"uuid", "direction"}
-
+	immutableArgs := []string{"direction"}
 	for _, v := range immutableArgs {
 		if d.HasChange(v) {
 			return fmt.Errorf("argument `%s` cannot be changed", v)
@@ -321,7 +323,7 @@ func resourceTencentCloudCfwNatPolicyUpdate(d *schema.ResourceData, meta interfa
 		modifyRuleItem.Port = helper.String(v.(string))
 	}
 
-	if v, ok := d.GetOk("direction"); ok {
+	if v, ok := d.GetOkExists("direction"); ok {
 		modifyRuleItem.Direction = helper.IntUint64(v.(int))
 	}
 
@@ -342,7 +344,6 @@ func resourceTencentCloudCfwNatPolicyUpdate(d *schema.ResourceData, meta interfa
 	}
 
 	request.Rules = append(request.Rules, &modifyRuleItem)
-
 	err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
 		result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseCfwClient().ModifyNatAcRule(request)
 		if e != nil {

tencentcloud/services/cfw/service_tencentcloud_cfw.go

@@ -418,6 +418,7 @@ func (me *CfwService) DescribeCfwNatPolicyById(ctx context.Context, uuid string)
 	logId := tccommon.GetLogId(ctx)
 
 	request := cfw.NewDescribeNatAcRuleRequest()
+	response := cfw.NewDescribeNatAcRuleResponse()
 	request.Limit = common.Uint64Ptr(20)
 	request.Offset = common.Uint64Ptr(0)
 	request.Filters = []*cfw.CommonFilter{
@@ -434,16 +435,28 @@ func (me *CfwService) DescribeCfwNatPolicyById(ctx context.Context, uuid string)
 		}
 	}()
 
-	ratelimit.Check(request.GetAction())
+	err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
+		ratelimit.Check(request.GetAction())
+		result, e := me.client.UseCfwClient().DescribeNatAcRule(request)
+		if e != nil {
+			return tccommon.RetryError(e)
+		} else {
+			log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
+		}
+
+		if result == nil || result.Response == nil || result.Response.Data == nil {
+			return resource.NonRetryableError(fmt.Errorf("Describe nat ac rule failed, Response is nil."))
+		}
+
+		response = result
+		return nil
+	})
 
-	response, err := me.client.UseCfwClient().DescribeNatAcRule(request)
 	if err != nil {
 		errRet = err
 		return
 	}
 
-	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
-
 	if len(response.Response.Data) < 1 {
 		return
 	}
@@ -465,16 +478,23 @@ func (me *CfwService) DeleteCfwNatPolicyById(ctx context.Context, uuid string) (
 		}
 	}()
 
-	ratelimit.Check(request.GetAction())
+	err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
+		ratelimit.Check(request.GetAction())
+		result, e := me.client.UseCfwClient().RemoveNatAcRule(request)
+		if e != nil {
+			return tccommon.RetryError(e)
+		} else {
+			log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
+		}
+
+		return nil
+	})
 
-	response, err := me.client.UseCfwClient().RemoveNatAcRule(request)
 	if err != nil {
 		errRet = err
 		return
 	}
 
-	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
-
 	return
 }