any

util/sprig/dict.go

@@ -1,29 +1,29 @@
 package sprig
 
-func get(d map[string]interface{}, key string) interface{} {
+func get(d map[string]any, key string) any {
 	if val, ok := d[key]; ok {
 		return val
 	}
 	return ""
 }
 
-func set(d map[string]interface{}, key string, value interface{}) map[string]interface{} {
+func set(d map[string]any, key string, value any) map[string]any {
 	d[key] = value
 	return d
 }
 
-func unset(d map[string]interface{}, key string) map[string]interface{} {
+func unset(d map[string]any, key string) map[string]any {
 	delete(d, key)
 	return d
 }
 
-func hasKey(d map[string]interface{}, key string) bool {
+func hasKey(d map[string]any, key string) bool {
 	_, ok := d[key]
 	return ok
 }
 
-func pluck(key string, d ...map[string]interface{}) []interface{} {
-	res := []interface{}{}
+func pluck(key string, d ...map[string]any) []any {
+	var res []any
 	for _, dict := range d {
 		if val, ok := dict[key]; ok {
 			res = append(res, val)
@@ -32,7 +32,7 @@ func pluck(key string, d ...map[string]interface{}) []interface{} {
 	return res
 }
 
-func keys(dicts ...map[string]interface{}) []string {
+func keys(dicts ...map[string]any) []string {
 	k := []string{}
 	for _, dict := range dicts {
 		for key := range dict {
@@ -42,8 +42,8 @@ func keys(dicts ...map[string]interface{}) []string {
 	return k
 }
 
-func pick(dict map[string]interface{}, keys ...string) map[string]interface{} {
-	res := map[string]interface{}{}
+func pick(dict map[string]any, keys ...string) map[string]any {
+	res := map[string]any{}
 	for _, k := range keys {
 		if v, ok := dict[k]; ok {
 			res[k] = v
@@ -52,8 +52,8 @@ func pick(dict map[string]interface{}, keys ...string) map[string]interface{} {
 	return res
 }
 
-func omit(dict map[string]interface{}, keys ...string) map[string]interface{} {
-	res := map[string]interface{}{}
+func omit(dict map[string]any, keys ...string) map[string]any {
+	res := map[string]any{}
 
 	omit := make(map[string]bool, len(keys))
 	for _, k := range keys {
@@ -68,8 +68,8 @@ func omit(dict map[string]interface{}, keys ...string) map[string]interface{} {
 	return res
 }
 
-func dict(v ...interface{}) map[string]interface{} {
-	dict := map[string]interface{}{}
+func dict(v ...any) map[string]any {
+	dict := map[string]any{}
 	lenv := len(v)
 	for i := 0; i < lenv; i += 2 {
 		key := strval(v[i])
@@ -82,20 +82,19 @@ func dict(v ...interface{}) map[string]interface{} {
 	return dict
 }
 
-func values(dict map[string]interface{}) []interface{} {
-	values := []interface{}{}
+func values(dict map[string]any) []any {
+	var values []any
 	for _, value := range dict {
 		values = append(values, value)
 	}
-
 	return values
 }
 
-func dig(ps ...interface{}) (interface{}, error) {
+func dig(ps ...any) (any, error) {
 	if len(ps) < 3 {
 		panic("dig needs at least three arguments")
 	}
-	dict := ps[len(ps)-1].(map[string]interface{})
+	dict := ps[len(ps)-1].(map[string]any)
 	def := ps[len(ps)-2]
 	ks := make([]string, len(ps)-2)
 	for i := 0; i < len(ks); i++ {
@@ -105,7 +104,7 @@ func dig(ps ...interface{}) (interface{}, error) {
 	return digFromDict(dict, def, ks)
 }
 
-func digFromDict(dict map[string]interface{}, d interface{}, ks []string) (interface{}, error) {
+func digFromDict(dict map[string]any, d any, ks []string) (any, error) {
 	k, ns := ks[0], ks[1:]
 	step, has := dict[k]
 	if !has {
@@ -114,5 +113,5 @@ func digFromDict(dict map[string]interface{}, d interface{}, ks []string) (inter
 	if len(ns) == 0 {
 		return step, nil
 	}
-	return digFromDict(step.(map[string]interface{}), d, ns)
+	return digFromDict(step.(map[string]any), d, ns)
 }