Skip to content

Commit

Permalink
Merge pull request #73 from TheThingsNetwork/issue/upgrade-dependencies
Browse files Browse the repository at this point in the history
Upgrade dependencies
  • Loading branch information
happyRip committed May 4, 2023
2 parents ca5cb4d + 7c16a20 commit 3f22c13
Show file tree
Hide file tree
Showing 9 changed files with 2,328 additions and 224 deletions.
7 changes: 6 additions & 1 deletion cmd/chirpstack/chirpstack.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,9 @@ import "go.thethings.network/lorawan-stack-migrate/pkg/commands"
const sourceName = "chirpstack"

// ChirpStackCmd represents the chirpstack source.
var ChirpStackCmd = commands.Source(sourceName, "Export devices from ChirpStack V3")
var ChirpStackCmd = commands.Source(sourceName,
"Export devices from ChirpStack V3",
commands.WithDevicesOptions(
commands.WithShort("Export devices by DevEUI"),
),
)
6 changes: 4 additions & 2 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,10 @@ func init() {
"https://raw.githubusercontent.com/TheThingsNetwork/lorawan-frequency-plans/master",
"URL for fetching frequency plans")

// TODO: After dependency update (https://github.com/TheThingsNetwork/lorawan-stack-migrate/issues/72)
// Create "sources" group in `rootCmd`
rootCmd.AddGroup(&cobra.Group{
ID: "sources",
Title: "Sources:",
})

rootCmd.AddCommand(ttnv2.TTNv2Cmd)
rootCmd.AddCommand(tts.TTSCmd)
Expand Down
4 changes: 3 additions & 1 deletion cmd/tts/tts.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,7 @@ const sourceName = "tts"
// TTSCmd represents the tts source.
var TTSCmd = commands.Source(sourceName,
"Export devices from The Things Stack",
commands.WithAliases([]string{"ttnv3"}),
commands.WithSourceOptions(
commands.WithAliases([]string{"ttnv3"}),
),
)
107 changes: 49 additions & 58 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,115 +1,106 @@
module go.thethings.network/lorawan-stack-migrate

go 1.18
go 1.20

// Dependency of lorawan-stack.
replace gopkg.in/DATA-DOG/go-sqlmock.v1 => gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0

// Dependency of lorawan-stack.
replace gocloud.dev => gocloud.dev v0.19.0

// Dependency of lorawan-stack.
replace github.com/grpc-ecosystem/grpc-gateway => github.com/TheThingsIndustries/grpc-gateway v1.15.2-gogo

// Dependency of lorawan-stack.
replace github.com/grpc-ecosystem/grpc-gateway/v2 => github.com/grpc-ecosystem/grpc-gateway/v2 v2.10.3

// Dependency of lorawan-stack.
replace google.golang.org/grpc => google.golang.org/grpc v1.33.1
replace github.com/throttled/throttled/v2 => github.com/TheThingsIndustries/throttled/v2 v2.7.1-noredis

require (
github.com/TheThingsNetwork/go-app-sdk v0.0.0-20191121100818-5bae20ae2b27
github.com/TheThingsNetwork/go-utils v0.0.0-20200807125606-b3493662e4bf
github.com/TheThingsNetwork/ttn/core/types v0.0.0-20190516112328-fcd38e2b9dc6
github.com/apex/log v1.9.0
github.com/brocaar/chirpstack-api/go/v3 v3.12.5
github.com/gogo/protobuf v1.3.2
github.com/mdempsky/unconvert v0.0.0-20200228143138-95ecdbfc0b5f
github.com/mgechev/revive v1.2.3
github.com/smartystreets/assertions v1.13.0
github.com/spf13/cobra v1.5.0
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.5
go.thethings.network/lorawan-stack/v3 v3.21.2
go.uber.org/zap v1.23.0
google.golang.org/grpc v1.49.0
go.thethings.network/lorawan-stack/v3 v3.25.1
go.uber.org/zap v1.24.0
google.golang.org/grpc v1.52.3
google.golang.org/protobuf v1.28.1
)

require (
contrib.go.opencensus.io/exporter/prometheus v0.4.0 // indirect
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
github.com/BurntSushi/toml v1.2.0 // indirect
github.com/TheThingsIndustries/protoc-gen-go-flags v1.0.0 // indirect
github.com/TheThingsIndustries/protoc-gen-go-json v1.4.0 // indirect
github.com/TheThingsIndustries/protoc-gen-go-flags v1.0.6 // indirect
github.com/TheThingsIndustries/protoc-gen-go-json v1.4.2 // indirect
github.com/TheThingsNetwork/api v0.0.0-20190516111443-a3523f89e84f // indirect
github.com/TheThingsNetwork/go-account-lib v0.0.0-20190516094738-77d15a3f8875 // indirect
github.com/TheThingsNetwork/ttn/api v0.0.0-20190516081709-034d40b328bd // indirect
github.com/TheThingsNetwork/ttn/mqtt v0.0.0-20190516112328-fcd38e2b9dc6 // indirect
github.com/TheThingsNetwork/ttn/utils/errors v0.0.0-20190516081709-034d40b328bd // indirect
github.com/TheThingsNetwork/ttn/utils/random v0.0.0-20190516092602-86414c703ee1 // indirect
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/brocaar/lorawan v0.0.0-20170626123636-a64aca28516d // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/chavacava/garif v0.0.0-20220630083739-93517212f375 // indirect
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/eclipse/paho.mqtt.golang v1.3.5 // indirect
github.com/envoyproxy/protoc-gen-validate v0.6.3 // indirect
github.com/eclipse/paho.mqtt.golang v1.4.2 // indirect
github.com/envoyproxy/protoc-gen-validate v0.9.1 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fatih/structtag v1.2.0 // indirect
github.com/go-kit/log v0.2.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/mock v1.4.4 // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/googleapis/gax-go v2.0.2+incompatible // indirect
github.com/gorilla/websocket v1.4.2 // indirect
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/gotnospirit/makeplural v0.0.0-20180622080156-a5f48d94d976 // indirect
github.com/gotnospirit/messageformat v0.0.0-20190719172517-c1d0bdacdea2 // indirect
github.com/gotnospirit/messageformat v0.0.0-20221001023931-dfe49f1eb092 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.0.0-00010101000000-000000000000 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mattn/go-colorable v0.1.9 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mwitkow/go-grpc-middleware v1.0.0 // indirect
github.com/oklog/ulid/v2 v2.0.2 // indirect
github.com/oklog/ulid/v2 v2.1.0 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.11.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/prometheus/statsd_exporter v0.22.4 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/prometheus/statsd_exporter v0.22.7 // indirect
github.com/rivo/uniseg v0.4.3 // indirect
github.com/satori/go.uuid v1.2.0 // indirect
github.com/throttled/throttled/v2 v2.11.0 // indirect
github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
go.opencensus.io v0.23.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.7.0 // indirect
gocloud.dev v0.20.0 // indirect
golang.org/x/crypto v0.0.0-20220826181053-bd7e27e6170d // indirect
golang.org/x/exp v0.0.0-20220706164943-b4a6d9510983 // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/tools v0.1.12 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
go.opencensus.io v0.24.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
gocloud.dev v0.28.0 // indirect
golang.org/x/crypto v0.6.0 // indirect
golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 // indirect
golang.org/x/mod v0.7.0 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/oauth2 v0.5.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/tools v0.3.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.107.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect
google.golang.org/protobuf v1.28.0 // indirect
google.golang.org/genproto v0.0.0-20230124163310-31e0e69b6fc2 // indirect
gopkg.in/redis.v5 v5.2.9 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)
Loading

0 comments on commit 3f22c13

Please sign in to comment.