Resolve go.mod issue with direct dependency on planetscale/tengo

Signed-off-by: Shlomi Noach <[email protected]>
dkua · Jun 24, 2021 · c2cfb0e · c2cfb0e
1 parent d2dbb6e
commit c2cfb0e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/go.mod b/go.mod
@@ -72,14 +72,14 @@ require (
 	github.com/pires/go-proxyproto v0.0.0-20191211124218-517ecdf5bb2b
 	github.com/pkg/errors v0.9.1
 	github.com/planetscale/pargzip v0.0.0-20201116224723-90c7fc03ea8a
+	github.com/planetscale/tengo v0.9.6-ps.v4
 	github.com/planetscale/vtprotobuf v0.0.0-20210521163914-5a02622d1e2a
 	github.com/prometheus/client_golang v1.11.0
 	github.com/prometheus/common v0.26.0
 	github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0
 	github.com/samuel/go-zookeeper v0.0.0-20200724154423-2164a8ac840e
 	github.com/satori/go.uuid v1.2.0 // indirect
 	github.com/sjmudd/stopwatch v0.0.0-20170613150411-f380bf8a9be1
-	github.com/skeema/tengo v0.0.0-00010101000000-000000000000
 	github.com/soheilhy/cmux v0.1.4
 	github.com/spf13/cobra v1.1.1
 	github.com/spf13/pflag v1.0.5
@@ -123,6 +123,4 @@ require (
 	sigs.k8s.io/yaml v1.2.0
 )
 
-replace github.com/skeema/tengo => github.com/planetscale/tengo v0.9.6-ps.v3
-
 replace google.golang.org/grpc => google.golang.org/grpc v1.37.0
diff --git a/go.sum b/go.sum
@@ -704,8 +704,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/planetscale/pargzip v0.0.0-20201116224723-90c7fc03ea8a h1:y0OpQ4+5tKxeh9+H+2cVgASl9yMZYV9CILinKOiKafA=
 github.com/planetscale/pargzip v0.0.0-20201116224723-90c7fc03ea8a/go.mod h1:GJFUzQuXIoB2Kjn1ZfDhJr/42D5nWOqRcIQVgCxTuIE=
-github.com/planetscale/tengo v0.9.6-ps.v3 h1:cWMH1CovRAUyQnnvhAyYJqaNvzcoHOpEwN2VBmWjwV8=
-github.com/planetscale/tengo v0.9.6-ps.v3/go.mod h1:nbQ0n1EK3lP00xvBmEPO05bPDCPZiDFnU1YlAN8JoC8=
+github.com/planetscale/tengo v0.9.6-ps.v4 h1:nLGFobPtYEZDmuRww38RJiP7gVWVLBMzpTUysLIUF7Q=
+github.com/planetscale/tengo v0.9.6-ps.v4/go.mod h1:Xwj7BHMQW30k479dZvWIl/WOCy33skXRjYZLsKgAINM=
 github.com/planetscale/vtprotobuf v0.0.0-20210521163914-5a02622d1e2a h1:qr27Mt+/BoONcc6hogjN5PPCykCxXvJMpXCtYMMgkws=
 github.com/planetscale/vtprotobuf v0.0.0-20210521163914-5a02622d1e2a/go.mod h1:8abDv+/TBY4d10QUVQgKYCy6+xk9SQPorWPZDqTkPHM=
 github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

diff --git a/go/vt/vttablet/onlineddl/executor.go b/go/vt/vttablet/onlineddl/executor.go
@@ -64,7 +64,7 @@ import (
 
 	mysqldriver "github.com/go-sql-driver/mysql"
 	"github.com/jmoiron/sqlx"
-	"github.com/skeema/tengo"
+	"github.com/planetscale/tengo"
 )
 
 var (