fix registry urls on generate missing images list and adds registry info to digests

cmd/release/cmd/generate.go

@@ -124,7 +124,7 @@ var rancherGenerateMissingImagesListSubCmd = &cobra.Command{
 		if len(checkImages) == 0 && imagesListURL == "" {
 			return errors.New("either --images-list-url or --check-images must be provided")
 		}
-		missingImages, err := rancher.GenerateMissingImagesList(imagesListURL, registry, concurrencyLimit, checkImages, ignoreImages)
+		missingImages, err := rancher.GenerateMissingImagesList(imagesListURL, registry, concurrencyLimit, checkImages, ignoreImages, verbose)
 		if err != nil {
 			return err
 		}
@@ -147,7 +147,7 @@ var rancherGenerateDockerImagesDigestsSubCmd = &cobra.Command{
 	Use:   "docker-images-digests",
 	Short: "Generate a file with images digests from an images list",
 	RunE: func(cmd *cobra.Command, args []string) error {
-		return rancher.GenerateDockerImageDigests(rancherImagesDigestsOutputFile, rancherImagesDigestsImagesURL, rancherImagesDigestsRegistry)
+		return rancher.GenerateDockerImageDigests(rancherImagesDigestsOutputFile, rancherImagesDigestsImagesURL, rancherImagesDigestsRegistry, verbose)
 	},
 }
 

cmd/release/cmd/root.go

@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"fmt"
-	"log"
 	"os"
 	"strings"
 
@@ -15,6 +14,7 @@ var (
 	dryRun         bool
 	ignoreValidate bool
 	rootConfig     *config.Config
+	verbose        bool
 	configFile     string
 	stringConfig   string
 )
@@ -44,6 +44,7 @@ func SetVersion(version string) {
 func init() {
 	rootCmd.PersistentFlags().BoolVarP(&debug, "debug", "D", false, "Debug")
 	rootCmd.PersistentFlags().BoolVarP(&dryRun, "dry-run", "R", false, "Dry Run")
+	rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "V", false, "Verbose output")
 	rootCmd.PersistentFlags().BoolVarP(&ignoreValidate, "ignore-validate", "I", false, "Ignore the validate config step")
 	rootCmd.PersistentFlags().StringVarP(&configFile, "config-file", "c", "$HOME/.ecm-distro-tools/config.json", "Path for the config.json file")
 	rootCmd.PersistentFlags().StringVarP(&stringConfig, "config", "C", "", "JSON config string")
@@ -67,7 +68,7 @@ func initConfig() {
 		configFile = os.ExpandEnv(configFile)
 		conf, err = config.Load(configFile)
 		if err != nil {
-			log.Println("failed to load config, use 'release config gen' to create a new one at: " + configFile)
+			fmt.Println("failed to load config, use 'release config gen' to create a new one at: " + configFile)
 			fmt.Println(err)
 			os.Exit(1)
 		}

log/log.go

@@ -0,0 +1,32 @@
+package log
+
+import "fmt"
+
+type Logger struct {
+	verbose bool
+}
+
+func NewLogger(verbose bool) Logger {
+	return Logger{verbose: verbose}
+}
+
+func (l Logger) Print(a ...any) (int, error) {
+	if l.verbose {
+		return fmt.Print(a...)
+	}
+	return 0, nil
+}
+
+func (l Logger) Printf(format string, a ...any) (int, error) {
+	if l.verbose {
+		return fmt.Printf(format, a...)
+	}
+	return 0, nil
+}
+
+func (l Logger) Println(a ...any) (int, error) {
+	if l.verbose {
+		return fmt.Println(a...)
+	}
+	return 0, nil
+}

release/rancher/rancher.go

@@ -12,7 +12,6 @@ import (
 	"io"
 	"io/ioutil"
 	"log"
-	"log/slog"
 	"net/http"
 	"os"
 	"path"
@@ -28,6 +27,7 @@ import (
 	"github.com/google/go-github/v39/github"
 	ecmConfig "github.com/rancher/ecm-distro-tools/cmd/release/config"
 	ecmHTTP "github.com/rancher/ecm-distro-tools/http"
+	ecmLog "github.com/rancher/ecm-distro-tools/log"
 	"github.com/rancher/ecm-distro-tools/release"
 	"github.com/rancher/ecm-distro-tools/repository"
 	"golang.org/x/mod/semver"
@@ -386,7 +386,8 @@ func formatContentLine(line string) string {
 	return strings.TrimSpace(line)
 }
 
-func GenerateMissingImagesList(imagesListURL, registry string, concurrencyLimit int, checkImages, ignoreImages []string) ([]string, error) {
+func GenerateMissingImagesList(imagesListURL, registry string, concurrencyLimit int, checkImages, ignoreImages []string, verbose bool) ([]string, error) {
+	log := ecmLog.NewLogger(verbose)
 	if len(checkImages) == 0 {
 		if imagesListURL == "" {
 			return nil, errors.New("if no images are provided, an images list URL must be provided")
@@ -413,6 +414,11 @@ func GenerateMissingImagesList(imagesListURL, registry string, concurrencyLimit
 	repositoryAuths := make(map[string]string)
 	mu := sync.RWMutex{}
 
+	rgInfo, ok := registriesInfo[registry]
+	if !ok {
+		return nil, errors.New("registry must be one of the following: 'docker.io', 'registry.rancher.com' or 'stgregistry.suse.com'")
+	}
+
 	for _, imageAndVersion := range checkImages {
 		image, imageVersion, err := splitImageAndVersion(imageAndVersion)
 		if err != nil {
@@ -441,7 +447,7 @@ func GenerateMissingImagesList(imagesListURL, registry string, concurrencyLimit
 
 					auth, ok = repositoryAuths[image]
 					if !ok {
-						auth, err = registryAuth(sccSUSEURL, sccSUSEService, image)
+						auth, err = registryAuth(rgInfo.AuthURL, rgInfo.Service, image)
 						if err != nil {
 							cancel()
 							return err
@@ -450,7 +456,7 @@ func GenerateMissingImagesList(imagesListURL, registry string, concurrencyLimit
 					}
 					mu.Unlock()
 
-					exists, err := checkIfImageExists(rancherRegistryBaseURL, image, imageVersion, auth)
+					exists, err := checkIfImageExists(rgInfo.BaseURL, image, imageVersion, auth)
 					if err != nil {
 						cancel()
 						return err
@@ -521,7 +527,7 @@ func validateRepoImage(repoImage string) error {
 	return nil
 }
 
-func GenerateDockerImageDigests(outputFile, imagesFileURL, registry string) error {
+func GenerateDockerImageDigests(outputFile, imagesFileURL, registry string, verbose bool) error {
 	imagesDigests, err := dockerImagesDigests(imagesFileURL, registry)
 	if err != nil {
 		return err
@@ -547,7 +553,6 @@ func dockerImagesDigests(imagesFileURL, registry string) (imageDigest, error) {
 		if imageAndVersion == "" || imageAndVersion == " " {
 			continue
 		}
-		slog.Info("image: " + imageAndVersion)
 		if !strings.Contains(imageAndVersion, ":") {
 			return nil, errors.New("malformed image name: , missing ':'")
 		}
@@ -562,12 +567,12 @@ func dockerImagesDigests(imagesFileURL, registry string) (imageDigest, error) {
 			}
 			repositoryAuths[image] = auth
 		}
-		digest, statusCode, err := dockerImageDigest(rgInfo.BaseURL, image, imageVersion, repositoryAuths[image])
-		slog.Info("status code: " + strconv.Itoa(statusCode))
+		digest, _, err := dockerImageDigest(rgInfo.BaseURL, image, imageVersion, repositoryAuths[image])
 		if err != nil {
 			return nil, err
 		}
-		imagesDigests[imageAndVersion] = digest
+		// e.g: registry.rancher.com/rancher/rancher:v2.9.0 = sha256:1234567890
+		imagesDigests[registry+"/"+imageAndVersion] = digest
 	}
 	return imagesDigests, nil
 }