Skip to content

Commit

Permalink
Update chirpstack-network-server go import path.
Browse files Browse the repository at this point in the history
  • Loading branch information
brocaar committed Apr 1, 2021
1 parent 0ef4e67 commit 604d5e8
Show file tree
Hide file tree
Showing 145 changed files with 465 additions and 465 deletions.
4 changes: 2 additions & 2 deletions cmd/chirpstack-network-server/cmd/configfile.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"

"github.com/brocaar/chirpstack-network-server/internal/config"
"github.com/brocaar/chirpstack-network-server/v3/internal/config"
)

// when updating this template, don't forget to update config.md!
Expand Down Expand Up @@ -63,7 +63,7 @@ dsn="{{ .PostgreSQL.DSN }}"
# Automatically apply database migrations.
#
# It is possible to apply the database-migrations by hand
# (see https://github.com/brocaar/chirpstack-network-server/tree/master/migrations)
# (see https://github.com/brocaar/chirpstack-network-server/v3/tree/master/migrations)
# or let ChirpStack Application Server migrate to the latest state automatically, by using
# this setting. Make sure that you always make a backup when upgrading ChirpStack
# Application Server and / or applying migrations.
Expand Down
4 changes: 2 additions & 2 deletions cmd/chirpstack-network-server/cmd/print_ds.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"

"github.com/brocaar/chirpstack-network-server/internal/config"
"github.com/brocaar/chirpstack-network-server/internal/storage"
"github.com/brocaar/chirpstack-network-server/v3/internal/config"
"github.com/brocaar/chirpstack-network-server/v3/internal/storage"
"github.com/brocaar/lorawan"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/chirpstack-network-server/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/brocaar/chirpstack-network-server/internal/config"
"github.com/brocaar/chirpstack-network-server/v3/internal/config"
)

var (
Expand All @@ -29,7 +29,7 @@ var rootCmd = &cobra.Command{
Short: "ChirpStack Network Server",
Long: `ChirpStack Network Server is an open-source LoRaWAN Network Server, part of the ChirpStack Network Server stack
> documentation & support: https://www.chirpstack.io/network-server/
> source & copyright information: https://github.com/brocaar/chirpstack-network-server/`,
> source & copyright information: https://github.com/brocaar/chirpstack-network-server/v3/`,
RunE: run,
}

Expand Down
38 changes: 19 additions & 19 deletions cmd/chirpstack-network-server/cmd/root_run.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,25 @@ import (
"google.golang.org/grpc/resolver"

"github.com/brocaar/chirpstack-api/go/v3/nc"
"github.com/brocaar/chirpstack-network-server/internal/adr"
"github.com/brocaar/chirpstack-network-server/internal/api/ns"
roamingapi "github.com/brocaar/chirpstack-network-server/internal/api/roaming"
"github.com/brocaar/chirpstack-network-server/internal/backend/applicationserver"
"github.com/brocaar/chirpstack-network-server/internal/backend/controller"
gwbackend "github.com/brocaar/chirpstack-network-server/internal/backend/gateway"
"github.com/brocaar/chirpstack-network-server/internal/backend/gateway/amqp"
"github.com/brocaar/chirpstack-network-server/internal/backend/gateway/azureiothub"
"github.com/brocaar/chirpstack-network-server/internal/backend/gateway/gcppubsub"
"github.com/brocaar/chirpstack-network-server/internal/backend/gateway/mqtt"
"github.com/brocaar/chirpstack-network-server/internal/backend/joinserver"
"github.com/brocaar/chirpstack-network-server/internal/band"
"github.com/brocaar/chirpstack-network-server/internal/config"
"github.com/brocaar/chirpstack-network-server/internal/downlink"
"github.com/brocaar/chirpstack-network-server/internal/gateway"
"github.com/brocaar/chirpstack-network-server/internal/monitoring"
"github.com/brocaar/chirpstack-network-server/internal/roaming"
"github.com/brocaar/chirpstack-network-server/internal/storage"
"github.com/brocaar/chirpstack-network-server/internal/uplink"
"github.com/brocaar/chirpstack-network-server/v3/internal/adr"
"github.com/brocaar/chirpstack-network-server/v3/internal/api/ns"
roamingapi "github.com/brocaar/chirpstack-network-server/v3/internal/api/roaming"
"github.com/brocaar/chirpstack-network-server/v3/internal/backend/applicationserver"
"github.com/brocaar/chirpstack-network-server/v3/internal/backend/controller"
gwbackend "github.com/brocaar/chirpstack-network-server/v3/internal/backend/gateway"
"github.com/brocaar/chirpstack-network-server/v3/internal/backend/gateway/amqp"
"github.com/brocaar/chirpstack-network-server/v3/internal/backend/gateway/azureiothub"
"github.com/brocaar/chirpstack-network-server/v3/internal/backend/gateway/gcppubsub"
"github.com/brocaar/chirpstack-network-server/v3/internal/backend/gateway/mqtt"
"github.com/brocaar/chirpstack-network-server/v3/internal/backend/joinserver"
"github.com/brocaar/chirpstack-network-server/v3/internal/band"
"github.com/brocaar/chirpstack-network-server/v3/internal/config"
"github.com/brocaar/chirpstack-network-server/v3/internal/downlink"
"github.com/brocaar/chirpstack-network-server/v3/internal/gateway"
"github.com/brocaar/chirpstack-network-server/v3/internal/monitoring"
"github.com/brocaar/chirpstack-network-server/v3/internal/roaming"
"github.com/brocaar/chirpstack-network-server/v3/internal/storage"
"github.com/brocaar/chirpstack-network-server/v3/internal/uplink"
)

func run(cmd *cobra.Command, args []string) error {
Expand Down
2 changes: 1 addition & 1 deletion cmd/chirpstack-network-server/cmd/root_run_syslog.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
log "github.com/sirupsen/logrus"
lsyslog "github.com/sirupsen/logrus/hooks/syslog"

"github.com/brocaar/chirpstack-network-server/internal/config"
"github.com/brocaar/chirpstack-network-server/v3/internal/config"
)

func setSyslog() error {
Expand Down
2 changes: 1 addition & 1 deletion cmd/chirpstack-network-server/cmd/root_run_syslog_stub.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package cmd
import (
log "github.com/sirupsen/logrus"

"github.com/brocaar/chirpstack-network-server/internal/config"
"github.com/brocaar/chirpstack-network-server/v3/internal/config"
)

func setSyslog() error {
Expand Down
2 changes: 1 addition & 1 deletion cmd/chirpstack-network-server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
log "github.com/sirupsen/logrus"
"google.golang.org/grpc/grpclog"

"github.com/brocaar/chirpstack-network-server/cmd/chirpstack-network-server/cmd"
"github.com/brocaar/chirpstack-network-server/v3/cmd/chirpstack-network-server/cmd"
)

// grpcLogger implements a wrapper around the logrus Logger to make it
Expand Down
2 changes: 1 addition & 1 deletion examples/adr-plugin/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/hashicorp/go-plugin"
log "github.com/sirupsen/logrus"

"github.com/brocaar/chirpstack-network-server/adr"
"github.com/brocaar/chirpstack-network-server/v3/adr"
)

// Type Handler is the ADR handler.
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/brocaar/chirpstack-network-server
module github.com/brocaar/chirpstack-network-server/v3

go 1.16

Expand Down
4 changes: 2 additions & 2 deletions internal/adr/adr.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"github.com/hashicorp/go-plugin"
"github.com/pkg/errors"

"github.com/brocaar/chirpstack-network-server/adr"
"github.com/brocaar/chirpstack-network-server/internal/config"
"github.com/brocaar/chirpstack-network-server/v3/adr"
"github.com/brocaar/chirpstack-network-server/v3/internal/config"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion internal/adr/default.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package adr

import "github.com/brocaar/chirpstack-network-server/adr"
import "github.com/brocaar/chirpstack-network-server/v3/adr"

// DefaultHandler implements the default ADR handler.
type DefaultHandler struct{}
Expand Down
2 changes: 1 addition & 1 deletion internal/adr/default_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"testing"

"github.com/brocaar/chirpstack-network-server/adr"
"github.com/brocaar/chirpstack-network-server/v3/adr"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/api/client/asclient/pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"google.golang.org/grpc/credentials"

"github.com/brocaar/chirpstack-api/go/v3/as"
"github.com/brocaar/chirpstack-network-server/internal/logging"
"github.com/brocaar/chirpstack-network-server/v3/internal/logging"
)

// Pool defines the application-server client pool.
Expand Down
6 changes: 3 additions & 3 deletions internal/api/ns/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"google.golang.org/grpc"

"github.com/brocaar/chirpstack-api/go/v3/ns"
"github.com/brocaar/chirpstack-network-server/internal/config"
"github.com/brocaar/chirpstack-network-server/internal/logging"
"github.com/brocaar/chirpstack-network-server/internal/tls"
"github.com/brocaar/chirpstack-network-server/v3/internal/config"
"github.com/brocaar/chirpstack-network-server/v3/internal/logging"
"github.com/brocaar/chirpstack-network-server/v3/internal/tls"
)

func Setup(c config.Config) error {
Expand Down
8 changes: 4 additions & 4 deletions internal/api/ns/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/codes"

"github.com/brocaar/chirpstack-network-server/internal/downlink/data"
"github.com/brocaar/chirpstack-network-server/internal/downlink/multicast"
"github.com/brocaar/chirpstack-network-server/internal/downlink/proprietary"
"github.com/brocaar/chirpstack-network-server/internal/storage"
"github.com/brocaar/chirpstack-network-server/v3/internal/downlink/data"
"github.com/brocaar/chirpstack-network-server/v3/internal/downlink/multicast"
"github.com/brocaar/chirpstack-network-server/v3/internal/downlink/proprietary"
"github.com/brocaar/chirpstack-network-server/v3/internal/storage"
)

var errToCode = map[error]codes.Code{
Expand Down
18 changes: 9 additions & 9 deletions internal/api/ns/network_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ import (

"github.com/brocaar/chirpstack-api/go/v3/common"
"github.com/brocaar/chirpstack-api/go/v3/ns"
"github.com/brocaar/chirpstack-network-server/internal/adr"
"github.com/brocaar/chirpstack-network-server/internal/band"
"github.com/brocaar/chirpstack-network-server/internal/config"
"github.com/brocaar/chirpstack-network-server/internal/downlink/multicast"
proprietarydown "github.com/brocaar/chirpstack-network-server/internal/downlink/proprietary"
"github.com/brocaar/chirpstack-network-server/internal/framelog"
"github.com/brocaar/chirpstack-network-server/internal/gateway"
"github.com/brocaar/chirpstack-network-server/internal/helpers"
"github.com/brocaar/chirpstack-network-server/internal/storage"
"github.com/brocaar/chirpstack-network-server/v3/internal/adr"
"github.com/brocaar/chirpstack-network-server/v3/internal/band"
"github.com/brocaar/chirpstack-network-server/v3/internal/config"
"github.com/brocaar/chirpstack-network-server/v3/internal/downlink/multicast"
proprietarydown "github.com/brocaar/chirpstack-network-server/v3/internal/downlink/proprietary"
"github.com/brocaar/chirpstack-network-server/v3/internal/framelog"
"github.com/brocaar/chirpstack-network-server/v3/internal/gateway"
"github.com/brocaar/chirpstack-network-server/v3/internal/helpers"
"github.com/brocaar/chirpstack-network-server/v3/internal/storage"
"github.com/brocaar/lorawan"
"github.com/brocaar/lorawan/backend"
)
Expand Down
14 changes: 7 additions & 7 deletions internal/api/ns/network_server_new_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ import (

"github.com/brocaar/chirpstack-api/go/v3/common"
"github.com/brocaar/chirpstack-api/go/v3/ns"
"github.com/brocaar/chirpstack-network-server/internal/band"
"github.com/brocaar/chirpstack-network-server/internal/config"
"github.com/brocaar/chirpstack-network-server/internal/gateway"
"github.com/brocaar/chirpstack-network-server/internal/gps"
"github.com/brocaar/chirpstack-network-server/internal/helpers/classb"
"github.com/brocaar/chirpstack-network-server/internal/storage"
"github.com/brocaar/chirpstack-network-server/internal/test"
"github.com/brocaar/chirpstack-network-server/v3/internal/band"
"github.com/brocaar/chirpstack-network-server/v3/internal/config"
"github.com/brocaar/chirpstack-network-server/v3/internal/gateway"
"github.com/brocaar/chirpstack-network-server/v3/internal/gps"
"github.com/brocaar/chirpstack-network-server/v3/internal/helpers/classb"
"github.com/brocaar/chirpstack-network-server/v3/internal/storage"
"github.com/brocaar/chirpstack-network-server/v3/internal/test"
"github.com/brocaar/lorawan"
loraband "github.com/brocaar/lorawan/band"
)
Expand Down
10 changes: 5 additions & 5 deletions internal/api/ns/network_server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ import (
"github.com/brocaar/chirpstack-api/go/v3/common"
"github.com/brocaar/chirpstack-api/go/v3/gw"
"github.com/brocaar/chirpstack-api/go/v3/ns"
"github.com/brocaar/chirpstack-network-server/internal/config"
"github.com/brocaar/chirpstack-network-server/internal/framelog"
"github.com/brocaar/chirpstack-network-server/internal/gps"
"github.com/brocaar/chirpstack-network-server/internal/storage"
"github.com/brocaar/chirpstack-network-server/internal/test"
"github.com/brocaar/chirpstack-network-server/v3/internal/config"
"github.com/brocaar/chirpstack-network-server/v3/internal/framelog"
"github.com/brocaar/chirpstack-network-server/v3/internal/gps"
"github.com/brocaar/chirpstack-network-server/v3/internal/storage"
"github.com/brocaar/chirpstack-network-server/v3/internal/test"
"github.com/brocaar/lorawan"
)

Expand Down
18 changes: 9 additions & 9 deletions internal/api/roaming/roaming.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ import (
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"

"github.com/brocaar/chirpstack-network-server/internal/band"
"github.com/brocaar/chirpstack-network-server/internal/config"
downdata "github.com/brocaar/chirpstack-network-server/internal/downlink/data"
"github.com/brocaar/chirpstack-network-server/internal/logging"
"github.com/brocaar/chirpstack-network-server/internal/models"
"github.com/brocaar/chirpstack-network-server/internal/roaming"
"github.com/brocaar/chirpstack-network-server/internal/storage"
updata "github.com/brocaar/chirpstack-network-server/internal/uplink/data"
"github.com/brocaar/chirpstack-network-server/internal/uplink/join"
"github.com/brocaar/chirpstack-network-server/v3/internal/band"
"github.com/brocaar/chirpstack-network-server/v3/internal/config"
downdata "github.com/brocaar/chirpstack-network-server/v3/internal/downlink/data"
"github.com/brocaar/chirpstack-network-server/v3/internal/logging"
"github.com/brocaar/chirpstack-network-server/v3/internal/models"
"github.com/brocaar/chirpstack-network-server/v3/internal/roaming"
"github.com/brocaar/chirpstack-network-server/v3/internal/storage"
updata "github.com/brocaar/chirpstack-network-server/v3/internal/uplink/data"
"github.com/brocaar/chirpstack-network-server/v3/internal/uplink/join"
"github.com/brocaar/lorawan"
"github.com/brocaar/lorawan/backend"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/backend/applicationserver/applicationserver.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package applicationserver

import "github.com/brocaar/chirpstack-network-server/internal/api/client/asclient"
import "github.com/brocaar/chirpstack-network-server/v3/internal/api/client/asclient"

var pool asclient.Pool

Expand Down
8 changes: 4 additions & 4 deletions internal/backend/gateway/amqp/amqp.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"github.com/streadway/amqp"

"github.com/brocaar/chirpstack-api/go/v3/gw"
"github.com/brocaar/chirpstack-network-server/internal/backend/gateway"
"github.com/brocaar/chirpstack-network-server/internal/backend/gateway/marshaler"
"github.com/brocaar/chirpstack-network-server/internal/config"
"github.com/brocaar/chirpstack-network-server/internal/helpers"
"github.com/brocaar/chirpstack-network-server/v3/internal/backend/gateway"
"github.com/brocaar/chirpstack-network-server/v3/internal/backend/gateway/marshaler"
"github.com/brocaar/chirpstack-network-server/v3/internal/config"
"github.com/brocaar/chirpstack-network-server/v3/internal/helpers"
"github.com/brocaar/lorawan"
)

Expand Down
6 changes: 3 additions & 3 deletions internal/backend/gateway/amqp/amqp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"github.com/stretchr/testify/suite"

"github.com/brocaar/chirpstack-api/go/v3/gw"
"github.com/brocaar/chirpstack-network-server/internal/backend/gateway"
"github.com/brocaar/chirpstack-network-server/internal/backend/gateway/marshaler"
"github.com/brocaar/chirpstack-network-server/internal/test"
"github.com/brocaar/chirpstack-network-server/v3/internal/backend/gateway"
"github.com/brocaar/chirpstack-network-server/v3/internal/backend/gateway/marshaler"
"github.com/brocaar/chirpstack-network-server/v3/internal/test"
"github.com/brocaar/lorawan"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/backend/gateway/amqp/channel_pool_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"

"github.com/brocaar/chirpstack-network-server/internal/test"
"github.com/brocaar/chirpstack-network-server/v3/internal/test"
)

type ChannelPoolTestSuite struct {
Expand Down
8 changes: 4 additions & 4 deletions internal/backend/gateway/azureiothub/azureiothub.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import (
"pack.ag/amqp"

"github.com/brocaar/chirpstack-api/go/v3/gw"
"github.com/brocaar/chirpstack-network-server/internal/backend/gateway"
"github.com/brocaar/chirpstack-network-server/internal/backend/gateway/marshaler"
"github.com/brocaar/chirpstack-network-server/internal/config"
"github.com/brocaar/chirpstack-network-server/internal/helpers"
"github.com/brocaar/chirpstack-network-server/v3/internal/backend/gateway"
"github.com/brocaar/chirpstack-network-server/v3/internal/backend/gateway/marshaler"
"github.com/brocaar/chirpstack-network-server/v3/internal/config"
"github.com/brocaar/chirpstack-network-server/v3/internal/helpers"
"github.com/brocaar/lorawan"
)

Expand Down
8 changes: 4 additions & 4 deletions internal/backend/gateway/gcppubsub/gcppubsub.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import (
"google.golang.org/api/option"

"github.com/brocaar/chirpstack-api/go/v3/gw"
"github.com/brocaar/chirpstack-network-server/internal/backend/gateway"
"github.com/brocaar/chirpstack-network-server/internal/backend/gateway/marshaler"
"github.com/brocaar/chirpstack-network-server/internal/config"
"github.com/brocaar/chirpstack-network-server/internal/helpers"
"github.com/brocaar/chirpstack-network-server/v3/internal/backend/gateway"
"github.com/brocaar/chirpstack-network-server/v3/internal/backend/gateway/marshaler"
"github.com/brocaar/chirpstack-network-server/v3/internal/config"
"github.com/brocaar/chirpstack-network-server/v3/internal/helpers"
"github.com/brocaar/lorawan"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/backend/gateway/gcppubsub/gcppubsub_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"

"github.com/brocaar/chirpstack-api/go/v3/gw"
"github.com/brocaar/chirpstack-network-server/internal/backend/gateway/marshaler"
"github.com/brocaar/chirpstack-network-server/v3/internal/backend/gateway/marshaler"
"github.com/brocaar/lorawan"
"github.com/golang/protobuf/proto"
"github.com/pkg/errors"
Expand Down
10 changes: 5 additions & 5 deletions internal/backend/gateway/mqtt/backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ import (
log "github.com/sirupsen/logrus"

"github.com/brocaar/chirpstack-api/go/v3/gw"
"github.com/brocaar/chirpstack-network-server/internal/backend/gateway"
"github.com/brocaar/chirpstack-network-server/internal/backend/gateway/marshaler"
"github.com/brocaar/chirpstack-network-server/internal/config"
"github.com/brocaar/chirpstack-network-server/internal/helpers"
"github.com/brocaar/chirpstack-network-server/internal/storage"
"github.com/brocaar/chirpstack-network-server/v3/internal/backend/gateway"
"github.com/brocaar/chirpstack-network-server/v3/internal/backend/gateway/marshaler"
"github.com/brocaar/chirpstack-network-server/v3/internal/config"
"github.com/brocaar/chirpstack-network-server/v3/internal/helpers"
"github.com/brocaar/chirpstack-network-server/v3/internal/storage"
"github.com/brocaar/lorawan"
)

Expand Down
Loading

0 comments on commit 604d5e8

Please sign in to comment.