review

pkg/protect/protect.go

@@ -2,7 +2,6 @@ package protect
 
 import (
 	"fmt"
-	"github.com/apache/servicecomb-service-center/pkg/util"
 	"net/http"
 	"time"
 
@@ -22,7 +21,7 @@ var (
 	enableInstanceNullProtect bool
 	restartProtectInterval    time.Duration
 	RestartProtectHttpCode    int
-	validProtectCode          = []int{http.StatusNotModified, http.StatusUnprocessableEntity, http.StatusInternalServerError}
+	validProtectCode          = map[int]struct{}{http.StatusNotModified: {}, http.StatusUnprocessableEntity: {}, http.StatusInternalServerError: {}}
 )
 
 const (
@@ -33,14 +32,17 @@ const (
 
 func Init() {
 	enableInstanceNullProtect = config.GetBool("instance_null_protect.enable", false)
+	if !enableInstanceNullProtect {
+		return
+	}
 	restartProtectInterval = time.Duration(config.GetInt("instance_null_protect.restart_protect_interval", 120)) * time.Second
 	if restartProtectInterval > maxInterval || restartProtectInterval < minInterval {
 		log.Warn(fmt.Sprintf("invalid instance_null_protect.restart_protect_interval: %d,"+
 			" must between %d-%ds inclusively", restartProtectInterval, minInterval, maxInterval))
 		restartProtectInterval = defaultRestartProtectInterval
 	}
 	RestartProtectHttpCode = config.GetInt("instance_null_protect.http_status", http.StatusNotModified)
-	if !util.Contains(validProtectCode, RestartProtectHttpCode) {
+	if _, ok := validProtectCode[RestartProtectHttpCode]; !ok {
 		log.Warn(fmt.Sprintf("invalid instance_null_protect.http_status: %d, must be %v", RestartProtectHttpCode, validProtectCode))
 		RestartProtectHttpCode = http.StatusNotModified
 	}

pkg/util/util.go

@@ -194,19 +194,3 @@ func GeneratePassword() (string, error) {
 	}
 	return pass, nil
 }
-
-// Contains reports whether v is present in s.
-func Contains[S ~[]E, E comparable](s S, v E) bool {
-	return Index(s, v) >= 0
-}
-
-// Index returns the index of the first occurrence of v in s,
-// or -1 if not present.
-func Index[S ~[]E, E comparable](s S, v E) int {
-	for i := range s {
-		if v == s[i] {
-			return i
-		}
-	}
-	return -1
-}

pkg/util/util_test.go

@@ -17,7 +17,6 @@
 package util
 
 import (
-	"net/http"
 	"os"
 	"testing"
 
@@ -185,9 +184,3 @@ func TestGeneratePassword(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, 8, len(password), password)
 }
-
-func TestContains(t *testing.T) {
-	slc := []int{http.StatusNotModified, http.StatusUnprocessableEntity, http.StatusInternalServerError}
-	assert.True(t, Contains(slc, 304))
-	assert.False(t, Contains(slc, 100))
-}