add validations and test

Signed-off-by: Yaroslav Pershin <[email protected]>

Author: iapershin

client/cmd/trdl/add.go

@@ -16,22 +16,17 @@ func addCmd() *cobra.Command {
 		Short:                 "Add a software repository",
 		DisableFlagsInUseLine: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if err := cobra.ExactArgs(4)(cmd, args); err != nil {
-				PrintHelp(cmd)
-				return err
+			addArgs, err := parseAddCommandArgs(cmd, args)
+			if err != nil {
+				return fmt.Errorf("unable to parse command arguments: %w", err)
 			}
 
-			repoName := args[0]
-			repoUrl := args[1]
-			rootVersionArg := args[2]
-			rootSha512 := args[3]
-
-			if repoName == trdl.SelfUpdateDefaultRepo {
+			if addArgs.repoName == trdl.SelfUpdateDefaultRepo {
 				PrintHelp(cmd)
 				return fmt.Errorf("reserved repository name %q cannot be used", trdl.SelfUpdateDefaultRepo)
 			}
 
-			rootVersion, err := parseRootVersionArgument(rootVersionArg)
+			rootVersion, err := parseRootVersionArgument(addArgs.rootVersionArg)
 			if err != nil {
 				PrintHelp(cmd)
 				return fmt.Errorf("unable to parse required argument \"ROOT_VERSION\": %w", err)
@@ -42,7 +37,7 @@ func addCmd() *cobra.Command {
 				return fmt.Errorf("unable to initialize trdl client: %w", err)
 			}
 
-			if err := c.AddRepo(repoName, repoUrl, rootVersion, rootSha512); err != nil {
+			if err := c.AddRepo(addArgs.repoName, addArgs.repoUrl, rootVersion, addArgs.rootSha512); err != nil {
 				return err
 			}
 
@@ -53,6 +48,47 @@ func addCmd() *cobra.Command {
 	return cmd
 }
 
+type addCommandArgs struct {
+	repoName       string
+	repoUrl        string
+	rootVersionArg string
+	rootSha512     string
+}
+
+func parseAddCommandArgs(cmd *cobra.Command, args []string) (*addCommandArgs, error) {
+	if len(args) != 2 && len(args) != 4 {
+		PrintHelp(cmd)
+		return nil, fmt.Errorf("expected 2 or 4 arguments: REPO URL [ROOT_VERSION ROOT_SHA512], got %d", len(args))
+	}
+
+	repoName := args[0]
+	repoUrl := args[1]
+
+	var rootVersionArg, rootSha512 string
+
+	if len(args) == 4 {
+		rootVersionArg = args[2]
+		rootSha512 = args[3]
+
+		if !govalidator.IsNumeric(rootVersionArg) {
+			PrintHelp(cmd)
+			return nil, fmt.Errorf("ROOT_VERSION must be numeric: %q", rootVersionArg)
+		}
+
+		if rootSha512 == "" {
+			PrintHelp(cmd)
+			return nil, fmt.Errorf("ROOT_SHA512 must not be empty")
+		}
+	}
+
+	return &addCommandArgs{
+		repoName:       repoName,
+		repoUrl:        repoUrl,
+		rootVersionArg: rootVersionArg,
+		rootSha512:     rootSha512,
+	}, nil
+}
+
 func parseRootVersionArgument(arg string) (int64, error) {
 	if arg == "" {
 		return 0, nil

e2e/tests/flow/complete_cycle_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	_ "embed"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"net/http"
 	"os/exec"
@@ -250,18 +251,21 @@ var _ = Describe("Complete cycle", func() {
 	}
 
 	clientAdd := func(repo string, rootVersion int) {
-		resp, err := http.Get(minioRepoAddress + fmt.Sprintf("/%d.root.json", rootVersion))
-		Ω(err).ShouldNot(HaveOccurred())
-		defer func() { _ = resp.Body.Close() }()
-
-		data, err := ioutil.ReadAll(resp.Body)
-		Ω(err).ShouldNot(HaveOccurred())
-		rootRoleSha512 := clientUtil.Sha512Checksum(data)
+		cmdArgs := []string{"add", repo, minioRepoAddress}
+		if rootVersion > 0 {
+			resp, err := http.Get(minioRepoAddress + fmt.Sprintf("/%d.root.json", rootVersion))
+			Ω(err).ShouldNot(HaveOccurred())
+			defer func() { _ = resp.Body.Close() }()
+			data, err := io.ReadAll(resp.Body)
+			Ω(err).ShouldNot(HaveOccurred())
+			rootRoleSha512 := clientUtil.Sha512Checksum(data)
+			cmdArgs = append(cmdArgs, fmt.Sprintf("%d", rootVersion), rootRoleSha512)
+		}
 
 		testutil.RunSucceedCommand(
 			testDir,
 			trdlBinPath,
-			"add", repo, minioRepoAddress, fmt.Sprintf("%d", rootVersion), rootRoleSha512,
+			cmdArgs...,
 		)
 	}
 
@@ -434,7 +438,7 @@ script.sh
 		}
 
 		By("[client] Adding repo ...")
-		clientAdd(repo, 1)
+		clientAdd(repo, 0)
 
 		By("[server] Publishing channels ...")
 		{