fix: string and k8s function return types

Author: moshloop

funcs/strings_gen.go

@@ -11,7 +11,6 @@ func Library() []cel.EnvOption {
 		k8sGetHealth(),
 		k8sGetStatus(),
 		k8sIsHealthy2(),
-		k8sHealth(),
 		k8sCPUAsMillicores(),
 		k8sMemoryAsBytes(),
 	}

kubernetes/cel_export.go

@@ -104,22 +104,9 @@ func GetHealth(in interface{}) HealthStatus {
 	}
 }
 
-func k8sHealth() cel.EnvOption {
-	return cel.Function("k8s.health",
-		cel.Overload("k8s.health_any",
-			[]*cel.Type{cel.AnyType},
-			cel.AnyType,
-			cel.UnaryBinding(func(obj ref.Val) ref.Val {
-				jsonObj, _ := conv.AnyToMapStringAny(GetHealth(obj.Value()))
-				return types.NewDynamicMap(types.DefaultTypeAdapter, jsonObj)
-			}),
-		),
-	)
-}
-
 func k8sGetHealth() cel.EnvOption {
-	return cel.Function("GetHealth",
-		cel.Overload("GetHealth_any",
+	return cel.Function("k8s.getHealth",
+		cel.Overload("k8s.getHealth",
 			[]*cel.Type{cel.AnyType},
 			cel.AnyType,
 			cel.UnaryBinding(func(obj ref.Val) ref.Val {
@@ -131,8 +118,8 @@ func k8sGetHealth() cel.EnvOption {
 }
 
 func k8sGetStatus() cel.EnvOption {
-	return cel.Function("GetStatus",
-		cel.Overload("GetStatus",
+	return cel.Function("k8s.getStatus",
+		cel.Overload("k8s.getStatus",
 			[]*cel.Type{cel.AnyType},
 			cel.AnyType,
 			cel.UnaryBinding(func(obj ref.Val) ref.Val {
@@ -143,10 +130,10 @@ func k8sGetStatus() cel.EnvOption {
 }
 
 func k8sIsHealthy() cel.EnvOption {
-	return cel.Function("k8s.is_healthy",
-		cel.Overload("k8s.is_healthy_any",
+	return cel.Function("k8s.isHealthy",
+		cel.Overload("k8s.isHealthy_any",
 			[]*cel.Type{cel.AnyType},
-			cel.StringType,
+			cel.BoolType,
 			cel.UnaryBinding(func(obj ref.Val) ref.Val {
 				return types.Bool(GetHealth(obj.Value()).OK)
 			}),
@@ -158,7 +145,7 @@ func k8sIsHealthy2() cel.EnvOption {
 	return cel.Function("IsHealthy",
 		cel.Overload("IsHealthy_interface{}",
 			[]*cel.Type{cel.AnyType},
-			cel.StringType,
+			cel.BoolType,
 			cel.UnaryBinding(func(obj ref.Val) ref.Val {
 				return types.Bool(GetHealth(obj.Value()).OK)
 			}),

kubernetes/health.go

@@ -1,5 +1,7 @@
 package kubernetes
 
+import "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
 var TestHealthy = `
 apiVersion: v1
 kind: Service
@@ -29,6 +31,7 @@ status:
     - hostname: abc123.us-west-2.elb.amazonaws.com
 `
 
+var TesthealthyUnstructured = GetUnstructured(TestHealthy)
 var TestProgressing = `
 apiVersion: v1
 kind: Service
@@ -52,6 +55,8 @@ status:
   loadBalancer: {}
 `
 
+var TestProgressingUnstructured = GetUnstructured(TestProgressing)
+
 var TestUnhealthy = `
 apiVersion: v1
 kind: Pod
@@ -141,6 +146,8 @@ status:
   startTime: 2018-12-02T09:19:36Z
 `
 
+var TestUnhealthyUnstructured = GetUnstructured(TestUnhealthy)
+
 var TestLuaStatus = `
 apiVersion: argoproj.io/v1alpha1
 kind: ApplicationSet
@@ -173,3 +180,9 @@ status:
       status: "True"
       type: ErrorOccurred
 `
+
+var TestLuaStatusUnstructured = GetUnstructured(TestLuaStatus)
+
+var TestUnstructuredList = []unstructured.Unstructured{
+	*TesthealthyUnstructured, *TestProgressingUnstructured, *TestUnhealthyUnstructured, *TestLuaStatusUnstructured,
+}

kubernetes/testdata.go

@@ -207,6 +207,7 @@ func TestExtensions(t *testing.T) {
 		{nil, `"hello, world".replace("world", "team")`, "hello, team"},   // strings lib
 		{nil, `sets.contains([1, 2, 3, 4], [2, 3])`, "true"},              // sets lib
 		{nil, `[1,2,3,4].slice(1, 3)`, "[2 3]"},                           // lists lib
+		{nil, `"this is a string: %s\nand an integer: %d".format(["str", 42])`, "this is a string: str\nand an integer: 42"},
 	})
 }
 func TestStrings(t *testing.T) {
@@ -226,14 +227,15 @@ func TestStrings(t *testing.T) {
 
 		// {map[string]interface{}{"s": []string{"a", "b", "b", "a"}}, "Uniq(s)", "[a b]"},
 		{map[string]interface{}{"s": "hello world"}, "s.title()", "Hello World"},
+		{map[string]interface{}{"s": "hello world"}, "s.abbrev(4)", "h..."},
 		{map[string]interface{}{"s": "hello world"}, "s.camelCase()", "helloWorld"},
 		{map[string]interface{}{"s": "hello world"}, "s.kebabCase()", "hello-world"},
 		{map[string]interface{}{"s": "hello world"}, "s.snakeCase()", "hello_world"},
 		{map[string]interface{}{"s": "hel\"lo world"}, "s.quote()", "\"hel\\\"lo world\""},
 		{map[string]interface{}{"s": "hello world"}, "s.squote()", "'hello world'"},
 		{map[string]interface{}{"s": "hello world"}, "s.shellQuote()", "'hello world'"},
 		{map[string]interface{}{"s": "hello world"}, "s.slug()", "hello-world"},
-		// {map[string]interface{}{"s": "hello world"}, "s.runeCount()", "Hello World"},
+		{map[string]interface{}{"s": "hello world"}, "s.indent(4, '-')", "----hello world"},
 		{nil, "uuid.IsValid(uuid.V1())", "true"},
 		{nil, "uuid.IsValid(uuid.V4())", "true"},
 	}
@@ -343,6 +345,8 @@ func TestCelK8s(t *testing.T) {
 	}{
 
 		{Input: `k8s.is_healthy(healthy_obj)`, Output: true},
+		{Input: `dyn(obj_list).all(i, k8s.is_healthy(i))`, Output: false},
+		{Input: `dyn(unstructured_list).all(i, k8s.is_healthy(i))`, Output: false},
 		{Input: `k8s.is_healthy(unhealthy_obj)`, Output: false},
 		{Input: `k8s.health(healthy_obj).status`, Output: "Healthy"},
 		{Input: `k8s.health(unhealthy_obj).message`, Output: "Back-off 40s restarting failed container=main pod=my-pod_argocd(63674389-f613-11e8-a057-fe5f49266390)"},
@@ -351,8 +355,10 @@ func TestCelK8s(t *testing.T) {
 	}
 
 	environment := map[string]any{
-		"healthy_obj":   kubernetes.TestHealthy,
-		"unhealthy_obj": kubernetes.TestUnhealthy,
+		"healthy_obj":       kubernetes.TestHealthy,
+		"unhealthy_obj":     kubernetes.TestUnhealthy,
+		"obj_list":          []string{kubernetes.TestHealthy, kubernetes.TestUnhealthy},
+		"unstructured_list": kubernetes.TestUnstructuredList,
 	}
 	for i, td := range testData {
 		executeTemplate(t, i, td.Input, td.Output, environment)