chore: fix error handling

chore: fix linting errors

chore: fix linting errors

fix: linting error

Author: moshloop

cel.go

@@ -10,7 +10,8 @@ import (
 
 func GetCelEnv(environment map[string]any) []cel.EnvOption {
 	// Generated functions
-	opts := append(funcs.CelEnvOption, kubernetes.Library()...)
+	var opts = funcs.CelEnvOption
+	opts = append(opts, kubernetes.Library()...)
 	opts = append(opts, ext.Strings(), ext.Encoders(), ext.Lists(), ext.Math(), ext.Sets())
 	opts = append(opts, strings.Library...)
 

funcs/common.go

@@ -17,7 +17,7 @@ func convertMap(arg ref.Val) (map[string]any, error) {
 	case map[string]any:
 		return m, nil
 	default:
-		return nil, fmt.Errorf("Not a map %T\n", arg.Value())
+		return nil, fmt.Errorf("not a map %T", arg.Value())
 	}
 }
 

kubernetes/health.go

@@ -165,33 +165,3 @@ func k8sIsHealthy2() cel.EnvOption {
 		),
 	)
 }
-
-var k8sGetStatusGen = cel.Function("GetStatus",
-	cel.Overload("GetStatus_interface{}",
-		[]*cel.Type{
-			cel.DynType,
-		},
-		cel.StringType,
-		cel.FunctionBinding(func(args ...ref.Val) ref.Val {
-			return types.DefaultTypeAdapter.NativeToValue(GetStatus(args[0].Value()))
-
-		}),
-	),
-)
-
-var k8sGetHealthGen = cel.Function("GetHealth",
-	cel.Overload("GetHealth_interface{}",
-
-		[]*cel.Type{
-			cel.DynType,
-		},
-		cel.DynType,
-		cel.UnaryBinding(func(in ref.Val) ref.Val {
-			v := GetHealth(in.Value())
-			b, _ := json.Marshal(v)
-			var r map[string]string
-			_ = json.Unmarshal(b, &r)
-			return types.DefaultTypeAdapter.NativeToValue(r)
-		}),
-	),
-)

strings/duration.go

@@ -20,6 +20,14 @@ import (
 	"github.com/google/cel-go/common/types"
 )
 
+type InvalidDuration struct {
+	Duration string
+}
+
+func (m InvalidDuration) Error() string {
+	return "time: invalid duration " + m.Duration
+}
+
 // Duration is a standard unit of time.
 type Duration time.Duration
 
@@ -316,7 +324,7 @@ func parseDuration(s string) (Duration, error) {
 		return 0, nil
 	}
 	if s == "" {
-		return 0, errors.New("time: invalid duration " + orig)
+		return 0, InvalidDuration{Duration: orig}
 	}
 	for s != "" {
 		var (
@@ -328,13 +336,13 @@ func parseDuration(s string) (Duration, error) {
 
 		// The next character must be [0-9.]
 		if !(s[0] == '.' || '0' <= s[0] && s[0] <= '9') {
-			return 0, errors.New("time: invalid duration " + orig)
+			return 0, InvalidDuration{Duration: orig}
 		}
 		// Consume [0-9]*
 		pl := len(s)
 		v, s, err = leadingInt(s)
 		if err != nil {
-			return 0, errors.New("time: invalid duration " + orig)
+			return 0, InvalidDuration{Duration: orig}
 		}
 		pre := pl != len(s) // whether we consumed anything before a period
 		// Consume (\.[0-9]*)?
@@ -344,7 +352,7 @@ func parseDuration(s string) (Duration, error) {
 			pl := len(s)
 			f, s, err = leadingInt(s)
 			if err != nil {
-				return 0, errors.New("time: invalid duration " + orig)
+				return 0, InvalidDuration{Duration: orig}
 			}
 			for n := pl - len(s); n > 0; n-- {
 				scale *= 10
@@ -353,7 +361,7 @@ func parseDuration(s string) (Duration, error) {
 		}
 		if !pre && !post {
 			// no digits (e.g. ".s" or "-.s")
-			return 0, errors.New("time: invalid duration " + orig)
+			return 0, InvalidDuration{Duration: orig}
 		}
 
 		// Consume unit.
@@ -375,7 +383,7 @@ func parseDuration(s string) (Duration, error) {
 		}
 		if v > (1<<63-1)/unit {
 			// overflow
-			return 0, errors.New("time: invalid duration " + orig)
+			return 0, InvalidDuration{Duration: orig}
 		}
 		v *= unit
 		if f > 0 {
@@ -384,13 +392,13 @@ func parseDuration(s string) (Duration, error) {
 			v += int64(float64(f) * (float64(unit) / scale))
 			if v < 0 {
 				// overflow
-				return 0, errors.New("time: invalid duration " + orig)
+				return 0, InvalidDuration{Duration: orig}
 			}
 		}
 		d += v
 		if d < 0 {
 			// overflow
-			return 0, errors.New("time: invalid duration " + orig)
+			return 0, InvalidDuration{Duration: orig}
 		}
 	}
 

tests/cel_test.go

@@ -173,7 +173,7 @@ func TestExtensions(t *testing.T) {
 }
 func TestStrings(t *testing.T) {
 	tests := []Test{
-		// {nil, "random.String(10, ['a','b','d'])", ""},
+		{nil, `random.AlphaNum(10).size()`, "10"},
 		{nil, "'abcdedf'.runeCount()", "7"},
 		{map[string]interface{}{"hello": "world"}, "hello", "world"},
 		{map[string]interface{}{"hello": "hello world ?"}, "urlencode(hello)", `hello+world+%3F`},