deps: upgrade RTradeLTd/config

Gopkg.toml

@@ -22,7 +22,7 @@ ignored = ["github.com/gen2brain/go-fitz"]
 
 [[constraint]]
   name = "github.com/RTradeLtd/config"
-  version = "v1.0.11"
+  branch = "master"
 
 ###############
 # THIRD PARTY #

cmd/temporal-lens/main.go

@@ -85,8 +85,8 @@ var commands = map[string]cmd.Cmd{
 			}()
 
 			// go!
-			l.Infow("spinning up server", "config", cfg.Endpoints)
-			if err := server.RunV2(stop, l, srv, cfg.Endpoints); err != nil {
+			l.Infow("spinning up server", "config", cfg.Services.Lens)
+			if err := server.RunV2(stop, l, srv, cfg.Services.Lens); err != nil {
 				l.Fatalw("error encountered on server run", "error", err)
 			}
 		},
@@ -120,7 +120,7 @@ var commands = map[string]cmd.Cmd{
 			// let's goooo
 			if err := server.Run(
 				ctx,
-				cfg.Endpoints.Lens.URL,
+				cfg.Services.Lens.URL,
 				server.Metadata{
 					Version: Version,
 					Edition: Edition,

server/run.go

@@ -10,19 +10,19 @@ import (
 )
 
 // RunV2 spins up the V2 Lens gRPC server
-func RunV2(stop <-chan bool, l *zap.SugaredLogger, srv lensv2.LensV2Server, cfg config.Endpoints) error {
+func RunV2(stop <-chan bool, l *zap.SugaredLogger, srv lensv2.LensV2Server, cfg config.Lens) error {
 	// instantiate server settings
 	serverOpts, err := options(
-		cfg.Lens.TLS.CertPath,
-		cfg.Lens.TLS.KeyFile,
-		cfg.Lens.AuthKey,
+		cfg.TLS.CertPath,
+		cfg.TLS.KeyFile,
+		cfg.AuthKey,
 		l)
 	if err != nil {
 		return err
 	}
 
 	// create connection we will listen on
-	lis, err := net.Listen("tcp", cfg.Lens.URL)
+	lis, err := net.Listen("tcp", cfg.URL)
 	if err != nil {
 		return err
 	}
@@ -45,7 +45,7 @@ func RunV2(stop <-chan bool, l *zap.SugaredLogger, srv lensv2.LensV2Server, cfg
 	}()
 
 	// spin up server
-	l.Infow("spinning up server", "address", cfg.Lens.URL)
+	l.Infow("spinning up server", "address", cfg.URL)
 	if err = gServer.Serve(lis); err != nil {
 		l.Warn("shutting down server", "error", err)
 		return err

server/server.go

@@ -94,9 +94,9 @@ func Run(
 
 	// instantiate server settings
 	serverOpts, err := options(
-		cfg.Endpoints.Lens.TLS.CertPath,
-		cfg.Endpoints.Lens.TLS.KeyFile,
-		cfg.Endpoints.Lens.AuthKey,
+		cfg.Services.Lens.TLS.CertPath,
+		cfg.Services.Lens.TLS.KeyFile,
+		cfg.Services.Lens.AuthKey,
 		logger)
 	if err != nil {
 		return err

test/config.json

@@ -78,15 +78,14 @@
 		"email_address": "",
 		"email_name": ""
 	},
-	"endpoints": {
+	"services": {
 		"lens": {
 			"url": "0.0.0.0:9998",
 			"tls": {
 				"cert_path": "",
 				"key_file": ""
 			},
-			"auth_key": "blahblahblah",
-			"log_file": ""
+			"auth_key": "blahblahblah"
 		}
 	}
 }