Skip to content

Commit f322732

Browse files
committed
Bump all dependencies
Signed-off-by: Jan-Otto Kröpke <[email protected]>
1 parent 43a23d5 commit f322732

File tree

13 files changed

+390
-282
lines changed

13 files changed

+390
-282
lines changed

.errcheck_excludes.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
(github.com/go-kit/kit/log.Logger).Log
1+
(github.com/go-kit/log.Logger).Log
22
fmt.Fprintln
33
fmt.Fprint

.github/workflows/build-docker.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ jobs:
88
build:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/setup-go@v2
11+
- uses: actions/checkout@v3
12+
- uses: actions/setup-go@v3
1213
with:
13-
go-version: 1.15.x
14-
- uses: actions/checkout@v2
14+
go-version-file: 'go.mod'
1515
- name: Login to quay.io Docker Image Registry
1616
uses: docker/login-action@v1
1717
with:

.github/workflows/test.yaml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@ jobs:
1010
test:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/setup-go@v2
14-
with:
15-
go-version: 1.15.x
16-
- uses: actions/checkout@v2
17-
- run: make
18-
env:
19-
GO111MODULE: "on"
20-
GOBIN: "/tmp/bin"
13+
- uses: actions/checkout@v3
14+
- uses: actions/setup-go@v3
15+
with:
16+
go-version-file: 'go.mod'
17+
- run: make
18+
env:
19+
GOBIN: "/tmp/bin"

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.15 AS builder
1+
FROM golang:1.19 AS builder
22
WORKDIR /go/src/github.com/prometheus-community/jiralert
33
COPY . /go/src/github.com/prometheus-community/jiralert
44
RUN GO111MODULE=on GOBIN=/tmp/bin make

Makefile.common

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_
8383

8484
GOLANGCI_LINT :=
8585
GOLANGCI_LINT_OPTS ?=
86-
GOLANGCI_LINT_VERSION ?= v1.39.0
86+
GOLANGCI_LINT_VERSION ?= v1.50.0
8787
# golangci-lint only supports linux, darwin and windows platforms on i386/amd64.
8888
# windows isn't included here because of the path separator being different.
8989
ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))
90-
ifeq ($(GOHOSTARCH),$(filter $(GOHOSTARCH),amd64 i386))
90+
ifeq ($(GOHOSTARCH),$(filter $(GOHOSTARCH),amd64 arm64 i386))
9191
GOLANGCI_LINT := $(FIRST_GOPATH)/bin/golangci-lint
9292
endif
9393
endif

cmd/jiralert/main.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@ import (
1717
"encoding/json"
1818
"flag"
1919
"fmt"
20+
"github.com/andygrunwald/go-jira"
2021
"net/http"
2122
"os"
2223
"runtime"
2324
"strconv"
2425

25-
"github.com/andygrunwald/go-jira"
26-
27-
"github.com/go-kit/kit/log"
28-
"github.com/go-kit/kit/log/level"
26+
"github.com/go-kit/log"
27+
"github.com/go-kit/log/level"
2928
"github.com/prometheus-community/jiralert/pkg/alertmanager"
3029
"github.com/prometheus-community/jiralert/pkg/config"
3130
"github.com/prometheus-community/jiralert/pkg/notify"

go.mod

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,32 @@
11
module github.com/prometheus-community/jiralert
22

3-
go 1.15
3+
go 1.19
44

55
require (
6-
github.com/andygrunwald/go-jira v1.15.1
7-
github.com/go-kit/kit v0.10.0
8-
github.com/golang/protobuf v1.4.1 // indirect
6+
github.com/andygrunwald/go-jira v1.16.0
7+
github.com/go-kit/log v0.2.1
98
github.com/pkg/errors v0.9.1
10-
github.com/prometheus/client_golang v1.6.0
11-
github.com/prometheus/common v0.10.0 // indirect
12-
github.com/stretchr/testify v1.5.1
9+
github.com/prometheus/client_golang v1.13.0
10+
github.com/stretchr/testify v1.7.0
1311
github.com/trivago/tgo v1.0.7
14-
gopkg.in/yaml.v2 v2.3.0
12+
golang.org/x/text v0.4.0
13+
gopkg.in/yaml.v3 v3.0.1
14+
)
15+
16+
require (
17+
github.com/beorn7/perks v1.0.1 // indirect
18+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
19+
github.com/davecgh/go-spew v1.1.1 // indirect
20+
github.com/fatih/structs v1.1.0 // indirect
21+
github.com/go-logfmt/logfmt v0.5.1 // indirect
22+
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
23+
github.com/golang/protobuf v1.5.2 // indirect
24+
github.com/google/go-querystring v1.1.0 // indirect
25+
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
26+
github.com/pmezard/go-difflib v1.0.0 // indirect
27+
github.com/prometheus/client_model v0.3.0 // indirect
28+
github.com/prometheus/common v0.37.0 // indirect
29+
github.com/prometheus/procfs v0.8.0 // indirect
30+
golang.org/x/sys v0.1.0 // indirect
31+
google.golang.org/protobuf v1.28.1 // indirect
1532
)

go.sum

Lines changed: 328 additions & 235 deletions
Large diffs are not rendered by default.

pkg/config/config.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ package config
1515

1616
import (
1717
"fmt"
18-
"io/ioutil"
1918
"net/url"
2019
"os"
2120
"path/filepath"
@@ -24,11 +23,11 @@ import (
2423
"strings"
2524
"time"
2625

27-
"github.com/go-kit/kit/log"
28-
"github.com/go-kit/kit/log/level"
26+
"github.com/go-kit/log"
27+
"github.com/go-kit/log/level"
2928

3029
"github.com/trivago/tgo/tcontainer"
31-
"gopkg.in/yaml.v2"
30+
yaml "gopkg.in/yaml.v3"
3231
)
3332

3433
// Secret is a string that must not be revealed on marshaling.
@@ -61,7 +60,7 @@ func Load(s string) (*Config, error) {
6160
// LoadFile parses the given YAML file into a Config.
6261
func LoadFile(filename string, logger log.Logger) (*Config, []byte, error) {
6362
level.Info(logger).Log("msg", "loading configuration", "path", filename)
64-
content, err := ioutil.ReadFile(filename)
63+
content, err := os.ReadFile(filename)
6564
if err != nil {
6665
return nil, nil, err
6766
}

pkg/config/config_test.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@
1313
package config
1414

1515
import (
16-
"io/ioutil"
1716
"os"
1817
"path"
1918
"reflect"
2019
"testing"
2120

22-
"github.com/go-kit/kit/log"
21+
"github.com/go-kit/log"
2322
"github.com/stretchr/testify/require"
24-
"gopkg.in/yaml.v2"
23+
yaml "gopkg.in/yaml.v3"
2524
)
2625

2726
const testConf = `
@@ -80,11 +79,11 @@ template: jiralert.tmpl
8079

8180
// Generic test that loads the testConf with no errors.
8281
func TestLoadFile(t *testing.T) {
83-
dir, err := ioutil.TempDir("", "test_jiralert")
82+
dir, err := os.MkdirTemp("", "test_jiralert")
8483
require.NoError(t, err)
8584
defer func() { require.NoError(t, os.RemoveAll(dir)) }()
8685

87-
require.NoError(t, ioutil.WriteFile(path.Join(dir, "config.yaml"), []byte(testConf), os.ModePerm))
86+
require.NoError(t, os.WriteFile(path.Join(dir, "config.yaml"), []byte(testConf), os.ModePerm))
8887

8988
_, content, err := LoadFile(path.Join(dir, "config.yaml"), log.NewNopLogger())
9089

0 commit comments

Comments
 (0)