Merge pull request #145 from volcengine/feat/alb

Feat/alb
volcengine · Nov 23, 2023 · 75325ea · 75325ea
2 parents 95411dd + c1d105e
commit 75325ea
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 2 deletions.
diff --git a/common/common_volcengine_version.go b/common/common_volcengine_version.go
@@ -2,5 +2,5 @@ package common
 
 const (
 	TerraformProviderName    = "terraform-provider-volcengine"
-	TerraformProviderVersion = "0.0.125"
+	TerraformProviderVersion = "0.0.126"
 )
diff --git a/volcengine/alb/alb/service_volcengine_alb.go b/volcengine/alb/alb/service_volcengine_alb.go
@@ -63,6 +63,7 @@ func (s *VolcengineAlbService) ReadResources(m map[string]interface{}) (data []i
 		if data, ok = results.([]interface{}); !ok {
 			return data, errors.New("Result.LoadBalancers is not Slice")
 		}
+		data, err = removeSystemTags(data)
 		return data, err
 	})
 	if err != nil {
@@ -564,6 +565,27 @@ func (s *VolcengineAlbService) getVpcIdAndZoneIdBySubnets(subnetIds []interface{
 	return vpcId, zoneIds, nil
 }
 
+func removeSystemTags(data []interface{}) ([]interface{}, error) {
+	var (
+		ok      bool
+		result  map[string]interface{}
+		results []interface{}
+		tags    []interface{}
+	)
+	for _, d := range data {
+		if result, ok = d.(map[string]interface{}); !ok {
+			return results, errors.New("The elements in data are not map ")
+		}
+		tags, ok = result["Tags"].([]interface{})
+		if ok {
+			tags = ve.FilterSystemTags(tags)
+			result["Tags"] = tags
+		}
+		results = append(results, result)
+	}
+	return results, nil
+}
+
 func getUniversalInfo(actionName string) ve.UniversalInfo {
 	return ve.UniversalInfo{
 		ServiceName: "alb",

diff --git a/volcengine/autoscaling/scaling_group_enabler/service_volcengine_scaling_group_enabler.go b/volcengine/autoscaling/scaling_group_enabler/service_volcengine_scaling_group_enabler.go
@@ -124,7 +124,7 @@ func (s *VolcengineScalingGroupEnablerService) ModifyResource(data *schema.Resou
 	return []ve.Callback{}
 }
 
-func (s *VolcengineScalingGroupEnablerService) RemoveResource(data *schema.ResourceData, resource *schema.Resource) []ve.Callback {
+func (s *VolcengineScalingGroupEnablerService) RemoveResource(data *schema.ResourceData, r *schema.Resource) []ve.Callback {
 	param := &map[string]interface{}{
 		"ScalingGroupId": data.Get("scaling_group_id").(string),
 	}
@@ -137,6 +137,27 @@ func (s *VolcengineScalingGroupEnablerService) RemoveResource(data *schema.Resou
 				logger.Debug(logger.RespFormat, call.Action, call.SdkParam)
 				return s.Client.UniversalClient.DoCall(getUniversalInfo(call.Action), call.SdkParam)
 			},
+			CallError: func(d *schema.ResourceData, client *ve.SdkClient, call ve.SdkCall, baseErr error) error {
+				return resource.Retry(5*time.Minute, func() *resource.RetryError {
+					_, callErr := s.ReadResource(d, "")
+					if callErr != nil {
+						if ve.ResourceNotFoundError(callErr) {
+							return nil
+						} else {
+							return resource.NonRetryableError(fmt.Errorf("error on  reading scaling group enabler on delete %q, %w", d.Id(), callErr))
+						}
+					}
+					_, callErr = call.ExecuteCall(d, client, call)
+					if callErr == nil {
+						return nil
+					}
+					// 伸缩组lock，重试
+					if strings.Contains(callErr.Error(), "ErrInvalidGroupStatus") {
+						return resource.RetryableError(callErr)
+					}
+					return resource.NonRetryableError(callErr)
+				})
+			},
 		},
 	}
 	return []ve.Callback{callback}

diff --git a/volcengine/vke/addon/service_volcengine_vke_addon.go b/volcengine/vke/addon/service_volcengine_vke_addon.go
@@ -28,6 +28,7 @@ func init() {
 		"scheduler-plugin",
 		"mgpu",
 		"load-balancer-controller",
+		"vpc-cni-controlplane",
 	}
 }