add

Author: SevenEarth

tencentcloud/services/postgresql/resource_tc_postgresql_instance_network_access.go

@@ -1,4 +1,3 @@
-// Code generated by iacg; DO NOT EDIT.
 package postgresql
 
 import (
@@ -68,41 +67,30 @@ func resourceTencentCloudPostgresqlInstanceNetworkAccessCreate(d *schema.Resourc
 	defer tccommon.LogElapsed("resource.tencentcloud_postgresql_instance_network_access.create")()
 	defer tccommon.InconsistentCheck(d, meta)()
 
-	logId := tccommon.GetLogId(tccommon.ContextNil)
-
-	ctx := tccommon.NewResourceLifeCycleHandleFuncContext(context.Background(), logId, d, meta)
-
 	var (
+		logId        = tccommon.GetLogId(tccommon.ContextNil)
+		ctx          = tccommon.NewResourceLifeCycleHandleFuncContext(context.Background(), logId, d, meta)
+		request      = postgresqlv20170312.NewCreateDBInstanceNetworkAccessRequest()
+		response     = postgresqlv20170312.NewCreateDBInstanceNetworkAccessResponse()
 		dbInsntaceId string
 		vpcId        string
 		subnetId     string
 		vip          string
 	)
-	var (
-		request  = postgresqlv20170312.NewCreateDBInstanceNetworkAccessRequest()
-		response = postgresqlv20170312.NewCreateDBInstanceNetworkAccessResponse()
-	)
-
-	if v, ok := d.GetOk("db_instance_id"); ok {
-		dbInsntaceId = v.(string)
-	}
-	if v, ok := d.GetOk("vpc_id"); ok {
-		vpcId = v.(string)
-	}
-	if v, ok := d.GetOk("subnet_id"); ok {
-		subnetId = v.(string)
-	}
 
 	if v, ok := d.GetOk("db_instance_id"); ok {
 		request.DBInstanceId = helper.String(v.(string))
+		dbInsntaceId = v.(string)
 	}
 
 	if v, ok := d.GetOk("vpc_id"); ok {
 		request.VpcId = helper.String(v.(string))
+		vpcId = v.(string)
 	}
 
 	if v, ok := d.GetOk("subnet_id"); ok {
 		request.SubnetId = helper.String(v.(string))
+		subnetId = v.(string)
 	}
 
 	if v, ok := d.GetOkExists("is_assign_vip"); ok {
@@ -111,6 +99,7 @@ func resourceTencentCloudPostgresqlInstanceNetworkAccessCreate(d *schema.Resourc
 
 	if v, ok := d.GetOk("vip"); ok {
 		request.Vip = helper.String(v.(string))
+		vip = v.(string)
 	}
 
 	err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
@@ -120,45 +109,46 @@ func resourceTencentCloudPostgresqlInstanceNetworkAccessCreate(d *schema.Resourc
 		} else {
 			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 {
+			return resource.NonRetryableError(fmt.Errorf("Create postgresql instance network access failed, Response is nil."))
+		}
+
 		response = result
 		return nil
 	})
+
 	if err != nil {
 		log.Printf("[CRITAL]%s create postgresql instance network access failed, reason:%+v", logId, err)
 		return err
 	}
 
-	_ = response
-
-	if _, err := (&resource.StateChangeConf{
-		Delay:      10 * time.Second,
-		MinTimeout: 3 * time.Second,
-		Pending:    []string{},
-		Refresh:    resourcePostgresqlInstanceNetworkAccessCreateStateRefreshFunc_0_0(ctx, dbInsntaceId, vpcId, subnetId, vip),
-		Target:     []string{"Running"},
-		Timeout:    180 * time.Second,
-	}).WaitForStateContext(ctx); err != nil {
-		return err
+	if response.Response.FlowId == nil {
+		return fmt.Errorf("FlowId is nil.")
 	}
 
-	// get vip
-	service := PostgresqlService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
-	respData, err := service.DescribePostgresqlInstanceNetworkAccessById(ctx, dbInsntaceId)
-	if err != nil {
-		return err
-	}
+	// wait & get vip
+	flowRequest := postgresqlv20170312.NewDescribeTasksRequest()
+	flowRequest.TaskId = response.Response.FlowId
+	err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
+		result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UsePostgresqlV20170312Client().DescribeTasksWithContext(ctx, 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())
+		}
 
-	if respData == nil {
-		log.Printf("[WARN]%s resource `postgresql_instance_network_access` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
-		return nil
-	}
+		if result == nil || result.Response == nil {
+			return resource.NonRetryableError(fmt.Errorf("Create postgresql instance network access failed, Response is nil."))
+		}
 
-	if respData.DBInstanceNetInfo != nil && len(respData.DBInstanceNetInfo) > 0 {
-		for _, item := range respData.DBInstanceNetInfo {
-			if *item.VpcId == vpcId && *item.SubnetId == subnetId {
+		response = result
+		return nil
+	})
 
-			}
-		}
+	if err != nil {
+		log.Printf("[CRITAL]%s create postgresql instance network access failed, reason:%+v", logId, err)
+		return err
 	}
 
 	d.SetId(strings.Join([]string{dbInsntaceId, vpcId, subnetId, vip}, tccommon.FILED_SP))