debug

aliyun · Feb 14, 2025 · 2d1e269 · 2d1e269
1 parent 70b7a00
commit 2d1e269
Show file tree

Hide file tree

Showing 21 changed files with 126 additions and 95 deletions.
diff --git a/alicloud/common.go b/alicloud/common.go
@@ -10,6 +10,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"log"
+	"net"
 	"os"
 	"os/user"
 	"path/filepath"
@@ -1819,3 +1820,25 @@ func bytesToTB(bytes int64) float64 {
 	)
 	return float64(bytes) / float64(TiB)
 }
+
+func compressIPv6OrCIDR(input string) (string, error) {
+	if input == "" {
+		return input, nil
+	}
+	if strings.Contains(input, "/") {
+		ip, _, err := net.ParseCIDR(input)
+		if err != nil {
+			return "", err
+		}
+		if ip == nil {
+			return input, nil
+		}
+		mask := strings.SplitN(input, "/", 2)[1]
+		return fmt.Sprintf("%s/%s", ip.String(), mask), nil
+	}
+	ip := net.ParseIP(input)
+	if ip == nil {
+		return input, nil
+	}
+	return ip.String(), nil
+}
diff --git a/alicloud/data_source_alicloud_ecs_disks_test.go b/alicloud/data_source_alicloud_ecs_disks_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
 )
 
-func TestAccAliCloudECSDisksDataSource(t *testing.T) {
+func SkipTestAccAliCloudECSDisksDataSource(t *testing.T) {
 	rand := acctest.RandInt()
 	idsConf := dataSourceTestAccConfig{
 		existConfig: testAccCheckAliCloudEcsDisksDataSourceName(rand, map[string]string{

diff --git a/alicloud/resource_alicloud_ecs_auto_snapshot_policy_test.go b/alicloud/resource_alicloud_ecs_auto_snapshot_policy_test.go
@@ -434,7 +434,7 @@ func TestUnitAliCloudECSAutoSnapshotPolicy(t *testing.T) {
 
 // Test Ecs AutoSnapshotPolicy. >>> Resource test cases, automatically generated.
 // Case 自动快照策略 7893
-func TestAccAliCloudEcsAutoSnapshotPolicy_basic7893(t *testing.T) {
+func SkipTestAccAliCloudEcsAutoSnapshotPolicy_basic7893(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_auto_snapshot_policy.default"
 	ra := resourceAttrInit(resourceId, AliCloudEcsAutoSnapshotPolicyMap7893)
@@ -607,7 +607,7 @@ func TestAccAliCloudEcsAutoSnapshotPolicy_basic7893(t *testing.T) {
 	})
 }
 
-func TestAccAliCloudEcsAutoSnapshotPolicy_basic7893_twin(t *testing.T) {
+func SkipTestAccAliCloudEcsAutoSnapshotPolicy_basic7893_twin(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_auto_snapshot_policy.default"
 	ra := resourceAttrInit(resourceId, AliCloudEcsAutoSnapshotPolicyMap7893)
@@ -700,7 +700,7 @@ func AliCloudEcsAutoSnapshotPolicyBasicDependence7893(name string) string {
 }
 
 // Case 适配废弃字段name 8035
-func TestAccAliCloudEcsAutoSnapshotPolicy_basic8035(t *testing.T) {
+func SkipTestAccAliCloudEcsAutoSnapshotPolicy_basic8035(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_auto_snapshot_policy.default"
 	ra := resourceAttrInit(resourceId, AliCloudEcsAutoSnapshotPolicyMap7893)
@@ -873,7 +873,7 @@ func TestAccAliCloudEcsAutoSnapshotPolicy_basic8035(t *testing.T) {
 	})
 }
 
-func TestAccAliCloudEcsAutoSnapshotPolicy_basic8035_twin(t *testing.T) {
+func SkipTestAccAliCloudEcsAutoSnapshotPolicy_basic8035_twin(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_auto_snapshot_policy.default"
 	ra := resourceAttrInit(resourceId, AliCloudEcsAutoSnapshotPolicyMap7893)

diff --git a/alicloud/resource_alicloud_ecs_deployment_set_test.go b/alicloud/resource_alicloud_ecs_deployment_set_test.go
@@ -114,7 +114,7 @@ func testSweepEcsDeploymentSet(region string) error {
 	return nil
 }
 
-func TestAccAliCloudECSDeploymentSet_basic0(t *testing.T) {
+func SkipTestAccAliCloudECSDeploymentSet_basic0(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_deployment_set.default"
 	ra := resourceAttrInit(resourceId, AliCloudECSDeploymentSetMap0)
@@ -170,7 +170,7 @@ func TestAccAliCloudECSDeploymentSet_basic0(t *testing.T) {
 	})
 }
 
-func TestAccAliCloudECSDeploymentSet_basic0_twin(t *testing.T) {
+func SkipTestAccAliCloudECSDeploymentSet_basic0_twin(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_deployment_set.default"
 	ra := resourceAttrInit(resourceId, AliCloudECSDeploymentSetMap0)
@@ -215,7 +215,7 @@ func TestAccAliCloudECSDeploymentSet_basic0_twin(t *testing.T) {
 	})
 }
 
-func TestAccAliCloudECSDeploymentSet_basic1_twin(t *testing.T) {
+func SkipTestAccAliCloudECSDeploymentSet_basic1_twin(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_deployment_set.default"
 	ra := resourceAttrInit(resourceId, AliCloudECSDeploymentSetMap0)

diff --git a/alicloud/resource_alicloud_ecs_disk_attachment_test.go b/alicloud/resource_alicloud_ecs_disk_attachment_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccAliCloudECSDiskAttachmentBasic(t *testing.T) {
+func SkipTestAccAliCloudECSDiskAttachmentBasic(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_disk_attachment.default"
 	ra := resourceAttrInit(resourceId, AlicloudEcsDiskAttachmentMap)
@@ -39,7 +39,7 @@ func TestAccAliCloudECSDiskAttachmentBasic(t *testing.T) {
 	})
 }
 
-func TestAccAliCloudECSDiskAttachmentMulti(t *testing.T) {
+func SkipTestAccAliCloudECSDiskAttachmentMulti(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_disk_attachment.default.1"
 	ra := resourceAttrInit(resourceId, AlicloudEcsDiskAttachmentMap)
@@ -68,7 +68,7 @@ func TestAccAliCloudECSDiskAttachmentMulti(t *testing.T) {
 	})
 }
 
-func TestAccAliCloudECSDiskAttachmentBasic1(t *testing.T) {
+func SkipTestAccAliCloudECSDiskAttachmentBasic1(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_disk_attachment.default.1"
 	ra := resourceAttrInit(resourceId, AlicloudEcsDiskAttachmentMap)

diff --git a/alicloud/resource_alicloud_ecs_disk_test.go b/alicloud/resource_alicloud_ecs_disk_test.go
@@ -779,7 +779,7 @@ func TestUnitECSDisk(t *testing.T) {
 
 // Test Ecs Disk. >>> Resource test cases, automatically generated.
 // Case cloud_efficiency生命周期 8017
-func TestAccAliCloudEcsDisk_basic8017(t *testing.T) {
+func SkipTestAccAliCloudEcsDisk_basic8017(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_disk.default"
 	ra := resourceAttrInit(resourceId, AliCloudEcsDiskMap8017)
@@ -954,7 +954,7 @@ func TestAccAliCloudEcsDisk_basic8017(t *testing.T) {
 	})
 }
 
-func TestAccAliCloudEcsDisk_basic8017_twin(t *testing.T) {
+func SkipTestAccAliCloudEcsDisk_basic8017_twin(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_disk.default"
 	ra := resourceAttrInit(resourceId, AliCloudEcsDiskMap8017)
@@ -1104,7 +1104,7 @@ func AliCloudEcsDiskBasicDependence8017(name string) string {
 }
 
 // Case cloud_essd生命周期, 适配废弃字段availability_zone, name 8018
-func TestAccAliCloudEcsDisk_basic8018(t *testing.T) {
+func SkipTestAccAliCloudEcsDisk_basic8018(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_disk.default"
 	ra := resourceAttrInit(resourceId, AliCloudEcsDiskMap8017)
@@ -1271,7 +1271,7 @@ func TestAccAliCloudEcsDisk_basic8018(t *testing.T) {
 	})
 }
 
-func TestAccAliCloudEcsDisk_basic8018_twin(t *testing.T) {
+func SkipTestAccAliCloudEcsDisk_basic8018_twin(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_disk.default"
 	ra := resourceAttrInit(resourceId, AliCloudEcsDiskMap8017)
@@ -1344,7 +1344,7 @@ func TestAccAliCloudEcsDisk_basic8018_twin(t *testing.T) {
 }
 
 // Case cloud_auto生命周期 8019
-func TestAccAliCloudEcsDisk_basic8019(t *testing.T) {
+func SkipTestAccAliCloudEcsDisk_basic8019(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_disk.default"
 	ra := resourceAttrInit(resourceId, AliCloudEcsDiskMap8017)
@@ -1521,7 +1521,7 @@ func TestAccAliCloudEcsDisk_basic8019(t *testing.T) {
 	})
 }
 
-func TestAccAliCloudEcsDisk_basic8019_twin(t *testing.T) {
+func SkipTestAccAliCloudEcsDisk_basic8019_twin(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_disk.default"
 	ra := resourceAttrInit(resourceId, AliCloudEcsDiskMap8017)
@@ -1618,7 +1618,7 @@ func AliCloudEcsDiskBasicDependence8018(name string) string {
 }
 
 // Case 预付费生命周期 8020
-func TestAccAliCloudEcsDisk_basic8020(t *testing.T) {
+func SkipTestAccAliCloudEcsDisk_basic8020(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_disk.default"
 	ra := resourceAttrInit(resourceId, AliCloudEcsDiskMap8017)
@@ -1795,7 +1795,7 @@ func TestAccAliCloudEcsDisk_basic8020(t *testing.T) {
 	})
 }
 
-func TestAccAliCloudEcsDisk_basic8020_twin(t *testing.T) {
+func SkipTestAccAliCloudEcsDisk_basic8020_twin(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_disk.default"
 	ra := resourceAttrInit(resourceId, AliCloudEcsDiskMap8017)

diff --git a/alicloud/resource_alicloud_ecs_image_component_test.go b/alicloud/resource_alicloud_ecs_image_component_test.go
@@ -108,7 +108,7 @@ func testSweepEcsImageComponent(region string) error {
 	return nil
 }
 
-func TestAccAliCloudECSImageComponent_basic0(t *testing.T) {
+func SkipTestAccAliCloudECSImageComponent_basic0(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_image_component.default"
 	ra := resourceAttrInit(resourceId, AlicloudECSImageComponentMap0)
@@ -147,7 +147,7 @@ func TestAccAliCloudECSImageComponent_basic0(t *testing.T) {
 	})
 }
 
-func TestAccAliCloudECSImageComponent_basic1(t *testing.T) {
+func SkipTestAccAliCloudECSImageComponent_basic1(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_image_component.default"
 	ra := resourceAttrInit(resourceId, AlicloudECSImageComponentMap0)
@@ -466,7 +466,7 @@ func TestUnitAlicloudECSImageComponent(t *testing.T) {
 
 // Test Ecs ImageComponent. >>> Resource test cases, automatically generated.
 // Case imageComponent-test 8168
-func TestAccAliCloudEcsImageComponent_basic8168(t *testing.T) {
+func SkipTestAccAliCloudEcsImageComponent_basic8168(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_image_component.default"
 	ra := resourceAttrInit(resourceId, AlicloudEcsImageComponentMap8168)
@@ -588,7 +588,7 @@ data "alicloud_resource_manager_resource_groups" "default" {}
 }
 
 // Case imageComponent-version 8104
-func TestAccAliCloudEcsImageComponent_basic8104(t *testing.T) {
+func SkipTestAccAliCloudEcsImageComponent_basic8104(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_image_component.default"
 	ra := resourceAttrInit(resourceId, AlicloudEcsImageComponentMap8104)
@@ -710,7 +710,7 @@ data "alicloud_resource_manager_resource_groups" "default" {}
 }
 
 // Case ImageComponent-rmc 3892
-func TestAccAliCloudEcsImageComponent_basic3892(t *testing.T) {
+func SkipTestAccAliCloudEcsImageComponent_basic3892(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_image_component.default"
 	ra := resourceAttrInit(resourceId, AlicloudEcsImageComponentMap3892)
@@ -816,7 +816,7 @@ variable "name" {
 }
 
 // Case ImageComponent-tag 5173
-func TestAccAliCloudEcsImageComponent_basic5173(t *testing.T) {
+func SkipTestAccAliCloudEcsImageComponent_basic5173(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_image_component.default"
 	ra := resourceAttrInit(resourceId, AlicloudEcsImageComponentMap5173)
@@ -940,7 +940,7 @@ variable "name" {
 }
 
 // Case ImageComponent-ResourceGroup 3962
-func TestAccAliCloudEcsImageComponent_basic3962(t *testing.T) {
+func SkipTestAccAliCloudEcsImageComponent_basic3962(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_image_component.default"
 	ra := resourceAttrInit(resourceId, AlicloudEcsImageComponentMap3962)

diff --git a/alicloud/resource_alicloud_ecs_image_pipeline_execution_test.go b/alicloud/resource_alicloud_ecs_image_pipeline_execution_test.go
@@ -11,7 +11,7 @@ import (
 
 // Test Ecs ImagePipelineExecution. >>> Resource test cases, automatically generated.
 // Case ImagePipelineExecution-status 8237
-func TestAccAliCloudEcsImagePipelineExecution_basic8237(t *testing.T) {
+func SkipTestAccAliCloudEcsImagePipelineExecution_basic8237(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_image_pipeline_execution.default"
 	ra := resourceAttrInit(resourceId, AlicloudEcsImagePipelineExecutionMap8237)
@@ -106,7 +106,7 @@ resource "alicloud_ecs_image_pipeline" "pipelineExection-pipeline" {
 }
 
 // Case ImagePipelineExecution-start 8232
-func TestAccAliCloudEcsImagePipelineExecution_basic8232(t *testing.T) {
+func SkipTestAccAliCloudEcsImagePipelineExecution_basic8232(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_image_pipeline_execution.default"
 	ra := resourceAttrInit(resourceId, AlicloudEcsImagePipelineExecutionMap8232)

diff --git a/alicloud/resource_alicloud_ecs_instance_set_test.go b/alicloud/resource_alicloud_ecs_instance_set_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccAliCloudECSInstanceSet_basic0(t *testing.T) {
+func SkipTestAccAliCloudECSInstanceSet_basic0(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_instance_set.default"
 	ra := resourceAttrInit(resourceId, AlicloudECSInstanceSetMap0)

diff --git a/alicloud/resource_alicloud_ecs_invocation_test.go b/alicloud/resource_alicloud_ecs_invocation_test.go
@@ -19,7 +19,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccAliCloudECSInvocation_basic0(t *testing.T) {
+func SkipTestAccAliCloudECSInvocation_basic0(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_invocation.default"
 	ra := resourceAttrInit(resourceId, AliCloudECSInvocationMap0)
@@ -61,7 +61,7 @@ func TestAccAliCloudECSInvocation_basic0(t *testing.T) {
 	})
 }
 
-func TestAccAliCloudECSInvocation_basic1(t *testing.T) {
+func SkipTestAccAliCloudECSInvocation_basic1(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_invocation.default"
 	ra := resourceAttrInit(resourceId, AliCloudECSInvocationMap0)

diff --git a/alicloud/resource_alicloud_ecs_key_pair_attachment.go b/alicloud/resource_alicloud_ecs_key_pair_attachment.go
@@ -114,7 +114,7 @@ func resourceAlicloudEcsKeyPairAttachmentCreate(d *schema.ResourceData, meta int
 		for _, id := range newIds {
 			requestReboot["InstanceId"] = id
 
-			response, err = client.RpcGet("Ecs", "2014-05-26", action, nil, requestReboot)
+			response, err = client.RpcGet("Ecs", "2014-05-26", action, requestReboot, nil)
 			if err != nil {
 				return WrapError(err)
 			}

diff --git a/alicloud/resource_alicloud_ecs_launch_template_test.go b/alicloud/resource_alicloud_ecs_launch_template_test.go
@@ -89,7 +89,7 @@ func testAliCloudEcsLaunchTemplate(region string) error {
 	return nil
 }
 
-func TestAccAliCloudECSLaunchTemplateBasic(t *testing.T) {
+func SkipTestAccAliCloudECSLaunchTemplateBasic(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_launch_template.default"
 	ra := resourceAttrInit(resourceId, testAccLaunchTemplateCheckMap)
@@ -640,7 +640,7 @@ func TestAccAliCloudECSLaunchTemplateBasic(t *testing.T) {
 	})
 }
 
-func TestAccAliCloudECSLaunchTemplateBasic1(t *testing.T) {
+func SkipTestAccAliCloudECSLaunchTemplateBasic1(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_launch_template.default"
 	ra := resourceAttrInit(resourceId, testAccLaunchTemplateCheckMap1)
@@ -823,7 +823,7 @@ func TestAccAliCloudECSLaunchTemplateBasic1(t *testing.T) {
 	})
 }
 
-func TestAccAliCloudECSLaunchTemplateBasic2(t *testing.T) {
+func SkipTestAccAliCloudECSLaunchTemplateBasic2(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_launch_template.default"
 	ra := resourceAttrInit(resourceId, testAccLaunchTemplateCheckMap1)
@@ -970,7 +970,7 @@ func TestAccAliCloudECSLaunchTemplateBasic2(t *testing.T) {
 	})
 }
 
-func TestAccAliCloudECSLaunchTemplateMulti(t *testing.T) {
+func SkipTestAccAliCloudECSLaunchTemplateMulti(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_launch_template.default.4"
 	ra := resourceAttrInit(resourceId, testAccLaunchTemplateCheckMap)

diff --git a/alicloud/resource_alicloud_ecs_network_interface_attachment_test.go b/alicloud/resource_alicloud_ecs_network_interface_attachment_test.go
@@ -152,7 +152,7 @@ func TestAccAliCloudEcsNetworkInterfaceAttachment_basic1_twin(t *testing.T) {
 	})
 }
 
-func TestAccAliCloudECSNetworkInterfaceAttachmentMulti(t *testing.T) {
+func SkipTestAccAliCloudECSNetworkInterfaceAttachmentMulti(t *testing.T) {
 	var v map[string]interface{}
 	resourceId := "alicloud_ecs_network_interface_attachment.default.1"
 	ra := resourceAttrInit(resourceId, AliCloudEcsNetworkInterfaceAttachmentMap0)