chore(iec): normalize methods in services and acceptance (#3761)

1. remove IEC or Iec in both functions and vars; 2. remove v1 in both functions and vars; 3. use DataSourceCheck for data source;
huaweicloud · Nov 30, 2023 · e1e7151 · e1e7151
1 parent 2ff57ae
commit e1e7151
Show file tree

Hide file tree

Showing 55 changed files with 362 additions and 3,210 deletions.
diff --git a/huaweicloud/provider.go b/huaweicloud/provider.go
@@ -512,17 +512,17 @@ func Provider() *schema.Provider {
 			"huaweicloud_identitycenter_users":    identitycenter.DataSourceIdentityCenterUsers(),
 
 			"huaweicloud_iec_bandwidths":     iec.DataSourceBandWidths(),
-			"huaweicloud_iec_eips":           iec.DataSourceNetworkEips(),
-			"huaweicloud_iec_flavors":        iec.DataSourceIecFlavors(),
-			"huaweicloud_iec_images":         iec.DataSourceIecImages(),
-			"huaweicloud_iec_keypair":        iec.DataSourceIECKeypair(),
+			"huaweicloud_iec_eips":           iec.DataSourceEips(),
+			"huaweicloud_iec_flavors":        iec.DataSourceFlavors(),
+			"huaweicloud_iec_images":         iec.DataSourceImages(),
+			"huaweicloud_iec_keypair":        iec.DataSourceKeypair(),
 			"huaweicloud_iec_network_acl":    iec.DataSourceNetworkACL(),
-			"huaweicloud_iec_port":           iec.DataSourceIECPort(),
-			"huaweicloud_iec_security_group": iec.DataSourceIECSecurityGroup(),
-			"huaweicloud_iec_server":         iec.DataSourceIECServer(),
-			"huaweicloud_iec_sites":          iec.DataSourceIecSites(),
-			"huaweicloud_iec_vpc":            iec.DataSourceIECVpc(),
-			"huaweicloud_iec_vpc_subnets":    iec.DataSourceIECVpcSubnets(),
+			"huaweicloud_iec_port":           iec.DataSourcePort(),
+			"huaweicloud_iec_security_group": iec.DataSourceSecurityGroup(),
+			"huaweicloud_iec_server":         iec.DataSourceServer(),
+			"huaweicloud_iec_sites":          iec.DataSourceSites(),
+			"huaweicloud_iec_vpc":            iec.DataSourceVpc(),
+			"huaweicloud_iec_vpc_subnets":    iec.DataSourceVpcSubnets(),
 
 			"huaweicloud_images_image":  ims.DataSourceImagesImageV2(),
 			"huaweicloud_images_images": ims.DataSourceImagesImages(),
@@ -1001,16 +1001,16 @@ func Provider() *schema.Provider {
 			"huaweicloud_identitycenter_custom_policy_attachment": identitycenter.ResourceCustomPolicyAttachment(),
 			"huaweicloud_identitycenter_custom_role_attachment":   identitycenter.ResourceCustomRoleAttachment(),
 
-			"huaweicloud_iec_eip":                 iec.ResourceIecNetworkEip(),
+			"huaweicloud_iec_eip":                 iec.ResourceEip(),
 			"huaweicloud_iec_keypair":             iec.ResourceKeypair(),
 			"huaweicloud_iec_network_acl":         iec.ResourceNetworkACL(),
 			"huaweicloud_iec_network_acl_rule":    iec.ResourceNetworkACLRule(),
-			"huaweicloud_iec_security_group_rule": iec.ResourceIecSecurityGroupRule(),
-			"huaweicloud_iec_security_group":      iec.ResourceIecSecurityGroup(),
-			"huaweicloud_iec_server":              iec.ResourceIecServer(),
-			"huaweicloud_iec_vip":                 iec.ResourceIecVip(),
-			"huaweicloud_iec_vpc":                 iec.ResourceIecVpc(),
-			"huaweicloud_iec_vpc_subnet":          iec.ResourceIecSubnet(),
+			"huaweicloud_iec_security_group_rule": iec.ResourceSecurityGroupRule(),
+			"huaweicloud_iec_security_group":      iec.ResourceSecurityGroup(),
+			"huaweicloud_iec_server":              iec.ResourceServer(),
+			"huaweicloud_iec_vip":                 iec.ResourceVip(),
+			"huaweicloud_iec_vpc":                 iec.ResourceVpc(),
+			"huaweicloud_iec_vpc_subnet":          iec.ResourceSubnet(),
 
 			"huaweicloud_images_image":                ims.ResourceImsImage(),
 			"huaweicloud_images_image_copy":           ims.ResourceImsImageCopy(),

diff --git a/huaweicloud/resource_huaweicloud_iec_eip.go b/huaweicloud/resource_huaweicloud_iec_eip.go