diff --git a/.drone.jsonnet b/.drone.jsonnet index 009c8b8..2aa8d78 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -8,7 +8,7 @@ local PipelineTest(deps=[],) = { steps: [ { name: 'deps', - image: 'golang:1.18', + image: 'golang:1.19', commands: [ 'make deps', ], @@ -21,7 +21,7 @@ local PipelineTest(deps=[],) = { }, { name: 'lint', - image: 'golang:1.18', + image: 'golang:1.19', commands: [ 'make lint', ], @@ -34,7 +34,7 @@ local PipelineTest(deps=[],) = { }, { name: 'test', - image: 'golang:1.18', + image: 'golang:1.19', commands: [ 'make test', ], diff --git a/.drone.yml b/.drone.yml index caf82ed..99b8612 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,7 +8,7 @@ platform: steps: - name: deps - image: golang:1.18 + image: golang:1.19 commands: - make deps volumes: @@ -16,7 +16,7 @@ steps: path: /go - name: lint - image: golang:1.18 + image: golang:1.19 commands: - make lint volumes: @@ -24,7 +24,7 @@ steps: path: /go - name: test - image: golang:1.18 + image: golang:1.19 commands: - make test volumes: @@ -156,6 +156,6 @@ depends_on: --- kind: signature -hmac: 4f3ed20143c606dfd970a528dfe74ed13e3899de1221b3b68635041bcedff385 +hmac: 84521962c13647c129172e114ade6a46c8d4564be36f654fce48b56583f27d65 ... diff --git a/Makefile b/Makefile index c0e35ef..cd18672 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@$(G XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest GENERATE ?= -XGO_VERSION := go-1.18.x +XGO_VERSION := go-1.19.x XGO_TARGETS ?= linux/amd64,linux/arm-6,linux/arm-7,linux/arm64 TAGS ?= netgo diff --git a/go.mod b/go.mod index 4e335a4..31ce1a3 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/thegeeklab/drone-template-lib/v2 -go 1.18 +go 1.19 require ( github.com/Masterminds/sprig/v3 v3.2.2 diff --git a/template/template.go b/template/template.go index b85caac..efa299d 100644 --- a/template/template.go +++ b/template/template.go @@ -8,9 +8,10 @@ package template import ( "fmt" - "io/ioutil" + "io" "net/http" "net/url" + "os" "strings" "github.com/flowchartsman/handlebars/v3" @@ -33,14 +34,14 @@ func Render(template string, payload interface{}) (s string, err error) { defer res.Body.Close() - out, err := ioutil.ReadAll(res.Body) + out, err := io.ReadAll(res.Body) if err != nil { return s, fmt.Errorf("failed to read: %w", err) } template = string(out) case "file": - out, err := ioutil.ReadFile(u.Path) + out, err := os.ReadFile(u.Path) if err != nil { return s, fmt.Errorf("failed to read: %w", err) }