all: Fix chirpstack v3 source

TheThingsNetwork · Feb 28, 2024 · 34cfd2e · 34cfd2e
1 parent f1f2d7b
commit 34cfd2e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/pkg/source/chirpstack/config/config.go b/pkg/source/chirpstack/config/config.go
@@ -25,6 +25,7 @@ import (
 	"go.thethings.network/lorawan-stack/v3/pkg/types"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/credentials/insecure"
 )
 
 func New() (*Config, *pflag.FlagSet) {
@@ -101,7 +102,7 @@ func (c *Config) Initialize() error {
 		return errInvalidJoinEUI.WithAttributes("join_eui", c.joinEUI)
 	}
 
-	if !c.insecure || c.caPath != "" {
+	if !c.insecure && c.caPath != "" {
 		if err := setCustomCA(c.caPath); err != nil {
 			return err
 		}
@@ -120,8 +121,8 @@ func (c *Config) Initialize() error {
 }
 
 func (c *Config) dialGRPC(opts ...grpc.DialOption) error {
-	if c.insecure && c.caPath == "" {
-		opts = append(opts, grpc.WithInsecure())
+	if c.insecure || c.caPath == "" {
+		opts = append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	}
 	if tls := http.DefaultTransport.(*http.Transport).TLSClientConfig; tls != nil {
 		opts = append(opts, grpc.WithTransportCredentials(credentials.NewTLS(tls)))

diff --git a/pkg/source/chirpstack/source.go b/pkg/source/chirpstack/source.go
@@ -30,7 +30,6 @@ import (
 	"go.thethings.network/lorawan-stack/v3/pkg/log"
 	"go.thethings.network/lorawan-stack/v3/pkg/ttnpb"
 	"go.thethings.network/lorawan-stack/v3/pkg/types"
-	"google.golang.org/grpc"
 	"google.golang.org/protobuf/types/known/durationpb"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
@@ -52,8 +51,7 @@ function Decoder(bytes, fport) {
 type Source struct {
 	*config.Config
 
-	ctx        context.Context
-	ClientConn *grpc.ClientConn
+	ctx context.Context
 
 	applications map[int64]*csapi.Application
 	devProfiles  map[string]*csapi.DeviceProfile