Improve ram resource test case

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 IMPROVEMENTS:
 
+- Improve ram resource test case ([#529](https://github.com/alibaba/terraform-provider/pull/529)))
 - Improve container cluster resource test case ([#528](https://github.com/alibaba/terraform-provider/pull/528)))
 - Improve cloud monitor resource test case ([#527](https://github.com/alibaba/terraform-provider/pull/527)))
 - Improve route resource test case ([#526](https://github.com/alibaba/terraform-provider/pull/526)))

alicloud/common.go

@@ -11,6 +11,8 @@ import (
 	"strconv"
 	"strings"
 
+	"time"
+
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
 	"github.com/denverdino/aliyungo/common"
@@ -424,3 +426,49 @@ func writeToFile(filePath string, data interface{}) error {
 	ioutil.WriteFile(filePath, []byte(out), 422)
 	return nil
 }
+
+type Invoker struct {
+	catchers []*Catcher
+}
+
+type Catcher struct {
+	Reason           string
+	RetryCount       int
+	RetryWaitSeconds int
+}
+
+var ClientErrorCatcher = Catcher{AliyunGoClientFailure, 10, 3}
+var ServiceBusyCatcher = Catcher{"ServiceUnavailable", 10, 3}
+
+func NewInvoker() Invoker {
+	i := Invoker{}
+	i.AddCatcher(ClientErrorCatcher)
+	i.AddCatcher(ServiceBusyCatcher)
+	return i
+}
+
+func (a *Invoker) AddCatcher(catcher Catcher) {
+	a.catchers = append(a.catchers, &catcher)
+}
+
+func (a *Invoker) Run(f func() error) error {
+	err := f()
+
+	if err == nil {
+		return nil
+	}
+
+	for _, catcher := range a.catchers {
+		if strings.Contains(err.Error(), catcher.Reason) {
+			catcher.RetryCount--
+
+			if catcher.RetryCount <= 0 {
+				return fmt.Errorf("Retry timeout and got an error: %#v.", err)
+			} else {
+				time.Sleep(time.Duration(catcher.RetryWaitSeconds) * time.Second)
+				return a.Run(f)
+			}
+		}
+	}
+	return err
+}

alicloud/config.go

@@ -225,9 +225,16 @@ func (c *Config) ossConn() (*oss.Client, error) {
 		ServiceCode: "oss",
 		Type:        "openAPI",
 	}
-
-	endpoints, err := endpointClient.DescribeEndpoints(args)
-	if err != nil {
+	invoker := NewInvoker()
+	var endpoints *location.DescribeEndpointsResponse
+	if err := invoker.Run(func() error {
+		es, err := endpointClient.DescribeEndpoints(args)
+		if err != nil {
+			return err
+		}
+		endpoints = es
+		return nil
+	}); err != nil {
 		return nil, fmt.Errorf("Describe endpoint using region: %#v got an error: %#v.", c.Region, err)
 	}
 	endpointItem := endpoints.Endpoints.Endpoint

alicloud/data_source_alicloud_ram_account_alias_test.go

@@ -17,7 +17,6 @@ func TestAccAlicloudRamAccountAliasDataSource_basic(t *testing.T) {
 				Config: testAccCheckAlicloudAccountAliasDataSourceBasic,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAlicloudDataSourceID("data.alicloud_ram_account_aliases.alias"),
-					resource.TestCheckResourceAttr("data.alicloud_ram_account_aliases.alias", "account_alias", "1307087942598154"),
 				),
 			},
 		},

alicloud/data_source_alicloud_ram_groups_test.go

@@ -18,8 +18,8 @@ func TestAccAlicloudRamGroupsDataSource_for_user(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAlicloudDataSourceID("data.alicloud_ram_groups.group"),
 					resource.TestCheckResourceAttr("data.alicloud_ram_groups.group", "groups.#", "1"),
-					resource.TestCheckResourceAttr("data.alicloud_ram_groups.group", "groups.0.name", "group3"),
-					resource.TestCheckResourceAttr("data.alicloud_ram_groups.group", "groups.0.comments", "33"),
+					resource.TestCheckResourceAttr("data.alicloud_ram_groups.group", "groups.0.name", "testAccCheckAlicloudRamGroupsDataSourceForUserConfig"),
+					resource.TestCheckResourceAttr("data.alicloud_ram_groups.group", "groups.0.comments", "group comments"),
 				),
 			},
 		},
@@ -38,8 +38,8 @@ func TestAccAlicloudRamGroupsDataSource_for_policy(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAlicloudDataSourceID("data.alicloud_ram_groups.group"),
 					resource.TestCheckResourceAttr("data.alicloud_ram_groups.group", "groups.#", "1"),
-					resource.TestCheckResourceAttr("data.alicloud_ram_groups.group", "groups.0.name", "group1"),
-					resource.TestCheckResourceAttr("data.alicloud_ram_groups.group", "groups.0.comments", "1"),
+					resource.TestCheckResourceAttr("data.alicloud_ram_groups.group", "groups.0.name", "testAccCheckAlicloudRamGroupsDataSourceForPolicyConfig"),
+					resource.TestCheckResourceAttr("data.alicloud_ram_groups.group", "groups.0.comments", "group comments"),
 				),
 			},
 		},
@@ -57,7 +57,6 @@ func TestAccAlicloudRamGroupsDataSource_for_all(t *testing.T) {
 				Config: testAccCheckAlicloudRamGroupsDataSourceForAllConfig,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAlicloudDataSourceID("data.alicloud_ram_groups.group"),
-					resource.TestCheckResourceAttr("data.alicloud_ram_groups.group", "groups.#", "5"),
 				),
 			},
 		},
@@ -75,29 +74,85 @@ func TestAccAlicloudRamGroupsDataSource_group_name_regex(t *testing.T) {
 				Config: testAccCheckAlicloudRamGroupsDataSourceGroupNameRegexConfig,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAlicloudDataSourceID("data.alicloud_ram_groups.group"),
-					resource.TestCheckResourceAttr("data.alicloud_ram_groups.group", "groups.#", "4"),
+					resource.TestCheckResourceAttr("data.alicloud_ram_groups.group", "groups.#", "1"),
 				),
 			},
 		},
 	})
 }
 
 const testAccCheckAlicloudRamGroupsDataSourceForUserConfig = `
+variable "name" {
+  default = "testAccCheckAlicloudRamGroupsDataSourceForUserConfig"
+}
+resource "alicloud_ram_user" "user" {
+  name = "${var.name}"
+  display_name = "displayname"
+  mobile = "86-18888888888"
+  email = "[email protected]"
+  comments = "yoyoyo"
+}
+
+resource "alicloud_ram_group" "group" {
+  name = "${var.name}"
+  comments = "group comments"
+  force=true
+}
+resource "alicloud_ram_group_membership" "membership" {
+  group_name = "${alicloud_ram_group.group.name}"
+  user_names = ["${alicloud_ram_user.user.name}"]
+}
+
 data "alicloud_ram_groups" "group" {
-  user_name = "user1"
+  user_name = "${alicloud_ram_group_membership.membership.user_names[0]}"
 }`
 
 const testAccCheckAlicloudRamGroupsDataSourceForPolicyConfig = `
+variable "name" {
+  default = "testAccCheckAlicloudRamGroupsDataSourceForPolicyConfig"
+}
+resource "alicloud_ram_policy" "policy" {
+  name = "${var.name}"
+  statement = [
+    {
+      effect = "Deny"
+      action = [
+        "oss:ListObjects",
+        "oss:ListObjects"]
+      resource = [
+        "acs:oss:*:*:mybucket",
+        "acs:oss:*:*:mybucket/*"]
+    }]
+  description = "this is a policy test"
+  force = true
+}
+
+resource "alicloud_ram_group" "group" {
+  name = "${var.name}"
+  comments = "group comments"
+  force=true
+}
+
+resource "alicloud_ram_group_policy_attachment" "attach" {
+  policy_name = "${alicloud_ram_policy.policy.name}"
+  group_name = "${alicloud_ram_group.group.name}"
+  policy_type = "${alicloud_ram_policy.policy.type}"
+}
 data "alicloud_ram_groups" "group" {
-  policy_name = "AliyunMobileTestingFullAccess"
-  policy_type = "System"
+  policy_name = "${alicloud_ram_group_policy_attachment.attach.policy_name}"
+  policy_type = "Custom"
 }`
 
 const testAccCheckAlicloudRamGroupsDataSourceForAllConfig = `
 data "alicloud_ram_groups" "group" {
 }`
 
 const testAccCheckAlicloudRamGroupsDataSourceGroupNameRegexConfig = `
+resource "alicloud_ram_group" "group" {
+  name = "testAccCheckAlicloudRamGroupsDataSourceGroupNameRegexConfig"
+  comments = "group comments"
+  force=true
+}
 data "alicloud_ram_groups" "group" {
-  name_regex = "^group"
+  name_regex = "${alicloud_ram_group.group.name}"
 }`