From 24c7801dacf9c56b243f1bf413abdc37f013fe92 Mon Sep 17 00:00:00 2001 From: mathieuHa Date: Sat, 19 Nov 2022 20:40:03 +0100 Subject: [PATCH] :arrow_up: Bump to go 1.19 (#37) * :arrow_up: Bump to go 1.19 * :arrow_up: Remove depreciated function and replace io/utils calls --- .github/workflows/go-cross.yml | 2 +- .github/workflows/main.yml | 2 +- bouncer.go | 4 ++-- docker-compose.yml | 2 +- go.mod | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/go-cross.yml b/.github/workflows/go-cross.yml index c1cbb51..19193e8 100644 --- a/.github/workflows/go-cross.yml +++ b/.github/workflows/go-cross.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: - go-version: [ 1.18, 1.x ] + go-version: [ 1.19, 1.x ] os: [ubuntu-latest, macos-latest, windows-latest] steps: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0025179..dd2e3b6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: name: Main Process runs-on: ubuntu-latest env: - GO_VERSION: 1.18 + GO_VERSION: 1.19 GOLANGCI_LINT_VERSION: v1.50.0 YAEGI_VERSION: v0.14.2 CGO_ENABLED: 0 diff --git a/bouncer.go b/bouncer.go index da15dfa..2a760cb 100644 --- a/bouncer.go +++ b/bouncer.go @@ -8,7 +8,6 @@ import ( "encoding/json" "fmt" "io" - "io/ioutil" "net/http" "net/url" "text/template" @@ -357,7 +356,8 @@ func crowdsecQuery(bouncer *Bouncer, stringURL string) ([]byte, error) { logger.Error(fmt.Sprintf("failed to close body reader: %s", err.Error())) } }(res.Body) - body, err := ioutil.ReadAll(res.Body) + body, err := io.ReadAll(res.Body) + if err != nil { return nil, fmt.Errorf("error while reading body: %w", err) } diff --git a/docker-compose.yml b/docker-compose.yml index c786113..6c12ce5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,7 @@ services: - "--entrypoints.web.address=:80" - "--experimental.plugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin" - - "--experimental.plugins.bouncer.version=v1.1.2" + - "--experimental.plugins.bouncer.version=v1.1.3" volumes: - "/var/run/docker.sock:/var/run/docker.sock:ro" - "logs:/var/log/traefik" diff --git a/go.mod b/go.mod index 729f8f0..f734931 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,5 @@ module github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin -go 1.18 +go 1.19 require github.com/leprosus/golang-ttl-map v1.1.7