diff --git a/alicloud/connectivity/client.go b/alicloud/connectivity/client.go index 28fed0d93c07..85b1ca2d85d2 100644 --- a/alicloud/connectivity/client.go +++ b/alicloud/connectivity/client.go @@ -59,7 +59,6 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/services/smartag" "github.com/aliyun/alibaba-cloud-sdk-go/services/sts" "github.com/aliyun/alibaba-cloud-sdk-go/services/vpc" - "github.com/aliyun/alibaba-cloud-sdk-go/services/yundun_bastionhost" "github.com/aliyun/alibaba-cloud-sdk-go/services/yundun_dbaudit" "github.com/aliyun/aliyun-datahub-sdk-go/datahub" sls "github.com/aliyun/aliyun-log-go-sdk" @@ -135,7 +134,6 @@ type AliyunClient struct { emrconn *emr.Client sagconn *smartag.Client dbauditconn *yundun_dbaudit.Client - bastionhostconn *yundun_bastionhost.Client marketconn *market.Client hbaseconn *hbase.Client adbconn *adb.Client @@ -1937,27 +1935,6 @@ func (client *AliyunClient) WithDbauditClient(do func(*yundun_dbaudit.Client) (i return do(client.dbauditconn) } - -func (client *AliyunClient) WithBastionhostClient(do func(*yundun_bastionhost.Client) (interface{}, error)) (interface{}, error) { - if client.bastionhostconn == nil { - bastionhostconn, err := yundun_bastionhost.NewClientWithOptions(client.config.RegionId, client.getSdkConfig(), client.config.getAuthCredential(true)) - if err != nil { - return nil, fmt.Errorf("unable to initialize the BASTIONHOST client: %#v", err) - } - bastionhostconn.SetReadTimeout(time.Duration(client.config.ClientReadTimeout) * time.Millisecond) - bastionhostconn.SetConnectTimeout(time.Duration(client.config.ClientConnectTimeout) * time.Millisecond) - bastionhostconn.SourceIp = client.config.SourceIp - bastionhostconn.SecureTransport = client.config.SecureTransport - bastionhostconn.AppendUserAgent(Terraform, client.config.TerraformVersion) - bastionhostconn.AppendUserAgent(Provider, providerVersion) - bastionhostconn.AppendUserAgent(Module, client.config.ConfigurationSource) - bastionhostconn.AppendUserAgent(TerraformTraceId, client.config.TerraformTraceId) - client.bastionhostconn = bastionhostconn - } - - return do(client.bastionhostconn) -} - func (client *AliyunClient) WithMarketClient(do func(*market.Client) (interface{}, error)) (interface{}, error) { // Initialize the Market API client if necessary if client.marketconn == nil { @@ -3375,31 +3352,6 @@ func (client *AliyunClient) NewSddpClient() (*rpc.Client, error) { return conn, nil } -func (client *AliyunClient) NewBastionhostClient() (*rpc.Client, error) { - productCode := "bastionhost" - endpoint := "" - if v, ok := client.config.Endpoints.Load(productCode); !ok || v.(string) == "" { - if err := client.loadEndpoint(productCode); err != nil { - endpoint = fmt.Sprintf("bastionhost.%s.aliyuncs.com", client.config.RegionId) - client.config.Endpoints.Store(productCode, endpoint) - log.Printf("[ERROR] loading %s endpoint got an error: %#v. Using the endpoint %s instead.", productCode, err, endpoint) - } - } - if v, ok := client.config.Endpoints.Load(productCode); ok && v.(string) != "" { - endpoint = v.(string) - } - if endpoint == "" { - return nil, fmt.Errorf("[ERROR] missing the product %s endpoint.", productCode) - } - sdkConfig := client.teaSdkConfig - sdkConfig.SetEndpoint(endpoint) - conn, err := rpc.NewClient(&sdkConfig) - if err != nil { - return nil, fmt.Errorf("unable to initialize the %s client: %#v", productCode, err) - } - return conn, nil -} - func (client *AliyunClient) NewSasClient() (*rpc.Client, error) { productCode := "sas" endpoint := "" diff --git a/alicloud/data_source_alicloud_bastionhost_host_accounts.go b/alicloud/data_source_alicloud_bastionhost_host_accounts.go index 8f5941a6bdc0..12491db8464a 100644 --- a/alicloud/data_source_alicloud_bastionhost_host_accounts.go +++ b/alicloud/data_source_alicloud_bastionhost_host_accounts.go @@ -6,7 +6,6 @@ import ( "time" "github.com/PaesslerAG/jsonpath" - util "github.com/alibabacloud-go/tea-utils/service" "github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -140,16 +139,11 @@ func dataSourceAlicloudBastionhostHostAccountsRead(d *schema.ResourceData, meta } } var response map[string]interface{} - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } + var err error for { - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(5*time.Minute, func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_bastionhost_host_groups.go b/alicloud/data_source_alicloud_bastionhost_host_groups.go index 5be453cf8bfe..641571f77f36 100644 --- a/alicloud/data_source_alicloud_bastionhost_host_groups.go +++ b/alicloud/data_source_alicloud_bastionhost_host_groups.go @@ -6,7 +6,6 @@ import ( "time" "github.com/PaesslerAG/jsonpath" - util "github.com/alibabacloud-go/tea-utils/service" "github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -113,16 +112,11 @@ func dataSourceAlicloudBastionhostHostGroupsRead(d *schema.ResourceData, meta in } } var response map[string]interface{} - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } + var err error for { - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(5*time.Minute, func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_bastionhost_host_share_keys.go b/alicloud/data_source_alicloud_bastionhost_host_share_keys.go index 3fe687e2a40d..2e7f5d0a44bf 100644 --- a/alicloud/data_source_alicloud_bastionhost_host_share_keys.go +++ b/alicloud/data_source_alicloud_bastionhost_host_share_keys.go @@ -6,7 +6,6 @@ import ( "time" "github.com/PaesslerAG/jsonpath" - util "github.com/alibabacloud-go/tea-utils/service" "github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -109,16 +108,11 @@ func dataSourceAlicloudBastionhostHostShareKeysRead(d *schema.ResourceData, meta } } var response map[string]interface{} - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } + var err error for { - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(5*time.Minute, func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_bastionhost_hosts.go b/alicloud/data_source_alicloud_bastionhost_hosts.go index 244564110699..9c6d21d99227 100644 --- a/alicloud/data_source_alicloud_bastionhost_hosts.go +++ b/alicloud/data_source_alicloud_bastionhost_hosts.go @@ -6,7 +6,6 @@ import ( "time" "github.com/PaesslerAG/jsonpath" - util "github.com/alibabacloud-go/tea-utils/service" "github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -204,16 +203,11 @@ func dataSourceAlicloudBastionhostHostsRead(d *schema.ResourceData, meta interfa } } var response map[string]interface{} - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } + var err error for { - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(5*time.Minute, func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_bastionhost_user_groups.go b/alicloud/data_source_alicloud_bastionhost_user_groups.go index 6ff83a228298..f6a068c5ea16 100644 --- a/alicloud/data_source_alicloud_bastionhost_user_groups.go +++ b/alicloud/data_source_alicloud_bastionhost_user_groups.go @@ -6,7 +6,6 @@ import ( "time" "github.com/PaesslerAG/jsonpath" - util "github.com/alibabacloud-go/tea-utils/service" "github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -113,16 +112,11 @@ func dataSourceAlicloudBastionhostUserGroupsRead(d *schema.ResourceData, meta in } } var response map[string]interface{} - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } + var err error for { - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(5*time.Minute, func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/data_source_alicloud_bastionhost_users.go b/alicloud/data_source_alicloud_bastionhost_users.go index e853c94ed2bd..7b65f90b9b3e 100644 --- a/alicloud/data_source_alicloud_bastionhost_users.go +++ b/alicloud/data_source_alicloud_bastionhost_users.go @@ -6,7 +6,6 @@ import ( "time" "github.com/PaesslerAG/jsonpath" - util "github.com/alibabacloud-go/tea-utils/service" "github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -183,16 +182,11 @@ func dataSourceAlicloudBastionhostUsersRead(d *schema.ResourceData, meta interfa } } var response map[string]interface{} - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } + var err error for { - runtime := util.RuntimeOptions{} - runtime.SetAutoretry(true) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(5*time.Minute, func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &runtime) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, true) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_bastionhost_host.go b/alicloud/resource_alicloud_bastionhost_host.go index a06e2288432a..d26fe267bbb3 100644 --- a/alicloud/resource_alicloud_bastionhost_host.go +++ b/alicloud/resource_alicloud_bastionhost_host.go @@ -5,7 +5,6 @@ import ( "log" "time" - util "github.com/alibabacloud-go/tea-utils/service" "github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -81,10 +80,7 @@ func resourceAlicloudBastionhostHostCreate(d *schema.ResourceData, meta interfac var response map[string]interface{} action := "CreateHost" request := make(map[string]interface{}) - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } + var err error request["ActiveAddressType"] = d.Get("active_address_type") if v, ok := d.GetOk("comment"); ok { request["Comment"] = v @@ -108,7 +104,7 @@ func resourceAlicloudBastionhostHostCreate(d *schema.ResourceData, meta interfac } wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -158,10 +154,7 @@ func resourceAlicloudBastionhostHostRead(d *schema.ResourceData, meta interface{ func resourceAlicloudBastionhostHostUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*connectivity.AliyunClient) var response map[string]interface{} - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } + var err error parts, err := ParseResourceId(d.Id(), 2) if err != nil { return WrapError(err) @@ -182,7 +175,7 @@ func resourceAlicloudBastionhostHostUpdate(d *schema.ResourceData, meta interfac action := "ModifyHostsActiveAddressType" wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -234,7 +227,7 @@ func resourceAlicloudBastionhostHostUpdate(d *schema.ResourceData, meta interfac action := "ModifyHost" wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, modifyHostReq, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, modifyHostReq, false) if err != nil { if NeedRetry(err) { wait() @@ -265,10 +258,6 @@ func resourceAlicloudBastionhostHostDelete(d *schema.ResourceData, meta interfac } action := "DeleteHost" var response map[string]interface{} - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } request := map[string]interface{}{ "HostId": parts[1], "InstanceId": parts[0], @@ -277,7 +266,7 @@ func resourceAlicloudBastionhostHostDelete(d *schema.ResourceData, meta interfac request["RegionId"] = client.RegionId wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_bastionhost_host_account.go b/alicloud/resource_alicloud_bastionhost_host_account.go index 97f21677c52e..6c9468a2b317 100644 --- a/alicloud/resource_alicloud_bastionhost_host_account.go +++ b/alicloud/resource_alicloud_bastionhost_host_account.go @@ -5,7 +5,6 @@ import ( "log" "time" - util "github.com/alibabacloud-go/tea-utils/service" "github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -82,10 +81,7 @@ func resourceAlicloudBastionhostHostAccountCreate(d *schema.ResourceData, meta i var response map[string]interface{} action := "CreateHostAccount" request := make(map[string]interface{}) - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } + var err error request["HostAccountName"] = d.Get("host_account_name") request["HostId"] = d.Get("host_id") request["InstanceId"] = d.Get("instance_id") @@ -102,7 +98,7 @@ func resourceAlicloudBastionhostHostAccountCreate(d *schema.ResourceData, meta i request["RegionId"] = client.RegionId wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -147,10 +143,7 @@ func resourceAlicloudBastionhostHostAccountRead(d *schema.ResourceData, meta int func resourceAlicloudBastionhostHostAccountUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*connectivity.AliyunClient) var response map[string]interface{} - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } + var err error parts, err := ParseResourceId(d.Id(), 2) if err != nil { return WrapError(err) @@ -187,7 +180,7 @@ func resourceAlicloudBastionhostHostAccountUpdate(d *schema.ResourceData, meta i action := "ModifyHostAccount" wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -212,10 +205,6 @@ func resourceAlicloudBastionhostHostAccountDelete(d *schema.ResourceData, meta i } action := "DeleteHostAccount" var response map[string]interface{} - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } request := map[string]interface{}{ "HostAccountId": parts[1], "InstanceId": parts[0], @@ -224,7 +213,7 @@ func resourceAlicloudBastionhostHostAccountDelete(d *schema.ResourceData, meta i request["RegionId"] = client.RegionId wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_bastionhost_host_account_share_key_attachment.go b/alicloud/resource_alicloud_bastionhost_host_account_share_key_attachment.go index 53f103aef433..cb1830faf2cb 100644 --- a/alicloud/resource_alicloud_bastionhost_host_account_share_key_attachment.go +++ b/alicloud/resource_alicloud_bastionhost_host_account_share_key_attachment.go @@ -5,7 +5,6 @@ import ( "log" "time" - util "github.com/alibabacloud-go/tea-utils/service" "github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -48,10 +47,7 @@ func resourceAlicloudBastionhostHostAccountShareKeyAttachmentCreate(d *schema.Re var response map[string]interface{} action := "AttachHostAccountsToHostShareKey" request := make(map[string]interface{}) - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } + var err error request["HostAccountIds"] = convertListToJsonString([]interface{}{d.Get("host_account_id")}) request["HostShareKeyId"] = d.Get("host_share_key_id") @@ -59,7 +55,7 @@ func resourceAlicloudBastionhostHostAccountShareKeyAttachmentCreate(d *schema.Re request["RegionId"] = client.RegionId wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -107,10 +103,6 @@ func resourceAlicloudBastionhostHostAccountShareKeyAttachmentDelete(d *schema.Re } action := "DetachHostAccountsFromHostShareKey" var response map[string]interface{} - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } request := map[string]interface{}{ "HostAccountIds": convertListToJsonString([]interface{}{parts[2]}), "HostShareKeyId": parts[1], @@ -120,7 +112,7 @@ func resourceAlicloudBastionhostHostAccountShareKeyAttachmentDelete(d *schema.Re request["RegionId"] = client.RegionId wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_bastionhost_host_account_share_key_attachment_test.go b/alicloud/resource_alicloud_bastionhost_host_account_share_key_attachment_test.go index ea9e1b247844..feb640b398bf 100644 --- a/alicloud/resource_alicloud_bastionhost_host_account_share_key_attachment_test.go +++ b/alicloud/resource_alicloud_bastionhost_host_account_share_key_attachment_test.go @@ -20,7 +20,7 @@ func TestAccAliCloudBastionhostHostAccountShareKeyAttachment_basic0(t *testing.T rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() rand := acctest.RandIntRange(10000, 99999) - name := fmt.Sprintf("tf-testacc%sbastionhosthostaccountsharekeyattachment%d", defaultRegionToTest, rand) + name := fmt.Sprintf("tf-testacc%sbastionhosthost%d", defaultRegionToTest, rand) testAccConfig := resourceTestAccConfigFunc(resourceId, name, AliCloudBastionhostHostAccountShareKeyAttachmentBasicDependence0) resource.Test(t, resource.TestCase{ PreCheck: func() { diff --git a/alicloud/resource_alicloud_bastionhost_host_account_user_attachment.go b/alicloud/resource_alicloud_bastionhost_host_account_user_attachment.go index 266715bdae0c..cbae32204688 100644 --- a/alicloud/resource_alicloud_bastionhost_host_account_user_attachment.go +++ b/alicloud/resource_alicloud_bastionhost_host_account_user_attachment.go @@ -5,7 +5,6 @@ import ( "log" "time" - util "github.com/alibabacloud-go/tea-utils/service" "github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -91,10 +90,6 @@ func resourceAlicloudBastionhostHostAccountUserAttachmentUpdate(d *schema.Resour } action := "AttachHostAccountsToUser" request := make(map[string]interface{}) - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } oraw, nraw := d.GetChange("host_account_ids") request["InstanceId"] = parts[0] @@ -115,7 +110,7 @@ func resourceAlicloudBastionhostHostAccountUserAttachmentUpdate(d *schema.Resour } wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { - _, err := conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + _, err := client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -144,7 +139,7 @@ func resourceAlicloudBastionhostHostAccountUserAttachmentUpdate(d *schema.Resour } wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { - _, err := conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + _, err := client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -170,10 +165,6 @@ func resourceAlicloudBastionhostHostAccountUserAttachmentDelete(d *schema.Resour } action := "DetachHostAccountsFromUser" var response map[string]interface{} - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } request := map[string]interface{}{ "InstanceId": parts[0], "UserId": parts[1], @@ -193,7 +184,7 @@ func resourceAlicloudBastionhostHostAccountUserAttachmentDelete(d *schema.Resour request["RegionId"] = client.RegionId wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(5*time.Minute, func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_bastionhost_host_account_user_attachment_test.go b/alicloud/resource_alicloud_bastionhost_host_account_user_attachment_test.go index 7179386cd2c8..1a48fdb4b032 100644 --- a/alicloud/resource_alicloud_bastionhost_host_account_user_attachment_test.go +++ b/alicloud/resource_alicloud_bastionhost_host_account_user_attachment_test.go @@ -19,7 +19,7 @@ func TestAccAliCloudBastionhostHostAccountUserAttachment_basic0(t *testing.T) { rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() rand := acctest.RandIntRange(10000, 99999) - name := fmt.Sprintf("tf-testacc%sbastionhosthostaccount%d", defaultRegionToTest, rand) + name := fmt.Sprintf("tf-testacc%sbastionhostaccount%d", defaultRegionToTest, rand) testAccConfig := resourceTestAccConfigFunc(resourceId, name, AliCloudBastionhostHostAccountUserAttachmentBasicDependence0) resource.Test(t, resource.TestCase{ PreCheck: func() { diff --git a/alicloud/resource_alicloud_bastionhost_host_account_user_group_attachment.go b/alicloud/resource_alicloud_bastionhost_host_account_user_group_attachment.go index 84419e67baa0..ad82817706a1 100644 --- a/alicloud/resource_alicloud_bastionhost_host_account_user_group_attachment.go +++ b/alicloud/resource_alicloud_bastionhost_host_account_user_group_attachment.go @@ -5,7 +5,6 @@ import ( "log" "time" - util "github.com/alibabacloud-go/tea-utils/service" "github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -91,10 +90,6 @@ func resourceAlicloudBastionhostHostAccountUserGroupAttachmentUpdate(d *schema.R } action := "AttachHostAccountsToUserGroup" request := make(map[string]interface{}) - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } oraw, nraw := d.GetChange("host_account_ids") request["InstanceId"] = parts[0] @@ -115,7 +110,7 @@ func resourceAlicloudBastionhostHostAccountUserGroupAttachmentUpdate(d *schema.R } wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { - _, err := conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + _, err := client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -143,7 +138,7 @@ func resourceAlicloudBastionhostHostAccountUserGroupAttachmentUpdate(d *schema.R } wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { - _, err := conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + _, err := client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -168,10 +163,6 @@ func resourceAlicloudBastionhostHostAccountUserGroupAttachmentDelete(d *schema.R } action := "DetachHostAccountsFromUserGroup" var response map[string]interface{} - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } request := map[string]interface{}{ "InstanceId": parts[0], "UserGroupId": parts[1], @@ -191,7 +182,7 @@ func resourceAlicloudBastionhostHostAccountUserGroupAttachmentDelete(d *schema.R request["RegionId"] = client.RegionId wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(5*time.Minute, func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_bastionhost_host_account_user_group_attachment_test.go b/alicloud/resource_alicloud_bastionhost_host_account_user_group_attachment_test.go index 2bd201d4cd4e..063ba172fac0 100644 --- a/alicloud/resource_alicloud_bastionhost_host_account_user_group_attachment_test.go +++ b/alicloud/resource_alicloud_bastionhost_host_account_user_group_attachment_test.go @@ -19,7 +19,7 @@ func TestAccAliCloudBastionhostHostAccountUserGroupAttachment_basic0(t *testing. rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() rand := acctest.RandIntRange(10000, 99999) - name := fmt.Sprintf("tf-testacc%sbastionhosthostaccountforUserGroup%d", defaultRegionToTest, rand) + name := fmt.Sprintf("tf-testacc%sbastionhosthostUserGroup%d", defaultRegionToTest, rand) testAccConfig := resourceTestAccConfigFunc(resourceId, name, AliCloudBastionhostHostAccountUserGroupAttachmentBasicDependence0) resource.Test(t, resource.TestCase{ PreCheck: func() { diff --git a/alicloud/resource_alicloud_bastionhost_host_attachment.go b/alicloud/resource_alicloud_bastionhost_host_attachment.go index 4f6c38f83866..b5f404de3822 100644 --- a/alicloud/resource_alicloud_bastionhost_host_attachment.go +++ b/alicloud/resource_alicloud_bastionhost_host_attachment.go @@ -5,7 +5,6 @@ import ( "log" "time" - util "github.com/alibabacloud-go/tea-utils/service" "github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -44,17 +43,14 @@ func resourceAlicloudBastionhostHostAttachmentCreate(d *schema.ResourceData, met var response map[string]interface{} action := "AddHostsToGroup" request := make(map[string]interface{}) - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } + var err error request["HostGroupId"] = d.Get("host_group_id") request["HostIds"] = convertListToJsonString([]interface{}{d.Get("host_id")}) request["InstanceId"] = d.Get("instance_id") request["RegionId"] = client.RegionId wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -102,10 +98,6 @@ func resourceAlicloudBastionhostHostAttachmentDelete(d *schema.ResourceData, met } action := "RemoveHostsFromGroup" var response map[string]interface{} - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } request := map[string]interface{}{ "HostGroupId": parts[1], "HostIds": convertListToJsonString([]interface{}{parts[2]}), @@ -115,7 +107,7 @@ func resourceAlicloudBastionhostHostAttachmentDelete(d *schema.ResourceData, met request["RegionId"] = client.RegionId wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_bastionhost_host_attachment_test.go b/alicloud/resource_alicloud_bastionhost_host_attachment_test.go index ff7ba4632b2e..d7bdb3c5d922 100644 --- a/alicloud/resource_alicloud_bastionhost_host_attachment_test.go +++ b/alicloud/resource_alicloud_bastionhost_host_attachment_test.go @@ -19,7 +19,7 @@ func TestAccAliCloudBastionhostHostAttachment_basic0(t *testing.T) { rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() rand := acctest.RandIntRange(10000, 99999) - name := fmt.Sprintf("tf-testacc%sbastionhosthostattachment%d", defaultRegionToTest, rand) + name := fmt.Sprintf("tf-testacc%sbastionattachment%d", defaultRegionToTest, rand) testAccConfig := resourceTestAccConfigFunc(resourceId, name, AliCloudBastionhostHostAttachmentBasicDependence0) resource.Test(t, resource.TestCase{ PreCheck: func() { diff --git a/alicloud/resource_alicloud_bastionhost_host_group.go b/alicloud/resource_alicloud_bastionhost_host_group.go index 0be8639ede69..4198587adeb8 100644 --- a/alicloud/resource_alicloud_bastionhost_host_group.go +++ b/alicloud/resource_alicloud_bastionhost_host_group.go @@ -5,7 +5,6 @@ import ( "log" "time" - util "github.com/alibabacloud-go/tea-utils/service" "github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -47,10 +46,7 @@ func resourceAlicloudBastionhostHostGroupCreate(d *schema.ResourceData, meta int var response map[string]interface{} action := "CreateHostGroup" request := make(map[string]interface{}) - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } + var err error if v, ok := d.GetOk("comment"); ok { request["Comment"] = v } @@ -59,7 +55,7 @@ func resourceAlicloudBastionhostHostGroupCreate(d *schema.ResourceData, meta int request["RegionId"] = client.RegionId wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -125,13 +121,10 @@ func resourceAlicloudBastionhostHostGroupUpdate(d *schema.ResourceData, meta int request["RegionId"] = client.RegionId if update { action := "ModifyHostGroup" - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } + var err error wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -156,10 +149,6 @@ func resourceAlicloudBastionhostHostGroupDelete(d *schema.ResourceData, meta int } action := "DeleteHostGroup" var response map[string]interface{} - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } request := map[string]interface{}{ "HostGroupId": parts[1], "InstanceId": parts[0], @@ -168,7 +157,7 @@ func resourceAlicloudBastionhostHostGroupDelete(d *schema.ResourceData, meta int request["RegionId"] = client.RegionId wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_bastionhost_host_group_account_user_attachment.go b/alicloud/resource_alicloud_bastionhost_host_group_account_user_attachment.go index 4fa60b12c19a..e3b9fd0fe91d 100644 --- a/alicloud/resource_alicloud_bastionhost_host_group_account_user_attachment.go +++ b/alicloud/resource_alicloud_bastionhost_host_group_account_user_attachment.go @@ -5,7 +5,6 @@ import ( "log" "time" - util "github.com/alibabacloud-go/tea-utils/service" "github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -81,10 +80,6 @@ func resourceAlicloudBastionhostHostGroupAccountUserAttachmentUpdate(d *schema.R } action := "AttachHostGroupAccountsToUser" request := make(map[string]interface{}) - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } oraw, nraw := d.GetChange("host_account_names") request["InstanceId"] = parts[0] @@ -105,7 +100,7 @@ func resourceAlicloudBastionhostHostGroupAccountUserAttachmentUpdate(d *schema.R } wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { - _, err := conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + _, err := client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -134,7 +129,7 @@ func resourceAlicloudBastionhostHostGroupAccountUserAttachmentUpdate(d *schema.R } wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { - _, err := conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + _, err := client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -160,10 +155,6 @@ func resourceAlicloudBastionhostHostGroupAccountUserAttachmentDelete(d *schema.R } action := "DetachHostGroupAccountsFromUser" var response map[string]interface{} - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } request := map[string]interface{}{ "InstanceId": parts[0], "UserId": parts[1], @@ -183,7 +174,7 @@ func resourceAlicloudBastionhostHostGroupAccountUserAttachmentDelete(d *schema.R request["RegionId"] = client.RegionId wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(5*time.Minute, func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_bastionhost_host_group_account_user_attachment_test.go b/alicloud/resource_alicloud_bastionhost_host_group_account_user_attachment_test.go index aaa3c1f9255d..da9626215af8 100644 --- a/alicloud/resource_alicloud_bastionhost_host_group_account_user_attachment_test.go +++ b/alicloud/resource_alicloud_bastionhost_host_group_account_user_attachment_test.go @@ -19,7 +19,7 @@ func TestAccAliCloudBastionhostHostGroupAccountUserAttachment_basic0(t *testing. rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() rand := acctest.RandIntRange(10000, 99999) - name := fmt.Sprintf("tf-testacc%sbastionhosthostgroupaccount%d", defaultRegionToTest, rand) + name := fmt.Sprintf("tf-testacc%sgroupaccount%d", defaultRegionToTest, rand) testAccConfig := resourceTestAccConfigFunc(resourceId, name, AliCloudBastionhostHostGroupAccountUserAttachmentBasicDependence0) resource.Test(t, resource.TestCase{ PreCheck: func() { diff --git a/alicloud/resource_alicloud_bastionhost_host_group_account_user_group_attachment.go b/alicloud/resource_alicloud_bastionhost_host_group_account_user_group_attachment.go index 3e473c6aa276..daaf27548885 100644 --- a/alicloud/resource_alicloud_bastionhost_host_group_account_user_group_attachment.go +++ b/alicloud/resource_alicloud_bastionhost_host_group_account_user_group_attachment.go @@ -5,7 +5,6 @@ import ( "log" "time" - util "github.com/alibabacloud-go/tea-utils/service" "github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -81,10 +80,6 @@ func resourceAlicloudBastionhostHostGroupAccountUserGroupAttachmentUpdate(d *sch } action := "AttachHostGroupAccountsToUserGroup" request := make(map[string]interface{}) - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } oraw, nraw := d.GetChange("host_account_names") request["InstanceId"] = parts[0] @@ -105,7 +100,7 @@ func resourceAlicloudBastionhostHostGroupAccountUserGroupAttachmentUpdate(d *sch } wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { - _, err := conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + _, err := client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -134,7 +129,7 @@ func resourceAlicloudBastionhostHostGroupAccountUserGroupAttachmentUpdate(d *sch } wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { - _, err := conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + _, err := client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -160,10 +155,6 @@ func resourceAlicloudBastionhostHostGroupAccountUserGroupAttachmentDelete(d *sch } action := "DetachHostGroupAccountsFromUserGroup" var response map[string]interface{} - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } request := map[string]interface{}{ "InstanceId": parts[0], "UserGroupId": parts[1], @@ -183,7 +174,7 @@ func resourceAlicloudBastionhostHostGroupAccountUserGroupAttachmentDelete(d *sch request["RegionId"] = client.RegionId wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(5*time.Minute, func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_bastionhost_host_group_account_user_group_attachment_test.go b/alicloud/resource_alicloud_bastionhost_host_group_account_user_group_attachment_test.go index 5e2735107f11..229b5765c8ae 100644 --- a/alicloud/resource_alicloud_bastionhost_host_group_account_user_group_attachment_test.go +++ b/alicloud/resource_alicloud_bastionhost_host_group_account_user_group_attachment_test.go @@ -19,7 +19,7 @@ func TestAccAliCloudBastionhostHostGroupAccountUserGroupAttachment_basic0(t *tes rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() rand := acctest.RandIntRange(10000, 99999) - name := fmt.Sprintf("tf-testacc%sbastionhosthostgroupaccount%d", defaultRegionToTest, rand) + name := fmt.Sprintf("tf-testacc%sgroupaccount%d", defaultRegionToTest, rand) testAccConfig := resourceTestAccConfigFunc(resourceId, name, AliCloudBastionhostHostGroupAccountUserGroupAttachmentBasicDependence0) resource.Test(t, resource.TestCase{ PreCheck: func() { diff --git a/alicloud/resource_alicloud_bastionhost_host_share_key.go b/alicloud/resource_alicloud_bastionhost_host_share_key.go index 556f7bb2d5c6..bb3f3216b6ea 100644 --- a/alicloud/resource_alicloud_bastionhost_host_share_key.go +++ b/alicloud/resource_alicloud_bastionhost_host_share_key.go @@ -7,7 +7,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/validation" - util "github.com/alibabacloud-go/tea-utils/service" "github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -65,10 +64,7 @@ func resourceAlicloudBastionhostHostShareKeyCreate(d *schema.ResourceData, meta var response map[string]interface{} action := "CreateHostShareKey" request := make(map[string]interface{}) - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } + var err error request["HostShareKeyName"] = d.Get("host_share_key_name") request["InstanceId"] = d.Get("instance_id") if v, ok := d.GetOk("pass_phrase"); ok { @@ -77,7 +73,7 @@ func resourceAlicloudBastionhostHostShareKeyCreate(d *schema.ResourceData, meta request["PrivateKey"] = d.Get("private_key") wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -120,10 +116,7 @@ func resourceAlicloudBastionhostHostShareKeyRead(d *schema.ResourceData, meta in } func resourceAlicloudBastionhostHostShareKeyUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*connectivity.AliyunClient) - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } + var err error var response map[string]interface{} parts, err := ParseResourceId(d.Id(), 2) if err != nil { @@ -150,7 +143,7 @@ func resourceAlicloudBastionhostHostShareKeyUpdate(d *schema.ResourceData, meta action := "ModifyHostShareKey" wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -175,10 +168,6 @@ func resourceAlicloudBastionhostHostShareKeyDelete(d *schema.ResourceData, meta } action := "DeleteHostShareKey" var response map[string]interface{} - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } request := map[string]interface{}{ "HostShareKeyId": parts[1], "InstanceId": parts[0], @@ -186,7 +175,7 @@ func resourceAlicloudBastionhostHostShareKeyDelete(d *schema.ResourceData, meta wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_bastionhost_instance_test.go b/alicloud/resource_alicloud_bastionhost_instance_test.go index 199327ded26b..3821e5a1909f 100644 --- a/alicloud/resource_alicloud_bastionhost_instance_test.go +++ b/alicloud/resource_alicloud_bastionhost_instance_test.go @@ -2,102 +2,14 @@ package alicloud import ( "fmt" - "log" - "strings" "testing" - "github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests" "github.com/aliyun/alibaba-cloud-sdk-go/services/yundun_bastionhost" "github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" ) -func init() { - resource.AddTestSweepers("alicloud_bastionhost_instance", &resource.Sweeper{ - Name: "alicloud_bastionhost_instance", - F: testSweepBastionhostInstances, - }) -} - -func testSweepBastionhostInstances(region string) error { - rawClient, err := sharedClientForRegion(region) - if err != nil { - return fmt.Errorf("error getting Alicloud client: %s", err) - } - client := rawClient.(*connectivity.AliyunClient) - - prefixes := []string{ - "tf-testAcc", - "tf_testAcc", - } - request := yundun_bastionhost.CreateDescribeInstanceBastionhostRequest() - request.PageSize = requests.NewInteger(PageSizeSmall) - request.CurrentPage = requests.NewInteger(1) - var instances []yundun_bastionhost.Instance - - for { - raw, err := client.WithBastionhostClient(func(bastionhostClient *yundun_bastionhost.Client) (interface{}, error) { - return bastionhostClient.DescribeInstanceBastionhost(request) - }) - if err != nil { - return WrapErrorf(err, DataDefaultErrorMsg, "alicloud_yundun_bastionhost", request.GetActionName(), AlibabaCloudSdkGoERROR) - } - - addDebug(request.GetActionName(), raw) - response, _ := raw.(*yundun_bastionhost.DescribeInstanceBastionhostResponse) - if len(response.Instances) < 1 { - break - } - - instances = append(instances, response.Instances...) - - if len(response.Instances) < PageSizeSmall { - break - } - - currentPageNo := request.CurrentPage - if err != nil { - return WrapErrorf(err, DataDefaultErrorMsg, "alicloud_yundun_bastionhost", request.GetActionName(), AlibabaCloudSdkGoERROR) - } - - if page, err := getNextpageNumber(currentPageNo); err != nil { - return WrapError(err) - } else { - request.CurrentPage = page - } - } - - for _, v := range instances { - name := v.Description - skip := true - if !sweepAll() { - for _, prefix := range prefixes { - if name != "" && strings.HasPrefix(strings.ToLower(name), strings.ToLower(prefix)) { - skip = false - break - } - } - if skip { - log.Printf("[INFO] Skipping Bastionhost Instance: %s", name) - continue - } - } - log.Printf("[INFO] Deleting Bastionhost Instance %s .", v.InstanceId) - - releaseReq := yundun_bastionhost.CreateRefundInstanceRequest() - releaseReq.InstanceId = v.InstanceId - _, err := client.WithBastionhostClient(func(bastionhostClient *yundun_bastionhost.Client) (interface{}, error) { - return bastionhostClient.RefundInstance(releaseReq) - }) - if err != nil { - log.Printf("[ERROR] Deleting Instance %s got an error: %#v.", v.InstanceId, err) - } - } - - return nil -} - func TestAccAliCloudBastionhostInstance_basic(t *testing.T) { var v yundun_bastionhost.Instance resourceId := "alicloud_bastionhost_instance.default" diff --git a/alicloud/resource_alicloud_bastionhost_user.go b/alicloud/resource_alicloud_bastionhost_user.go index 0ea6ed44fdec..e0199fb5a75b 100644 --- a/alicloud/resource_alicloud_bastionhost_user.go +++ b/alicloud/resource_alicloud_bastionhost_user.go @@ -5,7 +5,6 @@ import ( "log" "time" - util "github.com/alibabacloud-go/tea-utils/service" "github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -95,10 +94,7 @@ func resourceAlicloudBastionhostUserCreate(d *schema.ResourceData, meta interfac var response map[string]interface{} action := "CreateUser" request := make(map[string]interface{}) - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } + var err error if v, ok := d.GetOk("comment"); ok { request["Comment"] = v } @@ -132,7 +128,7 @@ func resourceAlicloudBastionhostUserCreate(d *schema.ResourceData, meta interfac request["UserName"] = d.Get("user_name") wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(client.GetRetryTimeout(d.Timeout(schema.TimeoutCreate)), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -185,10 +181,7 @@ func resourceAlicloudBastionhostUserRead(d *schema.ResourceData, meta interface{ func resourceAlicloudBastionhostUserUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*connectivity.AliyunClient) yundunBastionhostService := YundunBastionhostService{client} - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } + var err error var response map[string]interface{} parts, err := ParseResourceId(d.Id(), 2) if err != nil { @@ -247,7 +240,7 @@ func resourceAlicloudBastionhostUserUpdate(d *schema.ResourceData, meta interfac action := "ModifyUser" wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(client.GetRetryTimeout(d.Timeout(schema.TimeoutUpdate)), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -284,7 +277,7 @@ func resourceAlicloudBastionhostUserUpdate(d *schema.ResourceData, meta interfac action := "LockUsers" wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(client.GetRetryTimeout(d.Timeout(schema.TimeoutUpdate)), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -308,7 +301,7 @@ func resourceAlicloudBastionhostUserUpdate(d *schema.ResourceData, meta interfac action := "UnlockUsers" wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(client.GetRetryTimeout(d.Timeout(schema.TimeoutUpdate)), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -338,10 +331,6 @@ func resourceAlicloudBastionhostUserDelete(d *schema.ResourceData, meta interfac } action := "DeleteUser" var response map[string]interface{} - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } request := map[string]interface{}{ "InstanceId": parts[0], "UserId": parts[1], @@ -350,7 +339,7 @@ func resourceAlicloudBastionhostUserDelete(d *schema.ResourceData, meta interfac request["RegionId"] = client.RegionId wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(client.GetRetryTimeout(d.Timeout(schema.TimeoutDelete)), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_bastionhost_user_attachment.go b/alicloud/resource_alicloud_bastionhost_user_attachment.go index 9c12c86a0a43..8e32bd185888 100644 --- a/alicloud/resource_alicloud_bastionhost_user_attachment.go +++ b/alicloud/resource_alicloud_bastionhost_user_attachment.go @@ -5,7 +5,6 @@ import ( "log" "time" - util "github.com/alibabacloud-go/tea-utils/service" "github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -44,17 +43,14 @@ func resourceAlicloudBastionhostUserAttachmentCreate(d *schema.ResourceData, met var response map[string]interface{} action := "AddUsersToGroup" request := make(map[string]interface{}) - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } + var err error request["InstanceId"] = d.Get("instance_id") request["RegionId"] = client.RegionId request["UserGroupId"] = d.Get("user_group_id") request["UserIds"] = convertListToJsonString([]interface{}{d.Get("user_id")}) wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -102,10 +98,6 @@ func resourceAlicloudBastionhostUserAttachmentDelete(d *schema.ResourceData, met } action := "RemoveUsersFromGroup" var response map[string]interface{} - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } request := map[string]interface{}{ "InstanceId": parts[0], "UserGroupId": parts[1], @@ -115,7 +107,7 @@ func resourceAlicloudBastionhostUserAttachmentDelete(d *schema.ResourceData, met request["RegionId"] = client.RegionId wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() diff --git a/alicloud/resource_alicloud_bastionhost_user_attachment_test.go b/alicloud/resource_alicloud_bastionhost_user_attachment_test.go index 34dfd983f17b..a5717dd85c52 100644 --- a/alicloud/resource_alicloud_bastionhost_user_attachment_test.go +++ b/alicloud/resource_alicloud_bastionhost_user_attachment_test.go @@ -28,7 +28,7 @@ func TestAccAliCloudBastionhostUserAttachment_basic0(t *testing.T) { rac := resourceAttrCheckInit(rc, ra) testAccCheck := rac.resourceAttrMapUpdateSet() rand := acctest.RandIntRange(10000, 99999) - name := fmt.Sprintf("tf-testacc%sbastionhostuserattachment%d", defaultRegionToTest, rand) + name := fmt.Sprintf("tf-testacc%sbastionuserattachment%d", defaultRegionToTest, rand) testAccConfig := resourceTestAccConfigFunc(resourceId, name, AliCloudBastionhostUserAttachmentBasicDependence0) resource.Test(t, resource.TestCase{ PreCheck: func() { diff --git a/alicloud/resource_alicloud_bastionhost_user_group.go b/alicloud/resource_alicloud_bastionhost_user_group.go index 5869b3d6af9a..3c897151b72f 100644 --- a/alicloud/resource_alicloud_bastionhost_user_group.go +++ b/alicloud/resource_alicloud_bastionhost_user_group.go @@ -5,7 +5,6 @@ import ( "log" "time" - util "github.com/alibabacloud-go/tea-utils/service" "github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -47,10 +46,7 @@ func resourceAlicloudBastionhostUserGroupCreate(d *schema.ResourceData, meta int var response map[string]interface{} action := "CreateUserGroup" request := make(map[string]interface{}) - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } + var err error if v, ok := d.GetOk("comment"); ok { request["Comment"] = v } @@ -59,7 +55,7 @@ func resourceAlicloudBastionhostUserGroupCreate(d *schema.ResourceData, meta int request["UserGroupName"] = d.Get("user_group_name") wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -125,13 +121,10 @@ func resourceAlicloudBastionhostUserGroupUpdate(d *schema.ResourceData, meta int } if update { action := "ModifyUserGroup" - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } + var err error wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait() @@ -156,10 +149,6 @@ func resourceAlicloudBastionhostUserGroupDelete(d *schema.ResourceData, meta int } action := "DeleteUserGroup" var response map[string]interface{} - conn, err := client.NewBastionhostClient() - if err != nil { - return WrapError(err) - } request := map[string]interface{}{ "InstanceId": parts[0], "UserGroupId": parts[1], @@ -168,7 +157,7 @@ func resourceAlicloudBastionhostUserGroupDelete(d *schema.ResourceData, meta int request["RegionId"] = client.RegionId wait := incrementalWait(3*time.Second, 3*time.Second) err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError { - response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-12-09"), StringPointer("AK"), nil, request, &util.RuntimeOptions{}) + response, err = client.RpcPost("Yundun-bastionhost", "2019-12-09", action, nil, request, false) if err != nil { if NeedRetry(err) { wait()