mirror: overhaul validation errors

Signed-off-by: Maxim Vasilenko <[email protected]>

Author: mvasl

internal/mirror/cmd/pull/validation.go

@@ -19,15 +19,20 @@ package pull
 import (
 	"errors"
 	"fmt"
+	"net/url"
 	"os"
 	"path/filepath"
 
 	"github.com/Masterminds/semver/v3"
+	"github.com/google/go-containerregistry/pkg/name"
 	"github.com/spf13/cobra"
 )
 
 func parseAndValidateParameters(_ *cobra.Command, args []string) error {
 	var err error
+	if err = validateSourceRegistry(); err != nil {
+		return err
+	}
 	if err = parseAndValidateVersionFlags(); err != nil {
 		return err
 	}
@@ -44,6 +49,31 @@ func parseAndValidateParameters(_ *cobra.Command, args []string) error {
 	return nil
 }
 
+func validateSourceRegistry() error {
+	if SourceRegistryRepo == enterpriseEditionRepo {
+		return nil // Default is fine
+	}
+
+	// We first validate that passed repository reference is correct and can be parsed
+	if _, err := name.NewRepository(SourceRegistryRepo); err != nil {
+		return fmt.Errorf("Validate registry address: %w", err)
+	}
+
+	// Then we parse it as URL to validate that it contains everything we need
+	registryUrl, err := url.ParseRequestURI("docker://" + SourceRegistryRepo)
+	if err != nil {
+		return fmt.Errorf("Validate source registry parameter: %w", err)
+	}
+	if registryUrl.Host == "" {
+		return errors.New("--source you provided contains no registry host. Please specify source registry host address correctly.")
+	}
+	if registryUrl.Path == "" {
+		return errors.New("--source you provided contains no registry path. Please specify source registry repo path correctly.")
+	}
+
+	return nil
+}
+
 func validateImagesBundlePathArg(args []string) error {
 	if len(args) != 1 {
 		return errors.New("This command requires exactly 1 argument")
@@ -74,7 +104,7 @@ func validateImagesBundlePathArg(args []string) error {
 		return fmt.Errorf("Read bundle directory: %w", err)
 	}
 
-	if len(dirEntries) == 0 || (len(dirEntries) == 1 && dirEntries[0].Name() == ".tmp" &&  dirEntries[0].IsDir()) {
+	if len(dirEntries) == 0 || (len(dirEntries) == 1 && dirEntries[0].Name() == ".tmp" && dirEntries[0].IsDir()) {
 		return nil
 	}
 

internal/mirror/cmd/push/validation.go

@@ -24,6 +24,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/google/go-containerregistry/pkg/name"
 	"github.com/samber/lo"
 	"github.com/spf13/cobra"
 )
@@ -89,17 +90,23 @@ func parseAndValidateRegistryURLArg(args []string) error {
 		return errors.New("<registry> argument is empty")
 	}
 
+	// We first validate that passed repository reference is correct and can be parsed
+	if _, err := name.NewRepository(registry); err != nil {
+		return fmt.Errorf("Validate registry address: %w", err)
+	}
+
+	// Then we parse it as URL to validate that it contains everything we need
 	registryUrl, err := url.ParseRequestURI("docker://" + registry)
 	if err != nil {
 		return fmt.Errorf("Validate registry address: %w", err)
 	}
 	RegistryHost = registryUrl.Host
 	RegistryPath = registryUrl.Path
 	if RegistryHost == "" {
-		return errors.New("--registry you provided contains no registry host. Please specify registry address correctly.")
+		return errors.New("<registry> you provided contains no registry host. Please specify registry address correctly.")
 	}
-	if RegistryPath == "" {
-		return errors.New("--registry you provided contains no path to repo. Please specify registry repo path correctly.")
+	if len(RegistryPath) < 2 || len(RegistryPath) > 255 {
+		return errors.New("repository part must be between 2 and 255 characters in length. Please specify registry repo path correctly.")
 	}
 
 	return nil

internal/mirror/operations/pull_modules.go

@@ -48,6 +48,11 @@ func PullModules(pullParams *params.PullParams, filter *modules.Filter) error {
 	if err != nil {
 		return fmt.Errorf("Find modules: %w", err)
 	}
+
+	if len(modulesData) == 0 {
+		return fmt.Errorf("Modules were not found, check your source repository address and modules path suffix")
+	}
+
 	logger.InfoF("Repo contains %d modules: %s", len(modulesData), formatModulesList(modulesData))
 
 	logger.InfoLn("Creating OCI Layouts")