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_cen_private_zone: Improved alicloud_cen_private_zone testcase #7963

Merged
merged 1 commit into from
Dec 11, 2024
Merged

resource/alicloud_cen_private_zone: Improved alicloud_cen_private_zone testcase #7963

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
2 changes: 1 addition & 1 deletion alicloud/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1312,7 +1312,7 @@ func Provider() terraform.ResourceProvider {
"alicloud_resource_manager_resource_group": resourceAliCloudResourceManagerResourceGroup(),
"alicloud_resource_manager_folder": resourceAlicloudResourceManagerFolder(),
"alicloud_resource_manager_handshake": resourceAlicloudResourceManagerHandshake(),
"alicloud_cen_private_zone": resourceAlicloudCenPrivateZone(),
"alicloud_cen_private_zone": resourceAliCloudCenPrivateZone(),
"alicloud_resource_manager_policy": resourceAlicloudResourceManagerPolicy(),
"alicloud_resource_manager_account": resourceAlicloudResourceManagerAccount(),
"alicloud_waf_instance": resourceAlicloudWafInstance(),
Expand Down
77 changes: 50 additions & 27 deletions alicloud/resource_alicloud_cen_private_zone.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package alicloud

import (
"fmt"
"time"

"github.com/aliyun/alibaba-cloud-sdk-go/services/cbn"
Expand All @@ -9,34 +10,35 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

func resourceAlicloudCenPrivateZone() *schema.Resource {
func resourceAliCloudCenPrivateZone() *schema.Resource {
return &schema.Resource{
Create: resourceAlicloudCenPrivateZoneCreate,
Read: resourceAlicloudCenPrivateZoneRead,
Delete: resourceAlicloudCenPrivateZoneDelete,
Create: resourceAliCloudCenPrivateZoneCreate,
Read: resourceAliCloudCenPrivateZoneRead,
Delete: resourceAliCloudCenPrivateZoneDelete,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
},
Timeouts: &schema.ResourceTimeout{
Create: schema.DefaultTimeout(6 * time.Minute),
Delete: schema.DefaultTimeout(5 * time.Minute),
},
Schema: map[string]*schema.Schema{
"access_region_id": {
"cen_id": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"cen_id": {
"access_region_id": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"host_region_id": {
"host_vpc_id": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"host_vpc_id": {
"host_region_id": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
Expand All @@ -49,87 +51,108 @@ func resourceAlicloudCenPrivateZone() *schema.Resource {
}
}

func resourceAlicloudCenPrivateZoneCreate(d *schema.ResourceData, meta interface{}) error {
func resourceAliCloudCenPrivateZoneCreate(d *schema.ResourceData, meta interface{}) error {
client := meta.(*connectivity.AliyunClient)
cbnService := CbnService{client}

request := cbn.CreateRoutePrivateZoneInCenToVpcRequest()
request.AccessRegionId = d.Get("access_region_id").(string)
request.CenId = d.Get("cen_id").(string)
request.HostRegionId = d.Get("host_region_id").(string)
request.AccessRegionId = d.Get("access_region_id").(string)
request.HostVpcId = d.Get("host_vpc_id").(string)
request.HostRegionId = d.Get("host_region_id").(string)

var raw interface{}
var err error
wait := incrementalWait(3*time.Second, 5*time.Second)
err := resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError {
raw, err := client.WithCbnClient(func(cbnClient *cbn.Client) (interface{}, error) {
err = resource.Retry(client.GetRetryTimeout(d.Timeout(schema.TimeoutCreate)), func() *resource.RetryError {
raw, err = client.WithCbnClient(func(cbnClient *cbn.Client) (interface{}, error) {
return cbnClient.RoutePrivateZoneInCenToVpc(request)
})
if err != nil {
if IsExpectedErrors(err, []string{"Operation.Blocking", "InvalidOperation.CenInstanceStatus", "InvalidOperation.NoChildInstanceEitherRegion"}) {
if IsExpectedErrors(err, []string{"Operation.Blocking", "InvalidOperation.CenInstanceStatus", "InvalidOperation.NoChildInstanceEitherRegion"}) || NeedRetry(err) {
wait()
return resource.RetryableError(err)
}
return resource.NonRetryableError(err)
}
addDebug(request.GetActionName(), raw)
d.SetId(d.Get("cen_id").(string) + ":" + d.Get("access_region_id").(string))
return nil
})
addDebug(request.GetActionName(), raw, request.RpcRequest, request)

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

d.SetId(fmt.Sprintf("%v:%v", request.CenId, request.AccessRegionId))

stateConf := BuildStateConf([]string{}, []string{"Active"}, d.Timeout(schema.TimeoutCreate), 5*time.Second, cbnService.CenPrivateZoneStateRefreshFunc(d.Id(), []string{}))
if _, err := stateConf.WaitForState(); err != nil {
return WrapErrorf(err, IdMsg, d.Id())
}

return resourceAlicloudCenPrivateZoneRead(d, meta)
return resourceAliCloudCenPrivateZoneRead(d, meta)
}
func resourceAlicloudCenPrivateZoneRead(d *schema.ResourceData, meta interface{}) error {

func resourceAliCloudCenPrivateZoneRead(d *schema.ResourceData, meta interface{}) error {
client := meta.(*connectivity.AliyunClient)
cbnService := CbnService{client}

object, err := cbnService.DescribeCenPrivateZone(d.Id())
if err != nil {
if NotFoundError(err) {
if !d.IsNewResource() && NotFoundError(err) {
d.SetId("")
return nil
}
return WrapError(err)
}

parts, err := ParseResourceId(d.Id(), 2)
if err != nil {
return WrapError(err)
}
d.Set("access_region_id", parts[1])

d.Set("cen_id", parts[0])
d.Set("host_region_id", object.HostRegionId)
d.Set("access_region_id", object.AccessRegionId)
d.Set("host_vpc_id", object.HostVpcId)
d.Set("host_region_id", object.HostRegionId)
d.Set("status", object.Status)

return nil
}
func resourceAlicloudCenPrivateZoneDelete(d *schema.ResourceData, meta interface{}) error {

func resourceAliCloudCenPrivateZoneDelete(d *schema.ResourceData, meta interface{}) error {
client := meta.(*connectivity.AliyunClient)

parts, err := ParseResourceId(d.Id(), 2)
if err != nil {
return WrapError(err)
}

request := cbn.CreateUnroutePrivateZoneInCenToVpcRequest()
request.AccessRegionId = parts[1]
request.CenId = parts[0]
err = resource.Retry(300*time.Second, func() *resource.RetryError {
raw, err := client.WithCbnClient(func(cbnClient *cbn.Client) (interface{}, error) {
request.AccessRegionId = parts[1]

var raw interface{}
err = resource.Retry(client.GetRetryTimeout(d.Timeout(schema.TimeoutDelete)), func() *resource.RetryError {
raw, err = client.WithCbnClient(func(cbnClient *cbn.Client) (interface{}, error) {
return cbnClient.UnroutePrivateZoneInCenToVpc(request)
})
if err != nil {
if IsExpectedErrors(err, []string{"Operation.Blocking", "InvalidOperation.CenInstanceStatus"}) {
if IsExpectedErrors(err, []string{"Operation.Blocking", "InvalidOperation.CenInstanceStatus"}) || NeedRetry(err) {
return resource.RetryableError(err)
}
return resource.NonRetryableError(err)
}
addDebug(request.GetActionName(), raw)
return nil
})
addDebug(request.GetActionName(), raw, request.RpcRequest, request)

if err != nil {
if NotFoundError(err) {
return nil
}
return WrapErrorf(err, DefaultErrorMsg, d.Id(), request.GetActionName(), AlibabaCloudSdkGoERROR)
}

return nil
}
66 changes: 37 additions & 29 deletions alicloud/resource_alicloud_cen_private_zone_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,46 +4,45 @@ import (
"fmt"
"testing"

"github.com/aliyun/alibaba-cloud-sdk-go/services/cbn"
"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 TestAccAlicloudCenPrivateZone_basic(t *testing.T) {
var v cbn.PrivateZoneInfo
func TestAccAliCloudCenPrivateZone_basic0(t *testing.T) {
var v map[string]interface{}
checkoutSupportedRegions(t, true, connectivity.CenSupportRegions)
resourceId := "alicloud_cen_private_zone.default"
ra := resourceAttrInit(resourceId, CenPrivateZoneMap)
ra := resourceAttrInit(resourceId, AliCloudCenPrivateZoneMap0)
rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} {
return &CbnService{testAccProvider.Meta().(*connectivity.AliyunClient)}
}, "DescribeCenPrivateZone")
rac := resourceAttrCheckInit(rc, ra)
testAccCheck := rac.resourceAttrMapUpdateSet()
rand := acctest.RandIntRange(1000000, 9999999)
rand := acctest.RandIntRange(10000, 99999)
name := fmt.Sprintf("tf-testAccCenPrivateZone%d", rand)
testAccConfig := resourceTestAccConfigFunc(resourceId, name, CenPrivateZoneBasicdependence)
testAccConfig := resourceTestAccConfigFunc(resourceId, name, AliCloudCenPrivateZoneBasicDependence0)
resource.Test(t, resource.TestCase{
PreCheck: func() {
testAccPreCheck(t)
},

IDRefreshName: resourceId,
Providers: testAccProviders,
CheckDestroy: rac.checkResourceDestroy(),
Steps: []resource.TestStep{
{
Config: testAccConfig(map[string]interface{}{
"access_region_id": defaultRegionToTest,
"cen_id": "${alicloud_cen_instance_attachment.default.instance_id}",
"host_region_id": defaultRegionToTest,
"access_region_id": "${data.alicloud_regions.default.regions.0.id}",
"host_vpc_id": "${alicloud_cen_instance_attachment.default.child_instance_id}",
"host_region_id": "${data.alicloud_regions.default.regions.0.id}",
}),
Check: resource.ComposeTestCheckFunc(
testAccCheck(map[string]string{
"access_region_id": defaultRegionToTest,
"cen_id": CHECKSET,
"host_region_id": defaultRegionToTest,
"access_region_id": CHECKSET,
"host_vpc_id": CHECKSET,
"host_region_id": CHECKSET,
}),
),
},
Expand All @@ -56,26 +55,35 @@ func TestAccAlicloudCenPrivateZone_basic(t *testing.T) {
})
}

var CenPrivateZoneMap = map[string]string{
var AliCloudCenPrivateZoneMap0 = map[string]string{
"status": CHECKSET,
}

func CenPrivateZoneBasicdependence(name string) string {
func AliCloudCenPrivateZoneBasicDependence0(name string) string {
return fmt.Sprintf(`
variable "name" {
default = "%s"
}
resource "alicloud_cen_instance" "default" {
name = "${var.name}"
}
data "alicloud_vpcs" "default" {
name_regex = "^default-NODELETING$"
}
resource "alicloud_cen_instance_attachment" "default" {
instance_id = "${alicloud_cen_instance.default.id}"
child_instance_id = "${data.alicloud_vpcs.default.ids.0}"
child_instance_type = "VPC"
child_instance_region_id = "%s"
}
`, name, defaultRegionToTest)
variable "name" {
default = "%s"
}

data "alicloud_regions" "default" {
current = true
}

resource "alicloud_vpc" "default" {
vpc_name = var.name
cidr_block = "172.17.3.0/24"
}

resource "alicloud_cen_instance" "default" {
cen_instance_name = var.name
description = var.name
}

resource "alicloud_cen_instance_attachment" "default" {
instance_id = alicloud_cen_instance.default.id
child_instance_id = alicloud_vpc.default.id
child_instance_type = "VPC"
child_instance_region_id = data.alicloud_regions.default.regions.0.id
}
`, name)
}
15 changes: 9 additions & 6 deletions alicloud/service_alicloud_cbn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,8 @@ func (s *CbnService) DescribeCenPrivateZone(id string) (object cbn.PrivateZoneIn
return
}
request := cbn.CreateDescribeCenPrivateZoneRoutesRequest()
request.RegionId = s.client.RegionId
request.AccessRegionId = parts[1]
request.CenId = parts[0]
request.AccessRegionId = parts[1]

var raw interface{}
wait := incrementalWait(3*time.Second, 3*time.Second)
Expand All @@ -302,20 +301,24 @@ func (s *CbnService) DescribeCenPrivateZone(id string) (object cbn.PrivateZoneIn
}
return resource.NonRetryableError(err)
}
addDebug(request.GetActionName(), raw, request.RpcRequest, request)
return nil
})
addDebug(request.GetActionName(), raw, request.RpcRequest, request)

if err != nil {
err = WrapErrorf(err, DefaultErrorMsg, id, request.GetActionName(), AlibabaCloudSdkGoERROR)
return
if IsExpectedErrors(err, []string{"ParameterIllegal.CenInstanceId"}) {
return object, WrapErrorf(Error(GetNotFoundMessage("Cen:PrivateZone", id)), NotFoundMsg, ProviderERROR)
}
return object, WrapErrorf(err, DefaultErrorMsg, id, request.GetActionName(), AlibabaCloudSdkGoERROR)
}

response, _ := raw.(*cbn.DescribeCenPrivateZoneRoutesResponse)

if len(response.PrivateZoneInfos.PrivateZoneInfo) < 1 {
err = WrapErrorf(Error(GetNotFoundMessage("CenPrivateZone", id)), NotFoundMsg, ProviderERROR)
err = WrapErrorf(Error(GetNotFoundMessage("Cen:PrivateZone", id)), NotFoundMsg, ProviderERROR)
return
}

return response.PrivateZoneInfos.PrivateZoneInfo[0], nil
}

Expand Down
Loading
Loading