Merge branch 'master' into test-results

Author: m110

tdl/main.go

@@ -31,6 +31,31 @@ func main() {
 	}
 }
 
+var configureFlags = []cli.Flag{
+	&cli.StringFlag{
+		Name:   "server",
+		Usage:  "custom server",
+		Hidden: true,
+	},
+	&cli.BoolFlag{
+		Name:   "insecure",
+		Usage:  "do not verify certificate",
+		Hidden: true,
+	},
+	&cli.StringFlag{
+		Name:  "region",
+		Usage: "the region to use (eu or us)",
+	},
+	&cli.BoolFlag{
+		Name:  "override",
+		Usage: "if config already exists, it will be overridden",
+		// deprecated, backward compatibility
+		Hidden: true,
+	},
+}
+
+var tokenDocs = fmt.Sprintf("token from %s", internal.WebsiteAddress)
+
 var app = &cli.App{
 	Name:      "tdl",
 	Usage:     "https://threedots.tech/ CLI.",
@@ -84,30 +109,9 @@ var app = &cli.App{
 			Subcommands: []*cli.Command{
 				{
 					Name:      "configure",
-					Usage:     "connect your environment with platform account",
-					ArgsUsage: fmt.Sprintf("<token from %s>", internal.WebsiteAddress),
-					Flags: []cli.Flag{
-						&cli.StringFlag{
-							Name:   "server",
-							Usage:  "custom server",
-							Hidden: true,
-						},
-						&cli.BoolFlag{
-							Name:   "insecure",
-							Usage:  "do not verify certificate",
-							Hidden: true,
-						},
-						&cli.StringFlag{
-							Name:  "region",
-							Usage: "the region to use (eu or us)",
-						},
-						&cli.BoolFlag{
-							Name:  "override",
-							Usage: "if config already exists, it will be overridden",
-							// deprecated, backward compatibility
-							Hidden: true,
-						},
-					},
+					Usage:     "connect your environment with https://academy.threedots.tech/ account",
+					ArgsUsage: fmt.Sprintf("<%s>", tokenDocs),
+					Flags:     configureFlags,
 					Action: func(c *cli.Context) error {
 						token := c.Args().First()
 
@@ -130,6 +134,10 @@ var app = &cli.App{
 						"<trainingID from %s> [directory, if empty defaults to trainingID]",
 						internal.WebsiteAddress,
 					),
+					Flags: append(configureFlags, &cli.StringFlag{
+						Name:  "token",
+						Usage: tokenDocs,
+					}),
 					Usage: "initialise training files in your current directory",
 					Action: func(c *cli.Context) error {
 						trainingID := c.Args().First()
@@ -143,7 +151,22 @@ var app = &cli.App{
 							dir = trainingID
 						}
 
-						return newHandlers(c).Init(c.Context, trainingID, dir)
+						handlers := newHandlers(c)
+
+						if c.String("token") != "" {
+							err := handlers.ConfigureGlobally(
+								c.Context,
+								c.String("token"),
+								c.String("server"),
+								c.String("region"),
+								c.Bool("insecure"),
+							)
+							if err != nil {
+								return fmt.Errorf("could not configure training: %w", err)
+							}
+						}
+
+						return handlers.Init(c.Context, trainingID, dir)
 					},
 				},
 				{
@@ -247,6 +270,14 @@ Note: after completing this exercise, the next exercise will be the last one you
 						return handlers.Jump(c.Context, exerciseID)
 					},
 				},
+				{
+					Name:      "skip",
+					Usage:     "Skip the current exercise and the rest of the module (only selected modules)",
+					ArgsUsage: "",
+					Action: func(c *cli.Context) error {
+						return newHandlers(c).Skip(c.Context)
+					},
+				},
 			},
 		},
 		{

trainings/api/protobuf/server.proto

@@ -17,6 +17,8 @@ service Trainings {
 
   rpc GetExercises(GetExercisesRequest) returns (GetExercisesResponse) {};
   rpc GetExercise(GetExerciseRequest) returns (NextExerciseResponse) {};
+
+  rpc SkipExercise(SkipExerciseRequest) returns (SkipExerciseResponse) {};
 }
 
 message InitRequest {
@@ -63,6 +65,20 @@ message NextExerciseResponse {
   repeated File files_to_create = 3;
 
   bool is_text_only = 5;
+  bool is_optional = 6;
+
+  message Module {
+    string id = 1;
+    string name = 2;
+  }
+
+  message Exercise {
+    string id = 1;
+    Module module = 2;
+    string name = 3;
+  }
+
+  Exercise exercise = 7;
 }
 
 message NextExercise {
@@ -136,6 +152,7 @@ message GetExercisesResponse {
   message Exercise {
     string id = 1;
     string name = 2;
+    bool is_skipped = 3;
   }
 
   repeated Module modules = 1;
@@ -146,3 +163,11 @@ message GetExerciseRequest {
   string token = 2;
   string exercise_id = 3;
 }
+
+message SkipExerciseRequest {
+  string training_name = 1;
+  string exercise_id = 2;
+  string token = 3;
+}
+
+message SkipExerciseResponse {}

trainings/clone.go

@@ -14,7 +14,7 @@ import (
 )
 
 func (h *Handlers) Clone(ctx context.Context, executionID string, directory string) error {
-	resp, err := h.newGrpcClient(ctx).GetSolutionFiles(ctx, &genproto.GetSolutionFilesRequest{
+	resp, err := h.newGrpcClient().GetSolutionFiles(ctx, &genproto.GetSolutionFilesRequest{
 		ExecutionId: executionID,
 	})
 	if err != nil {

trainings/config/exercise.go

@@ -13,6 +13,7 @@ type ExerciseConfig struct {
 	ExerciseID string `toml:"exercise_id"`
 	Directory  string `toml:"directory"`
 	IsTextOnly bool   `toml:"is_text_only"`
+	IsOptional bool   `toml:"is_optional"`
 }
 
 func (c Config) WriteExerciseConfig(trainingRootFs afero.Fs, cfg ExerciseConfig) error {

trainings/configure.go

@@ -15,7 +15,7 @@ func (h *Handlers) ConfigureGlobally(ctx context.Context, token, serverAddr, reg
 		}
 	}
 
-	resp, err := h.newGrpcClientWithAddr(ctx, serverAddr, region, insecure).Init(
+	resp, err := h.newGrpcClientWithAddr(serverAddr, region, insecure).Init(
 		ctxWithRequestHeader(ctx, h.cliMetadata),
 		&genproto.InitRequest{
 			Token: token,