Skip to content
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

resource/alicloud_yundun_dbaudit_instance: Improves the invoking api method and supports refreshing credential automatically #8180

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

resource/alicloud_yundun_dbaudit_instance: Improves the invoking api method and supports refreshing credential automatically #8180

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
123 changes: 55 additions & 68 deletions alicloud/resource_alicloud_yundun_dbaudit_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package alicloud

import (
"fmt"
"github.com/PaesslerAG/jsonpath"
"time"

log "github.com/sirupsen/logrus"
Expand All @@ -9,16 +11,10 @@ import (

"github.com/hashicorp/terraform-plugin-sdk/helper/validation"

"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
"github.com/aliyun/alibaba-cloud-sdk-go/services/bssopenapi"
"github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

const (
RELEASE_HANG_MINS = 3
)

func resourceAlicloudDbauditInstance() *schema.Resource {
return &schema.Resource{
Create: resourceAlicloudDbauditInstanceCreate,
Expand Down Expand Up @@ -67,37 +63,61 @@ func resourceAlicloudDbauditInstance() *schema.Resource {

func resourceAlicloudDbauditInstanceCreate(d *schema.ResourceData, meta interface{}) error {
client := meta.(*connectivity.AliyunClient)
request := buildDbauditCreateRequest(d, meta)
var response *bssopenapi.CreateInstanceResponse
err := resource.Retry(3*time.Minute, func() *resource.RetryError {
raw, err := client.WithBssopenapiClient(func(bssopenapiClient *bssopenapi.Client) (interface{}, error) {
return bssopenapiClient.CreateInstance(request)
})
action := "CreateInstance"
var request map[string]interface{}
var response map[string]interface{}
var err error
var endpoint string
query := make(map[string]interface{})
request = make(map[string]interface{})
request["ClientToken"] = buildClientToken(action)
request["ProductCode"] = "dbaudit"
request["SubscriptionType"] = "Subscription"
request["Period"] = d.Get("period")
parameterMapList := make([]map[string]interface{}, 0)
parameterMapList = append(parameterMapList, map[string]interface{}{
"Code": "NetworkType",
"Value": "vpc",
})
parameterMapList = append(parameterMapList, map[string]interface{}{
"Code": "SeriesCode",
"Value": "alpha",
})

parameterMapList = append(parameterMapList, map[string]interface{}{
"Code": "PlanCode",
"Value": d.Get("plan_code").(string),
})
parameterMapList = append(parameterMapList, map[string]interface{}{
"Code": "RegionId",
"Value": client.RegionId,
})
request["Parameter"] = parameterMapList
wait := incrementalWait(3*time.Second, 5*time.Second)
err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError {
response, err = client.RpcPostWithEndpoint("BssOpenApi", "2017-12-14", action, query, request, true, endpoint)
request["ClientToken"] = buildClientToken(action)
if err != nil {
if IsExpectedErrors(err, []string{"NotApplicable"}) {
request.RegionId = string(connectivity.APSouthEast1)
request.Domain = connectivity.BssOpenAPIEndpointInternational
if NeedRetry(err) {
wait()
return resource.RetryableError(err)
}
if !client.IsInternationalAccount() && IsExpectedErrors(err, []string{"NotApplicable"}) {
endpoint = connectivity.BssOpenAPIEndpointInternational
return resource.RetryableError(err)
}
return resource.NonRetryableError(err)
}
addDebug(request.GetActionName(), raw, request.RpcRequest, request)

response = raw.(*bssopenapi.CreateInstanceResponse)

addDebug(action, response, request)
return nil
})

if err != nil {
return WrapErrorf(err, DefaultErrorMsg, "alicloud_yundun_dbaudit_instance", request.GetActionName(), AlibabaCloudSdkGoERROR)
return WrapErrorf(err, DefaultErrorMsg, "alicloud_yundun_dbaudit_instance", action, AlibabaCloudSdkGoERROR)
}

instanceId := response.Data.InstanceId
if !response.Success {
return WrapError(Error(response.Message))
}
d.SetId(instanceId)
id, _ := jsonpath.Get("$.Data.InstanceId", response)
d.SetId(fmt.Sprint(id))

dbauditService := DbauditService{client}

Expand All @@ -109,7 +129,7 @@ func resourceAlicloudDbauditInstanceCreate(d *schema.ResourceData, meta interfac
return WrapErrorf(err, IdMsg, d.Id())
}
// start instance
if err := dbauditService.StartDbauditInstance(instanceId, d.Get("vswitch_id").(string)); err != nil {
if err := dbauditService.StartDbauditInstance(d.Id(), d.Get("vswitch_id").(string)); err != nil {
return WrapError(err)
}
// wait for pending
Expand All @@ -125,27 +145,23 @@ func resourceAlicloudDbauditInstanceRead(d *schema.ResourceData, meta interface{
dbauditService := DbauditService{client}
instance, err := dbauditService.DescribeYundunDbauditInstance(d.Id())
if err != nil {
if NotFoundError(err) {
if !d.IsNewResource() && NotFoundError(err) {
log.Printf("[DEBUG] Resource alicloud_yundun_dbaudit_instance DescribeInstanceAttribute Failed!!! %s", err)
d.SetId("")
return nil
}
return WrapError(err)
}
d.Set("description", instance.Description)
//period, err := computePeriodByUnit(instance.StartTime/1000, instance.ExpireTime/1000, d.Get("period").(int), "Month")
//if err != nil {
// return WrapError(err)
//}
//d.Set("period", period)
d.Set("plan_code", instance.LicenseCode)
d.Set("description", instance["Description"])
d.Set("plan_code", instance["LicenseCode"])
d.Set("region_id", client.RegionId)
d.Set("vswitch_id", instance.VswitchId)
d.Set("vswitch_id", instance["VswitchId"])

tags, err := dbauditService.DescribeTags(d.Id(), nil, TagResourceInstance)
tags, err := dbauditService.DescribeTags(d.Id(), "INSTANCE")
if err != nil {
return WrapError(err)
}
d.Set("tags", dbauditService.tagsToMap(tags))
d.Set("tags", tagsToMap(tags))
return nil
}

Expand All @@ -156,7 +172,7 @@ func resourceAlicloudDbauditInstanceUpdate(d *schema.ResourceData, meta interfac
d.Partial(true)

if d.HasChange("tags") {
if err := dbauditService.setInstanceTags(d, TagResourceInstance); err != nil {
if err := dbauditService.setInstanceTags(d, "INSTANCE"); err != nil {
return WrapError(err)
}
d.SetPartial("tags")
Expand All @@ -182,7 +198,7 @@ func resourceAlicloudDbauditInstanceUpdate(d *schema.ResourceData, meta interfac
}

if d.HasChange("plan_code") {
if err := dbauditService.UpdateInstanceSpec("plan_code", "PlanCode", d, meta); err != nil {
if err := dbauditService.UpdateInstanceSpec("plan_code", "PlanCode", d); err != nil {
return WrapError(err)
}
stateConf := BuildStateConf([]string{"UPGRADING"}, []string{"PENDING", "RUNNING"}, d.Timeout(schema.TimeoutUpdate), 20*time.Second, dbauditService.DbauditInstanceRefreshFunc(d.Id(), []string{"CREATING", "UPGRADE_FAILED", "CREATE_FAILED"}))
Expand All @@ -201,32 +217,3 @@ func resourceAlicloudDbauditInstanceDelete(d *schema.ResourceData, meta interfac
log.Printf("[WARN] Cannot destroy resourceAlicloudDbauditInstance. Terraform will remove this resource from the state file, however resources may remain.")
return nil
}

func buildDbauditCreateRequest(d *schema.ResourceData, meta interface{}) *bssopenapi.CreateInstanceRequest {
request := bssopenapi.CreateCreateInstanceRequest()
request.ProductCode = "dbaudit"
request.SubscriptionType = "Subscription"
request.Period = requests.NewInteger(d.Get("period").(int))
client := meta.(*connectivity.AliyunClient)

request.Parameter = &[]bssopenapi.CreateInstanceParameter{
// force to buy vpc version
{
Code: "NetworkType",
Value: "vpc",
},
{
Code: "SeriesCode",
Value: "alpha",
},
{
Code: "PlanCode",
Value: d.Get("plan_code").(string),
},
{
Code: "RegionId",
Value: client.RegionId,
},
}
return request
}
Loading
Loading