Skip to content

Update gopkg.in/alecthomas/kingpin.v2 to github.com/alecthomas/kingpin/v2 #3266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simonpasquier merged 1 commit into from
Mar 8, 2023
Merged

Update gopkg.in/alecthomas/kingpin.v2 to github.com/alecthomas/kingpin/v2 #3266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/alert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
package cli

import (
"gopkg.in/alecthomas/kingpin.v2"
"github.com/alecthomas/kingpin/v2"
)

func configureAlertCmd(app *kingpin.Application) {
Expand Down
2 changes: 1 addition & 1 deletion cli/alert_add.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"fmt"
"time"

"github.com/alecthomas/kingpin/v2"
"github.com/go-openapi/strfmt"
"gopkg.in/alecthomas/kingpin.v2"

"github.com/prometheus/alertmanager/api/v2/client/alert"
"github.com/prometheus/alertmanager/api/v2/models"
Expand Down
2 changes: 1 addition & 1 deletion cli/alert_query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"errors"
"fmt"

"gopkg.in/alecthomas/kingpin.v2"
"github.com/alecthomas/kingpin/v2"

"github.com/prometheus/alertmanager/api/v2/client/alert"
"github.com/prometheus/alertmanager/cli/format"
Expand Down
2 changes: 1 addition & 1 deletion cli/check_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"fmt"
"os"

"gopkg.in/alecthomas/kingpin.v2"
"github.com/alecthomas/kingpin/v2"

"github.com/prometheus/alertmanager/config"
"github.com/prometheus/alertmanager/template"
Expand Down
2 changes: 1 addition & 1 deletion cli/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"context"
"errors"

"gopkg.in/alecthomas/kingpin.v2"
"github.com/alecthomas/kingpin/v2"

"github.com/prometheus/alertmanager/cli/format"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"context"
"errors"

kingpin "gopkg.in/alecthomas/kingpin.v2"
kingpin "github.com/alecthomas/kingpin/v2"

"github.com/prometheus/alertmanager/cli/format"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package config
import (
"os"

"gopkg.in/alecthomas/kingpin.v2"
"github.com/alecthomas/kingpin/v2"
"gopkg.in/yaml.v2"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"io"
"testing"

"gopkg.in/alecthomas/kingpin.v2"
"github.com/alecthomas/kingpin/v2"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cli/format/format.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"io"
"time"

"github.com/alecthomas/kingpin/v2"
"github.com/go-openapi/strfmt"
"gopkg.in/alecthomas/kingpin.v2"

"github.com/prometheus/alertmanager/api/v2/models"
"github.com/prometheus/alertmanager/pkg/labels"
Expand Down
2 changes: 1 addition & 1 deletion cli/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import (
"path"
"time"

"github.com/alecthomas/kingpin/v2"
"github.com/go-openapi/strfmt"
promconfig "github.com/prometheus/common/config"
"github.com/prometheus/common/version"
"golang.org/x/mod/semver"
"gopkg.in/alecthomas/kingpin.v2"

"github.com/prometheus/alertmanager/api/v2/client"
"github.com/prometheus/alertmanager/cli/config"
Expand Down
2 changes: 1 addition & 1 deletion cli/routing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"context"
"fmt"

"github.com/alecthomas/kingpin/v2"
"github.com/xlab/treeprint"
"gopkg.in/alecthomas/kingpin.v2"

"github.com/prometheus/alertmanager/api/v2/models"
"github.com/prometheus/alertmanager/dispatch"
Expand Down
2 changes: 1 addition & 1 deletion cli/silence.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
package cli

import (
"gopkg.in/alecthomas/kingpin.v2"
"github.com/alecthomas/kingpin/v2"
)

// silenceCmd represents the silence command
Expand Down
2 changes: 1 addition & 1 deletion cli/silence_add.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"os/user"
"time"

"github.com/alecthomas/kingpin/v2"
"github.com/go-openapi/strfmt"
"github.com/prometheus/common/model"
"gopkg.in/alecthomas/kingpin.v2"

"github.com/prometheus/alertmanager/api/v2/client/silence"
"github.com/prometheus/alertmanager/api/v2/models"
Expand Down
2 changes: 1 addition & 1 deletion cli/silence_expire.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"context"
"errors"

"github.com/alecthomas/kingpin/v2"
"github.com/go-openapi/strfmt"
"gopkg.in/alecthomas/kingpin.v2"

"github.com/prometheus/alertmanager/api/v2/client/silence"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/silence_import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"os"
"sync"

kingpin "github.com/alecthomas/kingpin/v2"
"github.com/pkg/errors"
kingpin "gopkg.in/alecthomas/kingpin.v2"

"github.com/prometheus/alertmanager/api/v2/client/silence"
"github.com/prometheus/alertmanager/api/v2/models"
Expand Down
2 changes: 1 addition & 1 deletion cli/silence_query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"fmt"
"time"

kingpin "gopkg.in/alecthomas/kingpin.v2"
kingpin "github.com/alecthomas/kingpin/v2"

"github.com/prometheus/alertmanager/api/v2/client/silence"
"github.com/prometheus/alertmanager/api/v2/models"
Expand Down
2 changes: 1 addition & 1 deletion cli/silence_update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"fmt"
"time"

"github.com/alecthomas/kingpin/v2"
"github.com/go-openapi/strfmt"
"github.com/prometheus/common/model"
"gopkg.in/alecthomas/kingpin.v2"

"github.com/prometheus/alertmanager/api/v2/client/silence"
"github.com/prometheus/alertmanager/api/v2/models"
Expand Down
2 changes: 1 addition & 1 deletion cli/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
package cli

import (
"gopkg.in/alecthomas/kingpin.v2"
"github.com/alecthomas/kingpin/v2"
)

// configureTemplateCmd represents the template command.
Expand Down
2 changes: 1 addition & 1 deletion cli/template_render.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"os"
"time"

"gopkg.in/alecthomas/kingpin.v2"
"github.com/alecthomas/kingpin/v2"

"github.com/prometheus/alertmanager/template"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/test_routing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"os"
"strings"

"github.com/alecthomas/kingpin/v2"
"github.com/xlab/treeprint"
"gopkg.in/alecthomas/kingpin.v2"

"github.com/prometheus/alertmanager/api/v2/models"
"github.com/prometheus/alertmanager/dispatch"
Expand Down
2 changes: 1 addition & 1 deletion cli/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"os"
"path"

kingpin "github.com/alecthomas/kingpin/v2"
"github.com/prometheus/common/model"
kingpin "gopkg.in/alecthomas/kingpin.v2"

"github.com/prometheus/alertmanager/api/v2/client/general"
"github.com/prometheus/alertmanager/api/v2/models"
Expand Down
2 changes: 1 addition & 1 deletion cmd/alertmanager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"syscall"
"time"

"github.com/alecthomas/kingpin/v2"
"github.com/go-kit/log"
"github.com/go-kit/log/level"
"github.com/pkg/errors"
Expand All @@ -40,7 +41,6 @@ import (
"github.com/prometheus/common/version"
"github.com/prometheus/exporter-toolkit/web"
webflag "github.com/prometheus/exporter-toolkit/web/kingpinflag"
"gopkg.in/alecthomas/kingpin.v2"

"github.com/prometheus/alertmanager/api"
"github.com/prometheus/alertmanager/cluster"
Expand Down
22 changes: 11 additions & 11 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module github.com/prometheus/alertmanager
go 1.18

require (
github.com/alecthomas/kingpin/v2 v2.3.2
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137
github.com/aws/aws-sdk-go v1.44.211
github.com/benbjohnson/clock v1.3.0
Expand All @@ -29,30 +30,28 @@ require (
github.com/oklog/ulid v1.3.1
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.14.0
github.com/prometheus/common v0.39.0
github.com/prometheus/common v0.42.0
github.com/prometheus/common/sigv4 v0.1.0
github.com/prometheus/exporter-toolkit v0.8.2
github.com/prometheus/exporter-toolkit v0.9.1
github.com/rs/cors v1.8.3
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
github.com/stretchr/testify v1.8.2
github.com/xlab/treeprint v1.1.0
go.uber.org/atomic v1.10.0
golang.org/x/mod v0.8.0
golang.org/x/net v0.6.0
golang.org/x/text v0.7.0
golang.org/x/net v0.8.0
golang.org/x/text v0.8.0
golang.org/x/tools v0.6.0
gopkg.in/alecthomas/kingpin.v2 v2.2.6
gopkg.in/telebot.v3 v3.1.2
gopkg.in/yaml.v2 v2.4.0
)

require (
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
github.com/armon/go-metrics v0.3.10 // indirect
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/coreos/go-systemd/v22 v22.4.0 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
Expand All @@ -78,15 +77,16 @@ require (
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
go.mongodb.org/mongo-driver v1.11.0 // indirect
go.opentelemetry.io/otel v1.11.1 // indirect
go.opentelemetry.io/otel/trace v1.11.1 // indirect
golang.org/x/crypto v0.1.0 // indirect
golang.org/x/oauth2 v0.3.0 // indirect
golang.org/x/crypto v0.7.0 // indirect
golang.org/x/oauth2 v0.6.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/sys v0.6.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading