fix cms diff bug and improve its testcases

README.md

@@ -99,6 +99,12 @@ export ALICLOUD_ACCOUNT_SITE=International
 ```
 The setting of acount site type can skip some unsupported cases automatically.
 
+-> **Note:** At present, there is missing CMS contact group resource and please create manually a contact group by web console and set it by environment variable `ALICLOUD_CMS_CONTACT_GROUP`, like:
+ ```
+ export ALICLOUD_CMS_CONTACT_GROUP=tf-testAccCms
+ ```
+ Otherwise, all of resource `alicloud_cms_alarm's` test cases will be skipped.
+
 ## Refer
 
 Alibaba Cloud Provider [Official Docs](https://www.terraform.io/docs/providers/alicloud/index.html)

alicloud/data_source_alicloud_network_interfaces_test.go

@@ -2,9 +2,10 @@ package alicloud
 
 import (
 	"fmt"
-	"github.com/hashicorp/terraform/helper/acctest"
 	"strings"
 	"testing"
+
+	"github.com/hashicorp/terraform/helper/acctest"
 )
 
 func TestAccAlicloudNetworkInterfacesDataSourceBasic(t *testing.T) {

alicloud/diff_suppress_funcs.go

@@ -5,9 +5,6 @@ import (
 
 	"strings"
 
-	"reflect"
-	"sort"
-
 	"github.com/denverdino/aliyungo/common"
 	"github.com/denverdino/aliyungo/dns"
 	"github.com/denverdino/aliyungo/ecs"
@@ -270,17 +267,6 @@ func vpcTypeResourceDiffSuppressFunc(k, old, new string, d *schema.ResourceData)
 	return true
 }
 
-func cmsDimensionsDiffSuppressFunc(k, old, new string, d *schema.ResourceData) bool {
-	if d.IsNewResource() {
-		return false
-	}
-	olds := strings.Split(old, COMMA_SEPARATED)
-	sort.Strings(olds)
-	news := strings.Split(new, COMMA_SEPARATED)
-	sort.Strings(news)
-	return reflect.DeepEqual(olds, news)
-}
-
 func routerInterfaceAcceptsideDiffSuppressFunc(k, old, new string, d *schema.ResourceData) bool {
 	return d.Get("role").(string) == string(AcceptingSide)
 }

alicloud/import_alicloud_cms_alarm_test.go

@@ -6,18 +6,21 @@ import (
 	"github.com/hashicorp/terraform/helper/resource"
 )
 
-// At present, the provider does not support creating contact group resource, so you should add a contact group called "tf-acc-test-group"
-// by web console manually before running the following test case.
-func SkipTestAccAlicloudCmsAlarm_import(t *testing.T) {
+// At present, the provider does not support creating contact group resource, so you should create manually a contact group
+// by web console and set it by environment variable ALICLOUD_CMS_CONTACT_GROUP before running the following test case.
+func TestAccAlicloudCmsAlarm_import(t *testing.T) {
 	resourceName := "alicloud_cms_alarm.basic"
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
+		PreCheck: func() {
+			testAccPreCheck(t)
+			testAccPreCheckWithCmsContactGroupSetting(t)
+		},
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckCmsAlarmDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCmsAlarm_basic,
+				Config: testAccCmsAlarm_basic(cmsContactGroup),
 			},
 
 			{

alicloud/import_alicloud_key_pair_test.go

@@ -1,9 +1,10 @@
 package alicloud
 
 import (
-	"github.com/hashicorp/terraform/helper/acctest"
 	"testing"
 
+	"github.com/hashicorp/terraform/helper/acctest"
+
 	"github.com/hashicorp/terraform/helper/resource"
 )
 

alicloud/import_alicloud_network_interface_test.go

@@ -1,9 +1,10 @@
 package alicloud
 
 import (
-	"github.com/hashicorp/terraform/helper/acctest"
 	"testing"
 
+	"github.com/hashicorp/terraform/helper/acctest"
+
 	"github.com/hashicorp/terraform/helper/resource"
 )
 

alicloud/provider_test.go

@@ -129,3 +129,10 @@ func testAccPreCheckWithMultipleAccount(t *testing.T) {
 		t.Skipped()
 	}
 }
+
+func testAccPreCheckWithCmsContactGroupSetting(t *testing.T) {
+	if v := strings.TrimSpace(os.Getenv("ALICLOUD_CMS_CONTACT_GROUP")); v == "" {
+		t.Skipf("Skipping the test case with no cms contact group setting")
+		t.Skipped()
+	}
+}

alicloud/resource_alicloud_cms_alarm.go

@@ -39,11 +39,10 @@ func resourceAlicloudCmsAlarm() *schema.Resource {
 				ForceNew: true,
 			},
 			"dimensions": {
-				Type:             schema.TypeMap,
-				Required:         true,
-				ForceNew:         true,
-				Elem:             schema.TypeString,
-				DiffSuppressFunc: cmsDimensionsDiffSuppressFunc,
+				Type:     schema.TypeMap,
+				Required: true,
+				ForceNew: true,
+				Elem:     schema.TypeString,
 			},
 			"period": {
 				Type:     schema.TypeInt,