New Upstream Release - golang-github-vulcand-predicate
Ready changes
Summary
Merged new upstream version: 1.2.0 (was: 1.1.0).
Resulting package
Built on 2022-09-08T07:52 (took 5m15s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-releases golang-github-vulcand-predicate-dev
Lintian Result
Diff
diff --git a/.github/workflows/go-cross.yml b/.github/workflows/go-cross.yml
new file mode 100644
index 0000000..c70bd87
--- /dev/null
+++ b/.github/workflows/go-cross.yml
@@ -0,0 +1,43 @@
+name: Go Matrix
+on: [push, pull_request]
+
+jobs:
+
+ cross:
+ name: Go
+ runs-on: ${{ matrix.os }}
+ env:
+ CGO_ENABLED: 0
+
+ strategy:
+ matrix:
+ go-version: [ 1.16, 1.17, 1.x ]
+ os: [ubuntu-latest, macos-latest, windows-latest]
+
+ steps:
+ # https://github.com/marketplace/actions/setup-go-environment
+ - name: Set up Go ${{ matrix.go-version }}
+ uses: actions/setup-go@v2
+ with:
+ go-version: ${{ matrix.go-version }}
+
+ # https://github.com/marketplace/actions/checkout
+ - name: Checkout code
+ uses: actions/checkout@v2
+
+ # https://github.com/marketplace/actions/cache
+ - name: Cache Go modules
+ uses: actions/cache@v2
+ with:
+ path: |
+ ~/go/pkg/mod # Module download cache
+ ~/.cache/go-build # Build cache (Linux)
+ ~/Library/Caches/go-build # Build cache (Mac)
+ '%LocalAppData%\go-build' # Build cache (Windows)
+ key: ${{ runner.os }}-${{ matrix.go-version }}-go-${{ hashFiles('**/go.sum') }}
+ restore-keys: |
+ ${{ runner.os }}-${{ matrix.go-version }}-go-
+
+ - name: Test
+ run: go test -v -cover ./...
+
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..f37c7de
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,55 @@
+name: Main
+
+on:
+ push:
+ branches:
+ - master
+ tags:
+ - v*
+ pull_request:
+
+jobs:
+
+ main:
+ name: Main Process
+ runs-on: ubuntu-latest
+ env:
+ GO_VERSION: 1.17
+ GOLANGCI_LINT_VERSION: v1.43.0
+ CGO_ENABLED: 0
+
+ steps:
+
+ # https://github.com/marketplace/actions/setup-go-environment
+ - name: Set up Go ${{ env.GO_VERSION }}
+ uses: actions/setup-go@v2
+ with:
+ go-version: ${{ env.GO_VERSION }}
+
+ # https://github.com/marketplace/actions/checkout
+ - name: Check out code
+ uses: actions/checkout@v2
+ with:
+ fetch-depth: 0
+
+ # https://github.com/marketplace/actions/cache
+ - name: Cache Go modules
+ uses: actions/cache@v2
+ with:
+ path: ~/go/pkg/mod
+ key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+ restore-keys: |
+ ${{ runner.os }}-go-
+
+ - name: Check and get dependencies
+ run: |
+ go mod tidy
+ git diff --exit-code go.mod
+ git diff --exit-code go.sum
+
+ # https://golangci-lint.run/usage/install#other-ci
+ - name: Install golangci-lint ${{ env.GOLANGCI_LINT_VERSION }}
+ run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin ${GOLANGCI_LINT_VERSION}
+
+ - name: Make
+ run: make
diff --git a/.golangci.yml b/.golangci.yml
new file mode 100644
index 0000000..5338db1
--- /dev/null
+++ b/.golangci.yml
@@ -0,0 +1,59 @@
+run:
+ deadline: 5m
+ skip-files: []
+
+linters-settings:
+ govet:
+ check-shadowing: true
+ gocyclo:
+ min-complexity: 20
+ goconst:
+ min-len: 5
+ min-occurrences: 3
+ misspell:
+ locale: US
+ funlen:
+ lines: -1
+ statements: 50
+
+linters:
+ enable-all: true
+ disable:
+ - golint # deprecated
+ - maligned # deprecated
+ - interfacer # deprecated
+ - scopelint # deprecated
+ - sqlclosecheck # not relevant (SQL)
+ - rowserrcheck # not relevant (SQL)
+ - cyclop # duplicate of gocyclo
+ - lll
+ - dupl
+ - wsl
+ - nlreturn
+ - gomnd
+ - goerr113
+ - wrapcheck
+ - exhaustive
+ - exhaustivestruct
+ - testpackage
+ - tparallel
+ - paralleltest
+ - prealloc
+ - ifshort
+ - forcetypeassert
+ - varnamelen
+ - nilnil
+ - ireturn
+
+issues:
+ exclude-use-default: false
+ max-per-linter: 0
+ max-same-issues: 0
+ exclude:
+ - "Error return value of .((os\\.)?std(out|err)\\..*|.*Close|.*Flush|os\\.Remove(All)?|.*printf?|os\\.(Un)?Setenv). is not checked"
+ - "exported (type|method|function) (.+) should have comment or be unexported"
+ exclude-rules:
+ - path: (.+)_test.go
+ linters:
+ - funlen
+ - goconst
diff --git a/Makefile b/Makefile
index 824d89a..8342ed9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,12 @@
+.PHONY: check test
-test: clean
- go test -v ./... -cover
+default: check test
-clean:
- find . -name flymake_* -delete
+test:
+ go test -v ./... -cover
-cover: clean
- go test -v . -coverprofile=/tmp/coverage.out
- go tool cover -html=/tmp/coverage.out
+check:
+ golangci-lint run
sloccount:
find . -name "*.go" -print0 | xargs -0 wc -l
diff --git a/README.md b/README.md
index 736f1c6..a7e58ef 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
-Predicate
-=========
+# Predicate
Predicate package used to create interpreted mini languages with Go syntax - mostly to define
various predicates for configuration, e.g.
@@ -11,6 +10,14 @@ Latency() > 40 || ErrorRate() > 0.5.
Here's an example of fully functional predicate language to deal with division remainders:
```go
+package main
+
+import (
+ "log"
+
+ "github.com/vulcand/predicate"
+)
+
// takes number and returns true or false
type numberPredicate func(v int) bool
@@ -33,9 +40,9 @@ func numberAND(a, b numberPredicate) numberPredicate {
func main(){
// Create a new parser and define the supported operators and methods
- p, err := NewParser(Def{
- Operators: Operators{
- AND: numberAND,
+ p, err := predicate.NewParser(predicate.Def{
+ Operators: predicate.Operators{
+ AND: numberAND,
},
Functions: map[string]interface{}{
"DivisibleBy": divisibleBy,
@@ -44,8 +51,9 @@ func main(){
pr, err := p.Parse("DivisibleBy(2) && DivisibleBy(3)")
if err == nil {
- fmt.Fatalf("Error: %v", err)
+ log.Fatalf("Error: %v", err)
}
+
pr.(numberPredicate)(2) // false
pr.(numberPredicate)(3) // false
pr.(numberPredicate)(6) // true
diff --git a/builder/builder.go b/builder/builder.go
index 1486739..b451f24 100644
--- a/builder/builder.go
+++ b/builder/builder.go
@@ -15,7 +15,7 @@ limitations under the License.
*/
-// package builder is used to construct predicate
+// Package builder is used to construct predicate
// expressions using builder functions.
package builder
@@ -25,39 +25,39 @@ import (
)
// Expr is an expression builder,
-// used to create expressions in rules definitions
+// used to create expressions in rules definitions.
type Expr interface {
// String serializes expression into format parsed by rules engine
// (golang based syntax)
String() string
}
-// IdentiferExpr is identifer expression
+// IdentifierExpr is identifier expression.
type IdentifierExpr string
-// String serializes identifer expression into format parsed by rules engine
+// String serializes identifier expression into format parsed by rules engine.
func (i IdentifierExpr) String() string {
return string(i)
}
-// Identifer returns identifier expression
+// Identifier returns identifier expression.
func Identifier(v string) IdentifierExpr {
return IdentifierExpr(v)
}
-// String returns string expression
+// String returns string expression.
func String(v string) StringExpr {
return StringExpr(v)
}
-// StringExpr is a string expression
+// StringExpr is a string expression.
type StringExpr string
func (s StringExpr) String() string {
return fmt.Sprintf("%q", string(s))
}
-// StringsExpr is a slice of strings
+// StringsExpr is a slice of strings.
type StringsExpr []string
func (s StringsExpr) String() string {
@@ -68,14 +68,14 @@ func (s StringsExpr) String() string {
return strings.Join(out, ",")
}
-// Equals returns equals expression
+// Equals returns equals expression.
func Equals(left, right Expr) EqualsExpr {
return EqualsExpr{Left: left, Right: right}
}
// EqualsExpr constructs function expression used in rules specifications
// that checks if one value is equal to another
-// e.g. equals("a", "b") where Left is "a" and right is "b"
+// e.g. equals("a", "b") where Left is "a" and right is "b".
type EqualsExpr struct {
// Left is a left argument of Equals expression
Left Expr
@@ -83,37 +83,37 @@ type EqualsExpr struct {
Right Expr
}
-// String returns function call expression used in rules
+// String returns function call expression used in rules.
func (i EqualsExpr) String() string {
return fmt.Sprintf("equals(%v, %v)", i.Left, i.Right)
}
-// Not returns ! expression
+// Not returns ! expression.
func Not(expr Expr) NotExpr {
return NotExpr{Expr: expr}
}
// NotExpr constructs function expression used in rules specifications
// that negates the result of the boolean predicate
-// e.g. ! equals"a", "b") where Left is "a" and right is "b"
+// e.g. ! equals"a", "b") where Left is "a" and right is "b".
type NotExpr struct {
// Expr is an expression to negate
Expr Expr
}
-// String returns function call expression used in rules
+// String returns function call expression used in rules.
func (n NotExpr) String() string {
return fmt.Sprintf("!%v", n.Expr)
}
-// Contains returns contains function call expression
+// Contains returns contains function call expression.
func Contains(a, b Expr) ContainsExpr {
return ContainsExpr{Left: a, Right: b}
}
// ContainsExpr constructs function expression used in rules specifications
// that checks if one value contains the other, e.g.
-// contains([]string{"a"}, "b") where left is []string{"a"} and right is "b"
+// contains([]string{"a"}, "b") where left is []string{"a"} and right is "b".
type ContainsExpr struct {
// Left is a left argument of Contains expression
Left Expr
@@ -121,12 +121,12 @@ type ContainsExpr struct {
Right Expr
}
-// String rturns function call expression used in rules
+// String returns function call expression used in rules.
func (i ContainsExpr) String() string {
return fmt.Sprintf("contains(%v, %v)", i.Left, i.Right)
}
-// And returns && expression
+// And returns && expression.
func And(left, right Expr) AndExpr {
return AndExpr{
Left: left,
@@ -134,7 +134,7 @@ func And(left, right Expr) AndExpr {
}
}
-// AndExpr returns && expression
+// AndExpr returns && expression.
type AndExpr struct {
// Left is a left argument of && operator expression
Left Expr
@@ -142,12 +142,12 @@ type AndExpr struct {
Right Expr
}
-// String returns expression text used in rules
+// String returns expression text used in rules.
func (a AndExpr) String() string {
return fmt.Sprintf("%v && %v", a.Left, a.Right)
}
-// Or returns || expression
+// Or returns || expression.
func Or(left, right Expr) OrExpr {
return OrExpr{
Left: left,
@@ -155,7 +155,7 @@ func Or(left, right Expr) OrExpr {
}
}
-// OrExpr returns || expression
+// OrExpr returns || expression.
type OrExpr struct {
// Left is a left argument of || operator expression
Left Expr
@@ -163,7 +163,7 @@ type OrExpr struct {
Right Expr
}
-// String returns expression text used in rules
+// String returns expression text used in rules.
func (a OrExpr) String() string {
return fmt.Sprintf("%v || %v", a.Left, a.Right)
}
diff --git a/debian/changelog b/debian/changelog
index 2f5ab14..769b8c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+golang-github-vulcand-predicate (1.2.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Thu, 08 Sep 2022 07:47:41 -0000
+
golang-github-vulcand-predicate (1.1.0-2) unstable; urgency=medium
* Source only upload.
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..12fbcc4
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,8 @@
+module github.com/vulcand/predicate
+
+go 1.16
+
+require (
+ github.com/gravitational/trace v1.1.16-0.20220114165159-14a9a7dd6aaf
+ github.com/stretchr/testify v1.7.0
+)
diff --git a/go.sum b/go.sum
new file mode 100644
index 0000000..3d82798
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,73 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/gravitational/trace v1.1.16-0.20220114165159-14a9a7dd6aaf h1:C1GPyPJrOlJlIrcaBBiBpDsqZena2Ks8spa5xZqr1XQ=
+github.com/gravitational/trace v1.1.16-0.20220114165159-14a9a7dd6aaf/go.mod h1:zXqxTI6jXDdKnlf8s+nT+3c8LrwUEy3yNpO4XJL90lA=
+github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ=
+github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
+github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 h1:pLI5jrR7OSLijeIDcmRxNmw2api+jEfxLoykJVice/E=
+golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20201031054903-ff519b6c9102 h1:42cLlJJdEh+ySyeUUbEQ5bsTiq8voBeTuweGVkY6Puw=
+golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/lib.go b/lib.go
index c313c1b..e9c412f 100644
--- a/lib.go
+++ b/lib.go
@@ -26,7 +26,7 @@ import (
// GetStringMapValue is a helper function that returns property
// from map[string]string or map[string][]string
// the function returns empty value in case if key not found
-// In case if map is nil, returns empty value as well
+// In case if map is nil, returns empty value as well.
func GetStringMapValue(mapVal, keyVal interface{}) (interface{}, error) {
key, ok := keyVal.(string)
if !ok {
@@ -51,11 +51,11 @@ func GetStringMapValue(mapVal, keyVal interface{}) (interface{}, error) {
}
// BoolPredicate is a function without arguments that returns
-// boolean value when called
+// boolean value when called.
type BoolPredicate func() bool
// Equals can compare complex objects, e.g. arrays of strings
-// and strings together
+// and strings together.
func Equals(a interface{}, b interface{}) BoolPredicate {
return func() bool {
switch aval := a.(type) {
@@ -83,7 +83,7 @@ func Equals(a interface{}, b interface{}) BoolPredicate {
}
// Contains checks if string slice contains a string
-// Contains([]string{"a", "b"}, "b") -> true
+// Contains([]string{"a", "b"}, "b") -> true.
func Contains(a interface{}, b interface{}) BoolPredicate {
return func() bool {
aval, ok := a.([]string)
@@ -104,7 +104,7 @@ func Contains(a interface{}, b interface{}) BoolPredicate {
}
// And is a boolean predicate that calls two boolean predicates
-// and returns result of && operation on their return values
+// and returns result of && operation on their return values.
func And(a, b BoolPredicate) BoolPredicate {
return func() bool {
return a() && b()
@@ -112,7 +112,7 @@ func And(a, b BoolPredicate) BoolPredicate {
}
// Or is a boolean predicate that calls two boolean predicates
-// and returns result of || operation on their return values
+// and returns result of || operation on their return values.
func Or(a, b BoolPredicate) BoolPredicate {
return func() bool {
return a() || b()
@@ -120,22 +120,24 @@ func Or(a, b BoolPredicate) BoolPredicate {
}
// Not is a boolean predicate that calls a boolean predicate
-// and returns negated result
+// and returns negated result.
func Not(a BoolPredicate) BoolPredicate {
return func() bool {
return !a()
}
}
-// GetFieldByTag returns a field from the object based on the tag
+// GetFieldByTag returns a field from the object based on the tag.
func GetFieldByTag(ival interface{}, tagName string, fieldNames []string) (interface{}, error) {
if len(fieldNames) == 0 {
return nil, trace.BadParameter("missing field names")
}
+
val := reflect.ValueOf(ival)
if val.Kind() == reflect.Interface || val.Kind() == reflect.Ptr {
val = val.Elem()
}
+
if val.Kind() != reflect.Struct {
return nil, trace.NotFound("field name %v is not found", strings.Join(fieldNames, "."))
}
@@ -145,14 +147,17 @@ func GetFieldByTag(ival interface{}, tagName string, fieldNames []string) (inter
valType := val.Type()
for i := 0; i < valType.NumField(); i++ {
tagValue := valType.Field(i).Tag.Get(tagName)
+
parts := strings.Split(tagValue, ",")
if parts[0] == fieldName {
value := val.Field(i).Interface()
if len(rest) == 0 {
return value, nil
}
+
return GetFieldByTag(value, tagName, rest)
}
}
+
return nil, trace.NotFound("field name %v is not found", strings.Join(fieldNames, "."))
}
diff --git a/parse.go b/parse.go
index b80e736..f478531 100644
--- a/parse.go
+++ b/parse.go
@@ -25,52 +25,44 @@ func (p *predicateParser) Parse(in string) (interface{}, error) {
if err != nil {
return nil, err
}
- return p.parseNode(expr)
+
+ return p.parse(expr)
}
-func (p *predicateParser) parseNode(node ast.Node) (interface{}, error) {
- switch n := node.(type) {
- case *ast.BasicLit:
- return literalToValue(n)
+func (p *predicateParser) parse(expr ast.Expr) (interface{}, error) {
+ switch n := expr.(type) {
case *ast.BinaryExpr:
- x, err := p.parseNode(n.X)
+ x, err := p.parse(n.X)
if err != nil {
return nil, err
}
- y, err := p.parseNode(n.Y)
+
+ y, err := p.parse(n.Y)
if err != nil {
return nil, err
}
+
return p.joinPredicates(n.Op, x, y)
- case *ast.CallExpr:
- // We expect function that will return predicate
- name, err := getIdentifier(n.Fun)
- if err != nil {
- return nil, err
- }
- fn, err := p.getFunction(name)
- if err != nil {
- return nil, err
- }
- arguments, err := p.evaluateArguments(n.Args)
- if err != nil {
- return nil, err
- }
- return callFunction(fn, arguments)
+
case *ast.ParenExpr:
- return p.parseNode(n.X)
+ return p.parse(n.X)
+
case *ast.UnaryExpr:
joinFn, err := p.getJoinFunction(n.Op)
if err != nil {
return nil, err
}
- node, err := p.parseNode(n.X)
+
+ node, err := p.parse(n.X)
if err != nil {
return nil, err
}
+
return callFunction(joinFn, []interface{}{node})
+
+ default:
+ return p.evaluateExpr(n)
}
- return nil, trace.BadParameter("unsupported %T", node)
}
func (p *predicateParser) evaluateArguments(nodes []ast.Expr) ([]interface{}, error) {
@@ -92,75 +84,93 @@ func (p *predicateParser) evaluateExpr(n ast.Expr) (interface{}, error) {
if err != nil {
return nil, err
}
+
return val, nil
+
case *ast.IndexExpr:
if p.d.GetProperty == nil {
return nil, trace.NotFound("properties are not supported")
}
+
mapVal, err := p.evaluateExpr(l.X)
if err != nil {
return nil, trace.Wrap(err)
}
+
keyVal, err := p.evaluateExpr(l.Index)
if err != nil {
return nil, trace.Wrap(err)
}
+
val, err := p.d.GetProperty(mapVal, keyVal)
if err != nil {
return nil, trace.Wrap(err)
}
+
return val, nil
+
case *ast.SelectorExpr:
fields, err := evaluateSelector(l, []string{})
if err != nil {
return nil, trace.Wrap(err)
}
+
if p.d.GetIdentifier == nil {
return nil, trace.NotFound("%v is not defined", strings.Join(fields, "."))
}
+
val, err := p.d.GetIdentifier(fields)
if err != nil {
return nil, trace.Wrap(err)
}
return val, nil
+
case *ast.Ident:
if p.d.GetIdentifier == nil {
return nil, trace.NotFound("%v is not defined", l.Name)
}
+
val, err := p.d.GetIdentifier([]string{l.Name})
if err != nil {
return nil, trace.Wrap(err)
}
return val, nil
+
case *ast.CallExpr:
name, err := getIdentifier(l.Fun)
if err != nil {
return nil, err
}
+
fn, err := p.getFunction(name)
if err != nil {
return nil, err
}
+
arguments, err := p.evaluateArguments(l.Args)
if err != nil {
return nil, err
}
+
return callFunction(fn, arguments)
+
default:
return nil, trace.BadParameter("%T is not supported", n)
}
}
// evaluateSelector recursively evaluates the selector field and returns a list
-// of properties at the end
+// of properties at the end.
func evaluateSelector(sel *ast.SelectorExpr, fields []string) ([]string, error) {
fields = append([]string{sel.Sel.Name}, fields...)
switch l := sel.X.(type) {
case *ast.SelectorExpr:
return evaluateSelector(l, fields)
+
case *ast.Ident:
fields = append([]string{l.Name}, fields...)
return fields, nil
+
default:
return nil, trace.BadParameter("unsupported selector type: %T", l)
}
@@ -179,6 +189,7 @@ func (p *predicateParser) joinPredicates(op token.Token, a, b interface{}) (inte
if err != nil {
return nil, err
}
+
return callFunction(joinFn, []interface{}{a, b})
}
@@ -213,8 +224,8 @@ func (p *predicateParser) getJoinFunction(op token.Token) (interface{}, error) {
func getIdentifier(node ast.Node) (string, error) {
sexpr, ok := node.(*ast.SelectorExpr)
if ok {
- id, ok := sexpr.X.(*ast.Ident)
- if !ok {
+ id, okIdent := sexpr.X.(*ast.Ident)
+ if !okIdent {
return "", trace.BadParameter("expected selector identifier, got: %T", sexpr.X)
}
return fmt.Sprintf("%s.%s", id.Name, sexpr.Sel.Name), nil
@@ -235,12 +246,14 @@ func literalToValue(a *ast.BasicLit) (interface{}, error) {
return nil, trace.BadParameter("failed to parse argument: %s, error: %s", a.Value, err)
}
return value, nil
+
case token.INT:
value, err := strconv.Atoi(a.Value)
if err != nil {
return nil, trace.BadParameter("failed to parse argument: %s, error: %s", a.Value, err)
}
return value, nil
+
case token.STRING:
value, err := strconv.Unquote(a.Value)
if err != nil {
@@ -248,6 +261,7 @@ func literalToValue(a *ast.BasicLit) (interface{}, error) {
}
return value, nil
}
+
return nil, trace.BadParameter("unsupported function argument type: '%v'", a.Kind)
}
@@ -257,16 +271,19 @@ func callFunction(f interface{}, args []interface{}) (v interface{}, err error)
err = trace.BadParameter("%s", r)
}
}()
+
arguments := make([]reflect.Value, len(args))
for i, a := range args {
arguments[i] = reflect.ValueOf(a)
}
+
fn := reflect.ValueOf(f)
ret := fn.Call(arguments)
switch len(ret) {
case 1:
return ret[0].Interface(), nil
+
case 2:
v, e := ret[0].Interface(), ret[1].Interface()
if e == nil {
@@ -277,6 +294,8 @@ func callFunction(f interface{}, args []interface{}) (v interface{}, err error)
return nil, trace.BadParameter("expected error as a second return value, got %T", e)
}
return v, err
+
+ default:
+ return nil, trace.BadParameter("expected at least one return argument for '%v'", fn)
}
- return nil, trace.BadParameter("expected at least one return argument for '%v'", fn)
}
diff --git a/parse_test.go b/parse_test.go
index dd11b81..f9ee559 100644
--- a/parse_test.go
+++ b/parse_test.go
@@ -5,21 +5,22 @@ import (
"testing"
"github.com/gravitational/trace"
- "gopkg.in/check.v1"
+ "github.com/stretchr/testify/suite"
)
-func Test(t *testing.T) { check.TestingT(t) }
+func Test(t *testing.T) {
+ suite.Run(t, new(PredicateSuite))
+}
type PredicateSuite struct {
+ suite.Suite
}
-var _ = check.Suite(&PredicateSuite{})
-
-func (s *PredicateSuite) getParser(c *check.C) Parser {
- return s.getParserWithOpts(c, nil, nil)
+func (s *PredicateSuite) getParser() Parser {
+ return s.getParserWithOpts(nil, nil)
}
-func (s *PredicateSuite) getParserWithOpts(c *check.C, getID GetIdentifierFn, getProperty GetPropertyFn) Parser {
+func (s *PredicateSuite) getParserWithOpts(getID GetIdentifierFn, getProperty GetPropertyFn) Parser {
p, err := NewParser(Def{
Operators: Operators{
AND: numberAND,
@@ -49,226 +50,269 @@ func (s *PredicateSuite) getParserWithOpts(c *check.C, getID GetIdentifierFn, ge
GetIdentifier: getID,
GetProperty: getProperty,
})
- c.Assert(err, check.IsNil)
- c.Assert(p, check.NotNil)
+
+ s.NoError(err)
+ s.NotNil(p)
+
return p
}
-func (s *PredicateSuite) TestSinglePredicate(c *check.C) {
- p := s.getParser(c)
+func (s *PredicateSuite) TestSinglePredicate() {
+ p := s.getParser()
pr, err := p.Parse("DivisibleBy(2)")
- c.Assert(err, check.IsNil)
- c.Assert(pr, check.FitsTypeOf, divisibleBy(2))
+ s.NoError(err)
+
+ s.IsType(divisibleBy(2), pr)
+
fn := pr.(numberPredicate)
- c.Assert(fn(2), check.Equals, true)
- c.Assert(fn(3), check.Equals, false)
+ s.True(fn(2))
+ s.False(fn(3))
}
-func (s *PredicateSuite) TestSinglePredicateNot(c *check.C) {
- p := s.getParser(c)
+func (s *PredicateSuite) TestSinglePredicateNot() {
+ p := s.getParser()
pr, err := p.Parse("!DivisibleBy(2)")
- c.Assert(err, check.IsNil)
- c.Assert(pr, check.FitsTypeOf, divisibleBy(2))
+ s.NoError(err)
+
+ s.IsType(divisibleBy(2), pr)
+
fn := pr.(numberPredicate)
- c.Assert(fn(2), check.Equals, false)
- c.Assert(fn(3), check.Equals, true)
+ s.False(fn(2))
+ s.True(fn(3))
}
-func (s *PredicateSuite) TestSinglePredicateWithFunc(c *check.C) {
- p := s.getParser(c)
+func (s *PredicateSuite) TestSinglePredicateWithFunc() {
+ p := s.getParser()
pr, err := p.Parse("DivisibleBy(fnreturn(2))")
- c.Assert(err, check.IsNil)
- c.Assert(pr, check.FitsTypeOf, divisibleBy(2))
+ s.NoError(err)
+
+ s.IsType(divisibleBy(2), pr)
+
fn := pr.(numberPredicate)
- c.Assert(fn(2), check.Equals, true)
- c.Assert(fn(3), check.Equals, false)
+ s.True(fn(2))
+ s.False(fn(3))
}
-func (s *PredicateSuite) TestSinglePredicateWithFuncErr(c *check.C) {
- p := s.getParser(c)
+func (s *PredicateSuite) TestSinglePredicateWithFuncErr() {
+ p := s.getParser()
_, err := p.Parse("DivisibleBy(fnerr(2))")
- c.Assert(err, check.NotNil)
+ s.Error(err)
}
-func (s *PredicateSuite) TestModulePredicate(c *check.C) {
- p := s.getParser(c)
+func (s *PredicateSuite) TestModulePredicate() {
+ p := s.getParser()
pr, err := p.Parse("number.DivisibleBy(2)")
- c.Assert(err, check.IsNil)
- c.Assert(pr, check.FitsTypeOf, divisibleBy(2))
+ s.NoError(err)
+
+ s.IsType(divisibleBy(2), pr)
+
fn := pr.(numberPredicate)
- c.Assert(fn(2), check.Equals, true)
- c.Assert(fn(3), check.Equals, false)
+ s.True(fn(2))
+ s.False(fn(3))
}
-func (s *PredicateSuite) TestJoinAND(c *check.C) {
- p := s.getParser(c)
+func (s *PredicateSuite) TestJoinAND() {
+ p := s.getParser()
pr, err := p.Parse("DivisibleBy(2) && DivisibleBy(3)")
- c.Assert(err, check.IsNil)
- c.Assert(pr, check.FitsTypeOf, divisibleBy(1))
+ s.NoError(err)
+
+ s.IsType(divisibleBy(1), pr)
+
fn := pr.(numberPredicate)
- c.Assert(fn(2), check.Equals, false)
- c.Assert(fn(3), check.Equals, false)
- c.Assert(fn(6), check.Equals, true)
+ s.False(fn(2))
+ s.False(fn(3))
+ s.True(fn(6))
}
-func (s *PredicateSuite) TestJoinOR(c *check.C) {
- p := s.getParser(c)
+func (s *PredicateSuite) TestJoinOR() {
+ p := s.getParser()
pr, err := p.Parse("DivisibleBy(2) || DivisibleBy(3)")
- c.Assert(err, check.IsNil)
- c.Assert(pr, check.FitsTypeOf, divisibleBy(1))
+ s.NoError(err)
+
+ s.IsType(divisibleBy(1), pr)
+
fn := pr.(numberPredicate)
- c.Assert(fn(2), check.Equals, true)
- c.Assert(fn(3), check.Equals, true)
- c.Assert(fn(5), check.Equals, false)
+ s.True(fn(2))
+ s.True(fn(3))
+ s.False(fn(5))
}
-func (s *PredicateSuite) TestGT(c *check.C) {
- p := s.getParser(c)
+func (s *PredicateSuite) TestGT() {
+ p := s.getParser()
pr, err := p.Parse("Remainder(3) > 1")
- c.Assert(err, check.IsNil)
- c.Assert(pr, check.FitsTypeOf, divisibleBy(1))
+ s.NoError(err)
+
+ s.IsType(divisibleBy(1), pr)
+
fn := pr.(numberPredicate)
- c.Assert(fn(1), check.Equals, false)
- c.Assert(fn(2), check.Equals, true)
- c.Assert(fn(3), check.Equals, false)
- c.Assert(fn(4), check.Equals, false)
- c.Assert(fn(5), check.Equals, true)
+ s.False(fn(1))
+ s.True(fn(2))
+ s.False(fn(3))
+ s.False(fn(4))
+ s.True(fn(5))
}
-func (s *PredicateSuite) TestGTE(c *check.C) {
- p := s.getParser(c)
+func (s *PredicateSuite) TestGTE() {
+ p := s.getParser()
pr, err := p.Parse("Remainder(3) >= 1")
- c.Assert(err, check.IsNil)
- c.Assert(pr, check.FitsTypeOf, divisibleBy(1))
+ s.NoError(err)
+
+ s.IsType(divisibleBy(1), pr)
+
fn := pr.(numberPredicate)
- c.Assert(fn(1), check.Equals, true)
- c.Assert(fn(2), check.Equals, true)
- c.Assert(fn(3), check.Equals, false)
- c.Assert(fn(4), check.Equals, true)
- c.Assert(fn(5), check.Equals, true)
+ s.True(fn(1))
+ s.True(fn(2))
+ s.False(fn(3))
+ s.True(fn(4))
+ s.True(fn(5))
}
-func (s *PredicateSuite) TestLT(c *check.C) {
- p := s.getParser(c)
+func (s *PredicateSuite) TestLT() {
+ p := s.getParser()
pr, err := p.Parse("Remainder(3) < 2")
- c.Assert(err, check.IsNil)
- c.Assert(pr, check.FitsTypeOf, divisibleBy(1))
+ s.NoError(err)
+
+ s.IsType(divisibleBy(1), pr)
+
fn := pr.(numberPredicate)
- c.Assert(fn(1), check.Equals, true)
- c.Assert(fn(2), check.Equals, false)
- c.Assert(fn(3), check.Equals, true)
- c.Assert(fn(4), check.Equals, true)
- c.Assert(fn(5), check.Equals, false)
+ s.True(fn(1))
+ s.False(fn(2))
+ s.True(fn(3))
+ s.True(fn(4))
+ s.False(fn(5))
}
-func (s *PredicateSuite) TestLE(c *check.C) {
- p := s.getParser(c)
+func (s *PredicateSuite) TestLE() {
+ p := s.getParser()
pr, err := p.Parse("Remainder(3) <= 2")
- c.Assert(err, check.IsNil)
- c.Assert(pr, check.FitsTypeOf, divisibleBy(1))
+ s.NoError(err)
+ s.IsType(divisibleBy(1), pr)
fn := pr.(numberPredicate)
- c.Assert(fn(1), check.Equals, true)
- c.Assert(fn(2), check.Equals, true)
- c.Assert(fn(3), check.Equals, true)
- c.Assert(fn(4), check.Equals, true)
- c.Assert(fn(5), check.Equals, true)
+ s.True(fn(1))
+ s.True(fn(2))
+ s.True(fn(3))
+ s.True(fn(4))
+ s.True(fn(5))
}
-func (s *PredicateSuite) TestEQ(c *check.C) {
- p := s.getParser(c)
+func (s *PredicateSuite) TestEQ() {
+ p := s.getParser()
pr, err := p.Parse("Remainder(3) == 2")
- c.Assert(err, check.IsNil)
- c.Assert(pr, check.FitsTypeOf, divisibleBy(1))
+ s.NoError(err)
+
+ s.IsType(divisibleBy(1), pr)
+
fn := pr.(numberPredicate)
- c.Assert(fn(1), check.Equals, false)
- c.Assert(fn(2), check.Equals, true)
- c.Assert(fn(3), check.Equals, false)
- c.Assert(fn(4), check.Equals, false)
- c.Assert(fn(5), check.Equals, true)
+ s.False(fn(1))
+ s.True(fn(2))
+ s.False(fn(3))
+ s.False(fn(4))
+ s.True(fn(5))
}
-func (s *PredicateSuite) TestNEQ(c *check.C) {
- p := s.getParser(c)
+func (s *PredicateSuite) TestNEQ() {
+ p := s.getParser()
pr, err := p.Parse("Remainder(3) != 2")
- c.Assert(err, check.IsNil)
- c.Assert(pr, check.FitsTypeOf, divisibleBy(1))
+ s.NoError(err)
+
+ s.IsType(divisibleBy(1), pr)
+
fn := pr.(numberPredicate)
- c.Assert(fn(1), check.Equals, true)
- c.Assert(fn(2), check.Equals, false)
- c.Assert(fn(3), check.Equals, true)
- c.Assert(fn(4), check.Equals, true)
- c.Assert(fn(5), check.Equals, false)
+ s.True(fn(1))
+ s.False(fn(2))
+ s.True(fn(3))
+ s.True(fn(4))
+ s.False(fn(5))
}
-func (s *PredicateSuite) TestParen(c *check.C) {
- p := s.getParser(c)
+func (s *PredicateSuite) TestParen() {
+ p := s.getParser()
pr, err := p.Parse("(Remainder(3) != 1) && (Remainder(3) != 0)")
- c.Assert(err, check.IsNil)
- c.Assert(pr, check.FitsTypeOf, divisibleBy(1))
+ s.NoError(err)
+
+ s.IsType(divisibleBy(1), pr)
+
fn := pr.(numberPredicate)
- c.Assert(fn(0), check.Equals, false)
- c.Assert(fn(1), check.Equals, false)
- c.Assert(fn(2), check.Equals, true)
+ s.False(fn(0))
+ s.False(fn(1))
+ s.True(fn(2))
}
-func (s *PredicateSuite) TestStrings(c *check.C) {
- p := s.getParser(c)
+func (s *PredicateSuite) TestStrings() {
+ p := s.getParser()
pr, err := p.Parse(`Remainder(3) == Len("hi")`)
- c.Assert(err, check.IsNil)
- c.Assert(pr, check.FitsTypeOf, divisibleBy(1))
+ s.NoError(err)
+
+ s.IsType(divisibleBy(1), pr)
+
fn := pr.(numberPredicate)
- c.Assert(fn(0), check.Equals, false)
- c.Assert(fn(1), check.Equals, false)
- c.Assert(fn(2), check.Equals, true)
+ s.False(fn(0))
+ s.False(fn(1))
+ s.True(fn(2))
}
-func (s *PredicateSuite) TestGTFloat64(c *check.C) {
- p := s.getParser(c)
+func (s *PredicateSuite) TestGTFloat64() {
+ p := s.getParser()
pr, err := p.Parse("Remainder(3) > 1.2")
- c.Assert(err, check.IsNil)
- c.Assert(pr, check.FitsTypeOf, divisibleBy(1))
+ s.NoError(err)
+
+ s.IsType(divisibleBy(1), pr)
+
fn := pr.(numberPredicate)
- c.Assert(fn(1), check.Equals, false)
- c.Assert(fn(2), check.Equals, true)
- c.Assert(fn(3), check.Equals, false)
- c.Assert(fn(4), check.Equals, false)
- c.Assert(fn(5), check.Equals, true)
+ s.False(fn(1))
+ s.True(fn(2))
+ s.False(fn(3))
+ s.False(fn(4))
+ s.True(fn(5))
}
-func (s *PredicateSuite) TestIdentifier(c *check.C) {
+func (s *PredicateSuite) TestSelectExpr() {
getID := func(fields []string) (interface{}, error) {
- c.Assert(fields, check.DeepEquals, []string{"first", "second", "third"})
+ s.Equal([]string{"first", "second", "third"}, fields)
return 2, nil
}
- p := s.getParserWithOpts(c, getID, nil)
+ p := s.getParserWithOpts(getID, nil)
+
+ // Test selector expression.
+ pr, err := p.Parse("Remainder(4) <= first.second.third")
+ s.NoError(err)
+
+ s.IsType(divisibleBy(2), pr)
- pr, err := p.Parse("DivisibleBy(first.second.third)")
- c.Assert(err, check.IsNil)
- c.Assert(pr, check.FitsTypeOf, divisibleBy(2))
fn := pr.(numberPredicate)
- c.Assert(fn(2), check.Equals, true)
- c.Assert(fn(3), check.Equals, false)
+ s.True(fn(2))
+ s.False(fn(3))
+
+ // Test selector expression inside call expression.
+ pr, err = p.Parse("DivisibleBy(first.second.third)")
+ s.NoError(err)
+
+ s.IsType(divisibleBy(2), pr)
+
+ fn = pr.(numberPredicate)
+ s.True(fn(2))
+ s.False(fn(3))
}
-func (s *PredicateSuite) TestMap(c *check.C) {
+func (s *PredicateSuite) TestIndexExpr() {
getID := func(fields []string) (interface{}, error) {
- c.Assert(fields, check.DeepEquals, []string{"first", "second"})
+ s.Equal([]string{"first", "second"}, fields)
return map[string]int{"key": 2}, nil
}
getProperty := func(mapVal, keyVal interface{}) (interface{}, error) {
@@ -277,17 +321,30 @@ func (s *PredicateSuite) TestMap(c *check.C) {
return m[k], nil
}
- p := s.getParserWithOpts(c, getID, getProperty)
+ p := s.getParserWithOpts(getID, getProperty)
+
+ // Test index expression.
+ pr, err := p.Parse(`Remainder(4) <= first.second["key"]`)
+ s.NoError(err)
+
+ s.IsType(divisibleBy(2), pr)
- pr, err := p.Parse(`DivisibleBy(first.second["key"])`)
- c.Assert(err, check.IsNil)
- c.Assert(pr, check.FitsTypeOf, divisibleBy(2))
fn := pr.(numberPredicate)
- c.Assert(fn(2), check.Equals, true)
- c.Assert(fn(3), check.Equals, false)
+ s.True(fn(2))
+ s.False(fn(3))
+
+ // Test index expression inside call expression.
+ pr, err = p.Parse(`DivisibleBy(first.second["key"])`)
+ s.NoError(err)
+
+ s.IsType(divisibleBy(2), pr)
+
+ fn = pr.(numberPredicate)
+ s.True(fn(2))
+ s.False(fn(3))
}
-func (s *PredicateSuite) TestIdentifierAndFunction(c *check.C) {
+func (s *PredicateSuite) TestIdentifierExpr() {
getID := func(fields []string) (interface{}, error) {
switch fields[0] {
case "firstSlice":
@@ -298,76 +355,85 @@ func (s *PredicateSuite) TestIdentifierAndFunction(c *check.C) {
return "a", nil
case "b":
return "b", nil
+ case "num":
+ return 2, nil
}
return nil, nil
}
- p := s.getParserWithOpts(c, getID, nil)
+ p := s.getParserWithOpts(getID, nil)
pr, err := p.Parse("Equals(firstSlice, firstSlice)")
- c.Assert(err, check.IsNil)
+ s.NoError(err)
fn := pr.(BoolPredicate)
- c.Assert(fn(), check.Equals, true)
+ s.True(fn())
pr, err = p.Parse("Equals(a, a)")
- c.Assert(err, check.IsNil)
+ s.NoError(err)
fn = pr.(BoolPredicate)
- c.Assert(fn(), check.Equals, true)
+ s.True(fn())
pr, err = p.Parse("Equals(firstSlice, secondSlice)")
- c.Assert(err, check.IsNil)
+ s.NoError(err)
+
fn = pr.(BoolPredicate)
- c.Assert(fn(), check.Equals, false)
+ s.False(fn())
+
+ pr, err = p.Parse("Remainder(4) <= num")
+ s.NoError(err)
+ fn2 := pr.(numberPredicate)
+ s.True(fn2(2))
+ s.False(fn2(3))
}
-func (s *PredicateSuite) TestContains(c *check.C) {
+func (s *PredicateSuite) TestContains() {
val := TestStruct{}
- val.Param.Key1 = map[string][]string{"key": []string{"a", "b", "c"}}
+ val.Param.Key1 = map[string][]string{"key": {"a", "b", "c"}}
getID := func(fields []string) (interface{}, error) {
return GetFieldByTag(val, "json", fields[1:])
}
- p := s.getParserWithOpts(c, getID, GetStringMapValue)
+ p := s.getParserWithOpts(getID, GetStringMapValue)
pr, err := p.Parse(`Contains(val.param.key1["key"], "a")`)
- c.Assert(err, check.IsNil)
- c.Assert(pr.(BoolPredicate)(), check.Equals, true)
+ s.NoError(err)
+ s.True(pr.(BoolPredicate)())
pr, err = p.Parse(`Contains(val.param.key1["key"], "z")`)
- c.Assert(err, check.IsNil)
- c.Assert(pr.(BoolPredicate)(), check.Equals, false)
+ s.NoError(err)
+ s.False(pr.(BoolPredicate)())
pr, err = p.Parse(`Contains(val.param.key1["missing"], "a")`)
- c.Assert(err, check.IsNil)
- c.Assert(pr.(BoolPredicate)(), check.Equals, false)
+ s.NoError(err)
+ s.False(pr.(BoolPredicate)())
}
-func (s *PredicateSuite) TestEquals(c *check.C) {
+func (s *PredicateSuite) TestEquals() {
val := TestStruct{}
val.Param.Key2 = map[string]string{"key": "a"}
getID := func(fields []string) (interface{}, error) {
return GetFieldByTag(val, "json", fields[1:])
}
- p := s.getParserWithOpts(c, getID, GetStringMapValue)
+ p := s.getParserWithOpts(getID, GetStringMapValue)
pr, err := p.Parse(`Equals(val.param.key2["key"], "a")`)
- c.Assert(err, check.IsNil)
- c.Assert(pr.(BoolPredicate)(), check.Equals, true)
+ s.NoError(err)
+ s.True(pr.(BoolPredicate)())
pr, err = p.Parse(`Equals(val.param.key2["key"], "b")`)
- c.Assert(err, check.IsNil)
- c.Assert(pr.(BoolPredicate)(), check.Equals, false)
+ s.NoError(err)
+ s.False(pr.(BoolPredicate)())
pr, err = p.Parse(`Contains(val.param.key2["missing"], "z")`)
- c.Assert(err, check.IsNil)
- c.Assert(pr.(BoolPredicate)(), check.Equals, false)
+ s.NoError(err)
+ s.False(pr.(BoolPredicate)())
pr, err = p.Parse(`Contains(val.param.key1["missing"], "z")`)
- c.Assert(err, check.IsNil)
- c.Assert(pr.(BoolPredicate)(), check.Equals, false)
+ s.NoError(err)
+ s.False(pr.(BoolPredicate)())
}
-// TestStruct is a test sturcture with json tags
+// TestStruct is a test structure with json tags.
type TestStruct struct {
Param struct {
Key1 map[string][]string `json:"key1,omitempty"`
@@ -375,9 +441,9 @@ type TestStruct struct {
} `json:"param,omitempty"`
}
-func (s *PredicateSuite) TestGetTagField(c *check.C) {
+func (s *PredicateSuite) TestGetTagField() {
val := TestStruct{}
- val.Param.Key1 = map[string][]string{"key": []string{"val"}}
+ val.Param.Key1 = map[string][]string{"key": {"val"}}
type testCase struct {
tag string
@@ -398,18 +464,19 @@ func (s *PredicateSuite) TestGetTagField(c *check.C) {
}
for i, tc := range testCases {
- comment := check.Commentf("test case %v", i)
+ comment := fmt.Sprintf("test case %d", i)
+
out, err := GetFieldByTag(tc.val, tc.tag, tc.fields)
if tc.err != nil {
- c.Assert(err, check.FitsTypeOf, tc.err, comment)
+ s.IsType(tc.err, err)
} else {
- c.Assert(err, check.IsNil, comment)
- c.Assert(out, check.DeepEquals, tc.expect, comment)
+ s.NoError(err, comment)
+ s.Equal(tc.expect, out, comment)
}
}
}
-func (s *PredicateSuite) TestUnhappyCases(c *check.C) {
+func (s *PredicateSuite) TestUnhappyCases() {
cases := []string{
")(", // invalid expression
"SomeFunc", // unsupported id
@@ -423,16 +490,18 @@ func (s *PredicateSuite) TestUnhappyCases(c *check.C) {
"Remainder(3) >> 3", // unsupported operator
`Remainder(3) > "banana"`, // unsupported comparison type
}
- p := s.getParser(c)
+ p := s.getParser()
for _, expr := range cases {
pr, err := p.Parse(expr)
- c.Assert(err, check.NotNil)
- c.Assert(pr, check.IsNil)
+ s.Error(err)
+ s.Nil(pr)
}
}
-type numberPredicate func(v int) bool
-type numberMapper func(v int) int
+type (
+ numberPredicate func(v int) bool
+ numberMapper func(v int) int
+)
func divisibleBy(divisor int) numberPredicate {
return func(v int) bool {
diff --git a/predicate.go b/predicate.go
index c5aacb4..c41337a 100644
--- a/predicate.go
+++ b/predicate.go
@@ -16,7 +16,7 @@ limitations under the License.
*/
/*
-Predicate package used to create interpreted mini languages with Go syntax - mostly to define
+Package predicate used to create interpreted mini languages with Go syntax - mostly to define
various predicates for configuration, e.g. Latency() > 40 || ErrorRate() > 0.5.
Here's an example of fully functional predicate language to deal with division remainders:
@@ -74,10 +74,10 @@ type Def struct {
// GetIdentifierFn function returns identifier based on selector
// e.g. id.field.subfield will be passed as.
-// GetIdentifierFn([]string{"id", "field", "subfield"})
+// GetIdentifierFn([]string{"id", "field", "subfield"}).
type GetIdentifierFn func(selector []string) (interface{}, error)
-// GetPropertyFn reuturns property from a mapVal by key keyVal
+// GetPropertyFn returns property from a mapVal by key keyVal.
type GetPropertyFn func(mapVal, keyVal interface{}) (interface{}, error)
// Operators contain functions for equality and logical comparison.
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/share/gocode/src/github.com/vulcand/predicate/go.mod -rw-r--r-- root/root /usr/share/gocode/src/github.com/vulcand/predicate/go.sum
No differences were encountered in the control files