Merge branch 'master' into feat/math-functions

BUILD.bazel

@@ -33,6 +33,7 @@ go_library(
         "//internal/parser:go_default_library",
         "//internal/program:go_default_library",
         "@io_k8s_sigs_yaml//:go_default_library",
+        "@org_golang_x_crypto//sha3:go_default_library",
     ],
 )
 

MODULE.bazel

@@ -0,0 +1,14 @@
+module(name = "jsonnet_go", version = "0.0.0")
+
+bazel_dep(name = "gazelle", version = "0.30.0", repo_name = "bazel_gazelle")
+bazel_dep(name = "jsonnet", version = "0.20.0", repo_name = "cpp_jsonnet")
+bazel_dep(name = "rules_go", version = "0.39.1", repo_name = "io_bazel_rules_go")
+
+go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
+go_deps.from_file(go_mod = "@jsonnet_go//:go.mod")
+use_repo(
+    go_deps,
+    "com_github_fatih_color",
+    "com_github_sergi_go_diff",
+    "io_k8s_sigs_yaml",
+)

ast/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library")
+load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
     name = "go_default_library",
@@ -13,3 +13,9 @@ go_library(
     importpath = "github.com/google/go-jsonnet/ast",
     visibility = ["//visibility:public"],
 )
+
+go_test(
+    name = "go_default_test",
+    srcs = ["util_test.go"],
+    embed = [":go_default_library"],
+)

bazel/deps.bzl

@@ -21,10 +21,10 @@ def jsonnet_go_dependencies(go_sdk_version = "host"):
     )
     go_repository(
         name = "com_github_fatih_color",
+        build_external = "external",
         importpath = "github.com/fatih/color",
         sum = "h1:mRhaKNwANqRgUBGKmnI5ZxEk7QXmjQeCcuYFMX2bfcc=",
         version = "v1.12.0",
-        build_external = "external",
     )
 
     go_repository(
@@ -47,17 +47,17 @@ def jsonnet_go_dependencies(go_sdk_version = "host"):
     )
     go_repository(
         name = "com_github_mattn_go_colorable",
+        build_external = "external",
         importpath = "github.com/mattn/go-colorable",
         sum = "h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=",
         version = "v0.1.8",
-        build_external = "external",
     )
     go_repository(
         name = "com_github_mattn_go_isatty",
+        build_external = "external",
         importpath = "github.com/mattn/go-isatty",
         sum = "h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=",
         version = "v0.0.12",
-        build_external = "external",
     )
     go_repository(
         name = "com_github_pmezard_go_difflib",
@@ -101,9 +101,34 @@ def jsonnet_go_dependencies(go_sdk_version = "host"):
         sum = "h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=",
         version = "v1.1.0",
     )
+    go_repository(
+        name = "org_golang_x_crypto",
+        importpath = "golang.org/x/crypto",
+        sum = "h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=",
+        version = "v0.9.0",
+    )
+    go_repository(
+        name = "org_golang_x_net",
+        importpath = "golang.org/x/net",
+        sum = "h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=",
+        version = "v0.10.0",
+    )
+
     go_repository(
         name = "org_golang_x_sys",
         importpath = "golang.org/x/sys",
-        sum = "h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=",
-        version = "v0.1.0",
+        sum = "h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=",
+        version = "v0.8.0",
+    )
+    go_repository(
+        name = "org_golang_x_term",
+        importpath = "golang.org/x/term",
+        sum = "h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols=",
+        version = "v0.8.0",
+    )
+    go_repository(
+        name = "org_golang_x_text",
+        importpath = "golang.org/x/text",
+        sum = "h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=",
+        version = "v0.9.0",
     )

builtins.go

@@ -19,6 +19,9 @@ package jsonnet
 import (
 	"bytes"
 	"crypto/md5"
+	"crypto/sha1"
+	"crypto/sha256"
+	"crypto/sha512"
 	"encoding/base64"
 	"encoding/hex"
 	"encoding/json"
@@ -31,6 +34,7 @@ import (
 	"strings"
 
 	"github.com/google/go-jsonnet/ast"
+	"golang.org/x/crypto/sha3"
 )
 
 func builtinPlus(i *interpreter, x, y value) (value, error) {
@@ -916,6 +920,42 @@ func builtinMd5(i *interpreter, x value) (value, error) {
 	return makeValueString(hex.EncodeToString(hash[:])), nil
 }
 
+func builtinSha1(i *interpreter, x value) (value, error) {
+	str, err := i.getString(x)
+	if err != nil {
+		return nil, err
+	}
+	hash := sha1.Sum([]byte(str.getGoString()))
+	return makeValueString(hex.EncodeToString(hash[:])), nil
+}
+
+func builtinSha256(i *interpreter, x value) (value, error) {
+	str, err := i.getString(x)
+	if err != nil {
+		return nil, err
+	}
+	hash := sha256.Sum256([]byte(str.getGoString()))
+	return makeValueString(hex.EncodeToString(hash[:])), nil
+}
+
+func builtinSha512(i *interpreter, x value) (value, error) {
+	str, err := i.getString(x)
+	if err != nil {
+		return nil, err
+	}
+	hash := sha512.Sum512([]byte(str.getGoString()))
+	return makeValueString(hex.EncodeToString(hash[:])), nil
+}
+
+func builtinSha3(i *interpreter, x value) (value, error) {
+	str, err := i.getString(x)
+	if err != nil {
+		return nil, err
+	}
+	hash := sha3.Sum512([]byte(str.getGoString()))
+	return makeValueString(hex.EncodeToString(hash[:])), nil
+}
+
 func builtinBase64(i *interpreter, input value) (value, error) {
 	var byteArr []byte
 
@@ -1327,6 +1367,15 @@ func builtinEqualsIgnoreCase(i *interpreter, sv1, sv2 value) (value, error) {
 	return makeValueBoolean(strings.EqualFold(s1.getGoString(), s2.getGoString())), nil
 }
 
+func builtinTrim(i *interpreter, strv value) (value, error) {
+	str, err := i.getString(strv)
+	if err != nil {
+		return nil, err
+	}
+	sStr := str.getGoString()
+	return makeValueString(strings.TrimSpace(sStr)), nil
+}
+
 func base64DecodeGoBytes(i *interpreter, str string) ([]byte, error) {
 	strLen := len(str)
 	if strLen%4 != 0 {
@@ -2043,6 +2092,30 @@ func builtinSum(i *interpreter, arrv value) (value, error) {
 	return makeValueNumber(sum), nil
 }
 
+func builtinAvg(i *interpreter, arrv value) (value, error) {
+	arr, err := i.getArray(arrv)
+	if err != nil {
+		return nil, err
+	}
+
+	len := float64(arr.length())
+	if len == 0 {
+		return nil, i.Error("Cannot calculate average of an empty array.")
+	}
+
+	sumValue, err := builtinSum(i, arrv)
+	if err != nil {
+		return nil, err
+	}
+	sum, err := i.getNumber(sumValue)
+	if err != nil {
+		return nil, err
+	}
+
+	avg := sum.value/len
+	return makeValueNumber(avg), nil
+}
+
 func builtinContains(i *interpreter, arrv value, ev value) (value, error) {
 	arr, err := i.getArray(arrv)
 	if err != nil {
@@ -2427,6 +2500,10 @@ var funcBuiltins = buildBuiltinMap([]builtin{
 	&binaryBuiltin{name: "pow", function: builtinPow, params: ast.Identifiers{"x", "n"}},
 	&binaryBuiltin{name: "modulo", function: builtinModulo, params: ast.Identifiers{"x", "y"}},
 	&unaryBuiltin{name: "md5", function: builtinMd5, params: ast.Identifiers{"s"}},
+	&unaryBuiltin{name: "sha1", function: builtinSha1, params: ast.Identifiers{"s"}},
+	&unaryBuiltin{name: "sha256", function: builtinSha256, params: ast.Identifiers{"s"}},
+	&unaryBuiltin{name: "sha512", function: builtinSha512, params: ast.Identifiers{"s"}},
+	&unaryBuiltin{name: "sha3", function: builtinSha3, params: ast.Identifiers{"s"}},
 	&binaryBuiltin{name: "xnor", function: builtinXnor, params: ast.Identifiers{"x", "y"}},
 	&binaryBuiltin{name: "xor", function: builtinXor, params: ast.Identifiers{"x", "y"}},
 	&binaryBuiltin{name: "lstripChars", function: builtinLstripChars, params: ast.Identifiers{"str", "chars"}},
@@ -2437,6 +2514,7 @@ var funcBuiltins = buildBuiltinMap([]builtin{
 	&ternaryBuiltin{name: "strReplace", function: builtinStrReplace, params: ast.Identifiers{"str", "from", "to"}},
 	&unaryBuiltin{name: "isEmpty", function: builtinIsEmpty, params: ast.Identifiers{"str"}},
 	&binaryBuiltin{name: "equalsIgnoreCase", function: builtinEqualsIgnoreCase, params: ast.Identifiers{"str1", "str2"}},
+	&unaryBuiltin{name: "trim", function: builtinTrim, params: ast.Identifiers{"str"}},
 	&unaryBuiltin{name: "base64Decode", function: builtinBase64Decode, params: ast.Identifiers{"str"}},
 	&unaryBuiltin{name: "base64DecodeBytes", function: builtinBase64DecodeBytes, params: ast.Identifiers{"str"}},
 	&unaryBuiltin{name: "parseInt", function: builtinParseInt, params: ast.Identifiers{"str"}},
@@ -2454,6 +2532,7 @@ var funcBuiltins = buildBuiltinMap([]builtin{
 	&generalBuiltin{name: "maxArray", function: builtinMaxArray, params: []generalBuiltinParameter{{name: "arr"}, {name: "keyF", defaultValue: functionID}}},
 	&unaryBuiltin{name: "native", function: builtinNative, params: ast.Identifiers{"x"}},
 	&unaryBuiltin{name: "sum", function: builtinSum, params: ast.Identifiers{"arr"}},
+	&unaryBuiltin{name: "avg", function: builtinAvg, params: ast.Identifiers{"arr"}},
 	&binaryBuiltin{name: "contains", function: builtinContains, params: ast.Identifiers{"arr", "elem"}},
 
 	// internal

c-bindings/BUILD.bazel

@@ -22,7 +22,7 @@ go_library(
     ],
     cgo = True,
     copts = ["-Wall -Icpp-jsonnet/include"],  # keep
-    cxxopts = ["-std=c++11"],
+    cxxopts = ["-std=c++11 -Wall -Icpp-jsonnet/include"],
     importpath = "github.com/google/go-jsonnet/c-bindings",
     visibility = ["//visibility:private"],
     deps = [

cmd/wasm/BUILD.bazel

@@ -2,15 +2,16 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 go_library(
     name = "go_default_library",
-    srcs = [
-        "main.go",
-    ],
+    srcs = ["main.go"],
     importpath = "github.com/google/go-jsonnet/cmd/wasm",
     visibility = ["//visibility:private"],
-    deps = [
-        "//:go_default_library",
-        "//internal/formatter:go_default_library",
-    ],
+    deps = select({
+        "@io_bazel_rules_go//go/platform:js_wasm": [
+            "//:go_default_library",
+            "//internal/formatter:go_default_library",
+        ],
+        "//conditions:default": [],
+    }),
 )
 
 go_binary(

go.mod

@@ -11,6 +11,7 @@ require (
 require (
 	github.com/mattn/go-colorable v0.1.8 // indirect
 	github.com/mattn/go-isatty v0.0.12 // indirect
-	golang.org/x/sys v0.1.0 // indirect
+	golang.org/x/crypto v0.9.0 // indirect
+	golang.org/x/sys v0.8.0 // indirect
 	gopkg.in/yaml.v2 v2.2.7 // indirect
 )

go.sum

@@ -19,10 +19,14 @@ github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNX
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
+golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

linter/internal/types/stdlib.go

@@ -95,6 +95,7 @@ func prepareStdlib(g *typeGraph) {
 		"format":           g.newSimpleFuncType(stringType, "str", "vals"),
 		"isEmpty":          g.newSimpleFuncType(boolType, "str"),
 		"equalsIgnoreCase": g.newSimpleFuncType(boolType, "str1", "str2"),
+		"trim":             g.newSimpleFuncType(stringType, "str"),
 		// TODO(sbarzowski) Fix when they match the documentation
 		"escapeStringBash":    g.newSimpleFuncType(stringType, "str_"),
 		"escapeStringDollars": g.newSimpleFuncType(stringType, "str_"),
@@ -148,11 +149,11 @@ func prepareStdlib(g *typeGraph) {
 		"minArray":      g.newFuncType(anyArrayType, []ast.Parameter{required("arr"), optional("keyF")}),
 		"maxArray":      g.newFuncType(anyArrayType, []ast.Parameter{required("arr"), optional("keyF")}),
 		"contains":      g.newSimpleFuncType(boolType, "arr", "elem"),
-		// TODO these need test cases written by someone who understands how to make them
-		"all":      g.newSimpleFuncType(boolArrayType, "arr"),
-		"any":      g.newSimpleFuncType(boolArrayType, "arr"),
-		"remove":   g.newSimpleFuncType(anyArrayType, "arr", "elem"),
-		"removeAt": g.newSimpleFuncType(anyArrayType, "arr", "i"),
+		"avg":		    	 g.newSimpleFuncType(numberType, "arr"),	
+		"all":           g.newSimpleFuncType(boolArrayType, "arr"),
+		"any":           g.newSimpleFuncType(boolArrayType, "arr"),
+		"remove":        g.newSimpleFuncType(anyArrayType, "arr", "elem"),
+		"removeAt":      g.newSimpleFuncType(anyArrayType, "arr", "i"),
 
 		// Sets
 
@@ -172,6 +173,10 @@ func prepareStdlib(g *typeGraph) {
 		"base64DecodeBytes": g.newSimpleFuncType(numberType, "str"),
 		"base64Decode":      g.newSimpleFuncType(stringType, "str"),
 		"md5":               g.newSimpleFuncType(stringType, "s"),
+		"sha1":              g.newSimpleFuncType(stringType, "s"),
+		"sha256":            g.newSimpleFuncType(stringType, "s"),
+		"sha512":            g.newSimpleFuncType(stringType, "s"),
+		"sha3":              g.newSimpleFuncType(stringType, "s"),
 
 		// JSON Merge Patch
 

testdata/builtinAvg.golden

@@ -0,0 +1 @@
+2

testdata/builtinAvg.jsonnet

@@ -0,0 +1 @@
+std.avg([1,2,3])

testdata/builtinSha1.golden

@@ -0,0 +1 @@
+"0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33"

testdata/builtinSha1.jsonnet

@@ -0,0 +1 @@
+std.sha1("foo")

testdata/builtinSha256.golden

@@ -0,0 +1 @@
+"2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae"

testdata/builtinSha256.jsonnet

@@ -0,0 +1 @@
+std.sha256("foo")

testdata/builtinSha3.golden

@@ -0,0 +1 @@
+"4bca2b137edc580fe50a88983ef860ebaca36c857b1f492839d6d7392452a63c82cbebc68e3b70a2a1480b4bb5d437a7cba6ecf9d89f9ff3ccd14cd6146ea7e7"

testdata/builtinSha3.jsonnet

@@ -0,0 +1 @@
+std.sha3("foo")

testdata/builtinSha512.golden

@@ -0,0 +1 @@
+"f7fbba6e0636f890e56fbbf3283e524c6fa3204ae298382d624741d0dc6638326e282c41be5e4254d8820772c5518a2c5a8c0c7f7eda19594a7eb539453e1ed7"

testdata/builtinSha512.jsonnet

@@ -0,0 +1 @@
+std.sha512("foo")

testdata/builtinTrim.golden

@@ -0,0 +1 @@
+"already trimmed string"

testdata/builtinTrim.jsonnet

@@ -0,0 +1 @@
+std.trim("already trimmed string")

testdata/builtinTrim1.golden

@@ -0,0 +1 @@
+"string with spaces on both ends"

testdata/builtinTrim1.jsonnet

@@ -0,0 +1 @@
+std.trim("    string with spaces on both ends     ")

testdata/builtinTrim2.golden

@@ -0,0 +1 @@
+"string with newline character at end"

testdata/builtinTrim2.jsonnet

@@ -0,0 +1 @@
+std.trim("string with newline character at end\n")

testdata/builtinTrim3.golden

@@ -0,0 +1 @@
+"string with tabs at end"

testdata/builtinTrim3.jsonnet

@@ -0,0 +1 @@
+std.trim("string with tabs at end\t\t")

testdata/builtinTrim4.golden

@@ -0,0 +1,10 @@
+RUNTIME ERROR: Unexpected type number, expected string
+-------------------------------------------------
+	testdata/builtinTrim4:1:1-13	$
+
+std.trim(10)
+
+-------------------------------------------------
+	During evaluation	
+
+

testdata/builtinTrim4.jsonnet

@@ -0,0 +1 @@
+std.trim(10)