fix:delete snapshot

Author: spring-young

config/crd/bases/ctrlmesh.kusionstack.io_faultinjections.yaml

@@ -51,7 +51,6 @@ spec:
                         httpStatus:
                           description: HttpStatus is used to indicate the HTTP status
                             code to return to the caller.
-                          format: int32
                           type: integer
                         percent:
                           description: Percent of requests to be aborted with the

pkg/apis/ctrlmesh/constants/constants.go

@@ -66,7 +66,7 @@ const (
 	EnvDisableFaultInjection         = "DISABLE_FAULT_INJECTION"
 	EnvEnableApiServerCircuitBreaker = "ENABLE_API_SERVER_BREAKER"
 	EnvEnableRestCircuitBreaker      = "ENABLE_REST_BREAKER"
-	EnvEnableRestFaultInjection     = "ENABLE_REST_Fault_Injection"
+	EnvEnableRestFaultInjection     = "ENABLE_REST_FAULT_INJECTION"
 
 	EnvProxyGRPCServerPort = "PROXY_GRPC_SERVER_PORT"
 )
@@ -79,6 +79,7 @@ func AllProxySyncEnvKey() []string {
 		EnvDisableCircuitBreaker,
 		EnvEnableApiServerCircuitBreaker,
 		EnvEnableRestCircuitBreaker,
+		EnvEnableRestFaultInjection,
 	}
 	return keys
 }

pkg/apis/ctrlmesh/proto/faultinjection.pb.go

@@ -15,16 +15,6 @@ service FaultInject {
 message FaultInjectConfigResp {
   bool success = 1;
   string message = 2;
-  repeated FaultInjectionSnapshot faultInjectionSnapshots = 3;
-}
-
-message FaultInjectionSnapshot {
-  string limitingName = 1;
-
-  FaultInjectionState state = 2;
-
-  k8s.io.apimachinery.pkg.apis.meta.v1.Time recoverTime = 3;
-  k8s.io.apimachinery.pkg.apis.meta.v1.Time lastTransitionTime = 4;
 }
 
 enum FaultInjectionState {

pkg/apis/ctrlmesh/proto/faultinjection.proto

@@ -162,21 +162,3 @@ func ConvertRelatedResources(resourceRule *ctrlmeshv1alpha1.ResourceMatch) *ctrl
 	return protoResourceRule
 }
 
-func ConvertFaultInjectionSnapshots(in []*ctrlmeshproto.FaultInjectionSnapshot) []*ctrlmeshv1alpha1.FaultInjectionSnapshot {
-	var res []*ctrlmeshv1alpha1.FaultInjectionSnapshot
-	for _, s := range in {
-		var state ctrlmeshv1alpha1.FaultInjectionState
-		switch s.State {
-		case ctrlmeshproto.FaultInjectionState_STATEOPENED:
-			state = ctrlmeshv1alpha1.FaultInjectionStatusOpened
-		case ctrlmeshproto.FaultInjectionState_STATECLOSED:
-			state = ctrlmeshv1alpha1.FaultInjectionStatusClosed
-		}
-		res = append(res, &ctrlmeshv1alpha1.FaultInjectionSnapshot{
-			Name:               s.LimitingName,
-			State:              state,
-			LastTransitionTime: s.LastTransitionTime,
-		})
-	}
-	return res
-}

pkg/apis/ctrlmesh/proto/faultinjection_deepcopy.gen.go

@@ -0,0 +1,40 @@
+/*
+Copyright 2021 The Kruise Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package utils
+
+import "fmt"
+
+type HashChangedError struct {
+	oldHash string
+	newHash string
+}
+
+func (e HashChangedError) Error() string {
+	return e.String()
+}
+
+func (e HashChangedError) String() string {
+	return fmt.Sprintf("hash changed from %s to %s", e.oldHash, e.newHash)
+}
+
+func IsHashChangedError(err error) bool {
+	switch err.(type) {
+	case HashChangedError:
+		return true
+	}
+	return false
+}

pkg/apis/ctrlmesh/utils/conv/faultconv.go

@@ -0,0 +1,38 @@
+package http
+
+import (
+	"fmt"
+	"strings"
+)
+
+func ParseRawQuery(rawQuery string) (map[string]string, error) {
+	result := map[string]string{}
+	if rawQuery == "" {
+		return result, nil
+	}
+
+	pairs := strings.Split(rawQuery, "&")
+	for _, pair := range pairs {
+		kv := strings.Split(pair, "=")
+		if len(kv) != 2 {
+			return result, fmt.Errorf("invalid url query: %s", rawQuery)
+		}
+
+		result[kv[0]] = kv[1]
+	}
+
+	return result, nil
+}
+
+func MarshalRawQuery(queryParm map[string]string) string {
+	result := ""
+	for k, v := range queryParm {
+		if len(result) == 0 {
+			result = result + fmt.Sprintf("%s=%s", k, v)
+		} else {
+			result = result + "&" + fmt.Sprintf("%s=%s", k, v)
+		}
+	}
+
+	return result
+}