resource/alicloud_cs_kubernetes: Fixes GetClusterConfig failed error …

…when the cluster state is failed
aliyun · Mar 15, 2021 · 2cd9cbf · 2cd9cbf
1 parent d845109
commit 2cd9cbf
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/alicloud/resource_alicloud_cs_kubernetes.go b/alicloud/resource_alicloud_cs_kubernetes.go
@@ -1240,6 +1240,10 @@ func resourceAlicloudCSKubernetesRead(d *schema.ResourceData, meta interface{})
 	}
 
 	// get cluster conn certs
+	// If the cluster is failed, there is no need to get cluster certs
+	if object.State == "failed" {
+		return nil
+	}
 	var requestInfo *cs.Client
 	var response interface{}
 	if err := invoker.Run(func() error {

diff --git a/alicloud/resource_alicloud_fc_custom_domain_test.go b/alicloud/resource_alicloud_fc_custom_domain_test.go
@@ -168,7 +168,6 @@ func testSweepFCCustomDomain(region string) error {
 		if response == nil {
 			return nil
 		}
-		nextToken = *response.NextToken
 		for _, domain := range response.CustomDomains {
 			log.Printf("[INFO] Deleting FC custom domain: %s", *domain.DomainName)
 			_, err := client.WithFcClient(func(fcClient *fc.Client) (interface{}, error) {
@@ -178,9 +177,10 @@ func testSweepFCCustomDomain(region string) error {
 				log.Printf("[ERROR] Failed to delete FC custom domains(%s): %s", *domain.DomainName, err)
 			}
 		}
-		if nextToken == "" {
+		if response.NextToken == nil || *response.NextToken == "" {
 			break
 		}
+		nextToken = *response.NextToken
 	}
 
 	return nil

diff --git a/alicloud/resource_alicloud_ros_stack_group_test.go b/alicloud/resource_alicloud_ros_stack_group_test.go
@@ -33,7 +33,7 @@ func testSweepRosStackGroup(region string) error {
 
 	prefixes := []string{
 		"tf-testAcc",
-		"tf-testacc",
+		"tf_testAcc",
 	}
 	request := map[string]interface{}{
 		"PageSize":   PageSizeLarge,
@@ -63,7 +63,7 @@ func testSweepRosStackGroup(region string) error {
 			item := v.(map[string]interface{})
 			skip := true
 			for _, prefix := range prefixes {
-				if strings.HasPrefix(strings.ToLower(item["StackGroupName"].(string)), strings.ToLower(prefix)) && item["Status"].(string) != "DELETED" {
+				if strings.HasPrefix(strings.ToLower(item["StackGroupName"].(string)), strings.ToLower(prefix)) {
 					skip = false
 				}
 			}

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
@@ -525,7 +525,7 @@ jobs:
       - <<: *clone-provider
       - get: trigger
         trigger: true
-        resource: 08
+        resource: 08Thu
       - aggregate:
           - *get-aliyun-cli
       - <<: *run
@@ -1614,13 +1614,13 @@ resources:
       #    days: [Sunday]
       location: {{time_location}}
 
-  - name: 08
-    type: time
-    source:
-      start: 08:00 AM
-      stop: 10:50 PM
-      #    days: [Sunday]
-      location: {{time_location}}
+#  - name: 08
+#    type: time
+#    source:
+#      start: 08:00 AM
+#      stop: 10:50 PM
+#      #    days: [Sunday]
+#      location: {{time_location}}
 
 #  - name: 0830
 #    type: time

diff --git a/ci/tasks/run.sh b/ci/tasks/run.sh
@@ -60,10 +60,10 @@ if [[ ${SWEEPER} = true ]]; then
     echo -e "\n--------------- Running Sweeper Test Cases ---------------"
     if [[ ${TEST_SWEEPER_CASE_CODE} == "alicloud_"* ]]; then
         echo -e "TF_ACC=1 go test ./alicloud -v  -sweep=${ALICLOUD_REGION} -sweep-run=${TEST_SWEEPER_CASE_CODE} -sweep-allow-failures=true"
-        TF_ACC=1 go test ./alicloud -v  -sweep=${ALICLOUD_REGION} -sweep-run=${TEST_SWEEPER_CASE_CODE} -timeout=60m
+        TF_ACC=1 go test ./alicloud -v  -sweep=${ALICLOUD_REGION} -sweep-run=${TEST_SWEEPER_CASE_CODE} -sweep-allow-failures=true -timeout=60m
     else
         echo -e "TF_ACC=1 go test ./alicloud -v  -sweep=${ALICLOUD_REGION} -sweep-allow-failures=true"
-        TF_ACC=1 go test ./alicloud -v  -sweep=${ALICLOUD_REGION} -timeout=60m
+        TF_ACC=1 go test ./alicloud -v  -sweep=${ALICLOUD_REGION} -sweep-allow-failures=true -timeout=60m
     fi
     echo -e "\n--------------- END ---------------"
     exit 0