Bugfix

internal/addresses.go

@@ -0,0 +1,4 @@
+package internal
+
+const DefaultTrainingsServer = "academy-grpc.threedots.tech:443"
+const WebsiteAddress = "https://academy.threedots.tech/"

tdl/main.go

@@ -7,12 +7,12 @@ import (
 	"os"
 	"time"
 
+	"github.com/ThreeDotsLabs/cli/internal"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 
 	"github.com/ThreeDotsLabs/cli/trainings"
-	"github.com/ThreeDotsLabs/cli/trainings/web"
 )
 
 func main() {
@@ -58,12 +58,12 @@ var app = &cli.App{
 		{
 			Name:    "training",
 			Aliases: []string{"tr"},
-			Usage:   fmt.Sprintf("commands for %s commands", web.Website),
+			Usage:   fmt.Sprintf("commands for %s commands", internal.WebsiteAddress),
 			Subcommands: []*cli.Command{
 				{
 					Name:      "configure",
 					Usage:     "connect your environment with platform account",
-					ArgsUsage: fmt.Sprintf("[token from %s]", web.Website),
+					ArgsUsage: fmt.Sprintf("[token from %s]", internal.WebsiteAddress),
 					Flags: []cli.Flag{
 						&cli.StringFlag{
 							Name:   "server",
@@ -98,7 +98,7 @@ var app = &cli.App{
 				},
 				{
 					Name:      "init",
-					ArgsUsage: fmt.Sprintf("[trainingID from %s]", web.Website),
+					ArgsUsage: fmt.Sprintf("[trainingID from %s]", internal.WebsiteAddress),
 					Usage:     "initialise training files in your current directory",
 					Action: func(c *cli.Context) error {
 						trainingID := c.Args().First()

trainings/config/global.go

@@ -11,11 +11,8 @@ import (
 	"github.com/sirupsen/logrus"
 
 	"github.com/ThreeDotsLabs/cli/internal"
-	"github.com/ThreeDotsLabs/cli/trainings/web"
 )
 
-const defaultTrainingsServer = "academy-grpc.threedots.tech:443"
-
 type GlobalConfig struct {
 	Token      string `toml:"token"`
 	ServerAddr string `toml:"server_addr"`
@@ -50,7 +47,7 @@ func (c Config) GlobalConfig() GlobalConfig {
 	if !c.dirOrFileExists(c.osFs, configPath) {
 		panic(errors.Errorf(
 			"trainings are not configured, please visit %s to get credentials and run %s",
-			web.Website, internal.SprintCommand("tdl training configure"),
+			internal.WebsiteAddress, internal.SprintCommand("tdl training configure"),
 		))
 	}
 
@@ -60,7 +57,7 @@ func (c Config) GlobalConfig() GlobalConfig {
 	}
 
 	if config.ServerAddr == "" {
-		config.ServerAddr = defaultTrainingsServer
+		config.ServerAddr = internal.DefaultTrainingsServer
 	}
 	if config.Token == "" {
 		panic(fmt.Sprintf("empty token in %s", configPath))

trainings/handlers.go

@@ -5,6 +5,7 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 
+	"github.com/ThreeDotsLabs/cli/internal"
 	"github.com/pkg/errors"
 	"github.com/spf13/afero"
 	"google.golang.org/grpc"
@@ -35,6 +36,10 @@ func (h *Handlers) newGrpcClient(ctx context.Context) genproto.ServerClient {
 }
 
 func (h *Handlers) newGrpcClientWithAddr(ctx context.Context, addr string, insecure bool) genproto.ServerClient {
+	if addr == "" {
+		addr = internal.DefaultTrainingsServer
+	}
+
 	if h.grpcClient == nil {
 		var opts []grpc.DialOption
 

trainings/info.go

@@ -6,12 +6,12 @@ import (
 	"net/url"
 	"path"
 
+	"github.com/ThreeDotsLabs/cli/internal"
 	"github.com/fatih/color"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 
 	"github.com/ThreeDotsLabs/cli/trainings/config"
-	"github.com/ThreeDotsLabs/cli/trainings/web"
 )
 
 func (h *Handlers) Info(ctx context.Context) error {
@@ -26,7 +26,7 @@ func (h *Handlers) Info(ctx context.Context) error {
 	trainingConfig := h.config.TrainingConfig(trainingRootFs)
 	exerciseConfig := h.config.ExerciseConfig(trainingRootFs)
 
-	exerciseURL, err := url.Parse(web.Website)
+	exerciseURL, err := url.Parse(internal.WebsiteAddress)
 	if err != nil {
 		logrus.WithError(err).Warn("Can't parse website URL")
 	}