chore: re-delete jsonnet package, use copy from influx-cli instead

influxdata · Jul 22, 2021 · 932a4a4 · 932a4a4
1 parent 41141e8
commit 932a4a4
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 85 deletions.
diff --git a/go.mod b/go.mod
@@ -35,7 +35,6 @@ require (
 	github.com/golang/snappy v0.0.1
 	github.com/google/btree v1.0.0
 	github.com/google/go-cmp v0.5.5
-	github.com/google/go-jsonnet v0.17.0
 	github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible // indirect
 	github.com/hashicorp/go-msgpack v0.0.0-20150518234257-fa3f63826f7c // indirect
 	github.com/hashicorp/go-retryablehttp v0.6.4 // indirect

diff --git a/pkg/jsonnet/decode.go b/pkg/jsonnet/decode.go
diff --git a/pkg/jsonnet/decode_test.go b/pkg/jsonnet/decode_test.go
diff --git a/pkger/http_server_template.go b/pkger/http_server_template.go
@@ -11,11 +11,11 @@ import (
 
 	"github.com/go-chi/chi"
 	"github.com/go-chi/chi/middleware"
+	"github.com/influxdata/influx-cli/v2/pkg/jsonnet"
 	"github.com/influxdata/influxdb/v2"
 	pctx "github.com/influxdata/influxdb/v2/context"
 	ierrors "github.com/influxdata/influxdb/v2/kit/errors"
 	kithttp "github.com/influxdata/influxdb/v2/kit/transport/http"
-	"github.com/influxdata/influxdb/v2/pkg/jsonnet"
 	"go.uber.org/zap"
 	"gopkg.in/yaml.v3"
 )

diff --git a/pkger/parser.go b/pkger/parser.go
@@ -19,8 +19,8 @@ import (
 	"github.com/influxdata/flux/ast"
 	"github.com/influxdata/flux/ast/edit"
 	"github.com/influxdata/flux/parser"
+	"github.com/influxdata/influx-cli/v2/pkg/jsonnet"
 	"github.com/influxdata/influxdb/v2"
-	"github.com/influxdata/influxdb/v2/pkg/jsonnet"
 	"github.com/influxdata/influxdb/v2/task/options"
 	"gopkg.in/yaml.v3"
 )