diff --git a/Makefile b/Makefile index 63eadb3..5af0a57 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ IMAGE_NAME ?= docsonnet IMAGE_PREFIX ?= jsonnetlibs -IMAGE_TAG ?= 0.0.3 +IMAGE_TAG ?= 0.0.4 build: docker buildx build -t $(IMAGE_PREFIX)/$(IMAGE_NAME):$(IMAGE_TAG) . diff --git a/pkg/docsonnet/load.go b/pkg/docsonnet/load.go index e859e7f..4a192de 100644 --- a/pkg/docsonnet/load.go +++ b/pkg/docsonnet/load.go @@ -3,7 +3,7 @@ package docsonnet import ( "encoding/json" "fmt" - "io/ioutil" + "io" "log" "github.com/google/go-jsonnet" @@ -35,7 +35,7 @@ func Extract(filename string, opts Opts) ([]byte, error) { if err != nil { return nil, err } - load, err := ioutil.ReadAll(file) + load, err := io.ReadAll(file) if err != nil { return nil, err } @@ -51,7 +51,7 @@ func Extract(filename string, opts Opts) ([]byte, error) { // invoke load.libsonnet vm.ExtCode("main", fmt.Sprintf(`(import "%s")`, filename)) - data, err := vm.EvaluateSnippet("load.libsonnet", string(load)) + data, err := vm.EvaluateAnonymousSnippet("load.libsonnet", string(load)) if err != nil { return nil, err } @@ -83,7 +83,7 @@ func newImporter(paths []string) (*importer, error) { if err != nil { return nil, err } - load, err := ioutil.ReadAll(file) + load, err := io.ReadAll(file) if err != nil { return nil, err } diff --git a/pkg/render/fs.go b/pkg/render/fs.go index fbc0941..d8e34ba 100644 --- a/pkg/render/fs.go +++ b/pkg/render/fs.go @@ -1,7 +1,6 @@ package render import ( - "io/ioutil" "os" "path/filepath" @@ -22,7 +21,7 @@ func To(pkg docsonnet.Package, dir string, opts Opts) (int, error) { if err := os.MkdirAll(dir, os.ModePerm); err != nil { return n, err } - if err := ioutil.WriteFile(fullpath, []byte(v), 0644); err != nil { + if err := os.WriteFile(fullpath, []byte(v), 0644); err != nil { return n, err } n++