feat: multiple registries

Author: MarcStdt

.vscode/launch.json

@@ -325,6 +325,21 @@
                 "${workspaceFolder}/examples/scroll-cwd-pull/", "artifacts.druid.gg/druid-team/scroll-minecraft-forge:1.20.1",
             ],
         },
+        {
+            "name": "Debug Daemon run registry login",
+            "type": "go",
+            "request": "launch",
+            "mode": "debug",
+            "console": "integratedTerminal",
+            "program": "${workspaceFolder}/main.go",
+            "args": [
+                "registry",
+                "login",
+                "--host", "artifacts.druid.gg/my-project",
+                "--user", "myuser",
+                "--password", "mypass"
+            ],
+        },
         {
             "name": "Debug Daemon run registry push meta",
             "type": "go",

Makefile

@@ -4,12 +4,12 @@ VERSION ?= "dev"
 
 generate-api: ## Generate API types from OpenAPI spec
 	@echo "Generating API types from OpenAPI spec..."
-	@which oapi-codegen > /dev/null || (echo "Installing oapi-codegen..." && go install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@latest)
+	@which oapi-codegen > /dev/null || (echo "Installing oapi-codegen..." && go install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@v2.5.1)
 	@PATH="$(shell go env GOPATH)/bin:$$PATH" oapi-codegen -config api/oapi-codegen.yaml api/openapi.yaml
 
 validate-api: ## Validate OpenAPI spec
 	@echo "Validating OpenAPI spec..."
-	@which oapi-codegen > /dev/null || (echo "Installing oapi-codegen..." && go install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@latest)
+	@which oapi-codegen > /dev/null || (echo "Installing oapi-codegen..." && go install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@v2.5.1)
 	@PATH="$(shell go env GOPATH)/bin:$$PATH" oapi-codegen -config api/oapi-codegen.yaml api/openapi.yaml > /dev/null
 	@echo "✓ OpenAPI spec is valid"
 

cmd/registry_login.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"github.com/highcard-dev/daemon/internal/core/domain"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -12,26 +13,45 @@ var registryPassword string
 var LoginCommand = &cobra.Command{
 	Use:   "login",
 	Short: "Login to OCI registry",
-	RunE: func(cmd *cobra.Command, args []string) error {
-
-		viper.Set("registry.host", registryHost)
-		viper.Set("registry.user", registryUser)
-		viper.Set("registry.password", registryPassword)
-
-		//TODO: validate credentials
-
-		err := viper.WriteConfig()
+	Long: `Add or update registry credentials in the configuration.
+Supports multiple registries with path-based credential matching.
 
-		return err
+Examples:
+  druid registry login --host registry-1.docker.io -u user -p pass
+  druid registry login --host artifacts.druid.gg/project1 -u user1 -p pass1
+  druid registry login --host artifacts.druid.gg/project2 -u user2 -p pass2`,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		var registries []domain.RegistryCredential
+		viper.UnmarshalKey("registries", &registries)
+
+		newCred := domain.RegistryCredential{
+			Host:     registryHost,
+			Username: registryUser,
+			Password: registryPassword,
+		}
+
+		found := false
+		for i := range registries {
+			if registries[i].Host == registryHost {
+				registries[i] = newCred
+				found = true
+				break
+			}
+		}
+
+		if !found {
+			registries = append(registries, newCred)
+		}
+
+		viper.Set("registries", registries)
+
+		return viper.WriteConfig()
 	},
 }
 
 func init() {
-
-	LoginCommand.Flags().StringVarP(&registryHost, "host", "", "", "OCI registry host")
-
+	LoginCommand.Flags().StringVarP(&registryHost, "host", "", "", "OCI registry host (e.g., artifacts.druid.gg/project1)")
 	LoginCommand.Flags().StringVarP(&registryUser, "user", "u", "", "username")
-
 	LoginCommand.Flags().StringVarP(&registryPassword, "password", "p", "", "User password")
 
 	LoginCommand.MarkFlagRequired("host")

cmd/registry_pull.go

@@ -6,7 +6,6 @@ import (
 	"github.com/highcard-dev/daemon/internal/core/services/registry"
 	"github.com/highcard-dev/daemon/internal/utils/logger"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
 var PullCommand = &cobra.Command{
@@ -17,11 +16,7 @@ var PullCommand = &cobra.Command{
 
 		artifact := args[0]
 
-		user := viper.GetString("registry.user")
-		password := viper.GetString("registry.password")
-		host := viper.GetString("registry.host")
-
-		registryClient := registry.NewOciClient(host, user, password)
+		registryClient := registry.NewOciClient(LoadRegistryStore())
 
 		err := registryClient.Pull(filepath.Join(cwd, ".scroll"), artifact)
 		if err != nil {

cmd/registry_push.go

@@ -10,7 +10,6 @@ import (
 	"github.com/highcard-dev/daemon/internal/core/services/registry"
 	"github.com/highcard-dev/daemon/internal/utils/logger"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"go.uber.org/zap"
 )
 
@@ -28,12 +27,9 @@ var PushCommand = &cobra.Command{
 	Args:  cobra.MaximumNArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
 
-		user := viper.GetString("registry.user")
-		password := viper.GetString("registry.password")
-		host := viper.GetString("registry.host")
-
-		if user == "" || password == "" || host == "" {
-			return fmt.Errorf("registry host, user and password must be set. Please use `druid registry login` to set them")
+		credStore := LoadRegistryStore()
+		if !credStore.HasCredentials() {
+			return fmt.Errorf("no registry credentials configured. Please use `druid registry login` to set them")
 		}
 
 		folder := "."
@@ -49,9 +45,9 @@ var PushCommand = &cobra.Command{
 			return err
 		}
 
-		logger.Log().Info("Pushing "+scroll.Name+" to registry", zap.String("path", fullPath), zap.String("registry", host))
+		logger.Log().Info("Pushing "+scroll.Name+" to registry", zap.String("path", fullPath))
 
-		ociClient := registry.NewOciClient(host, user, password)
+		ociClient := registry.NewOciClient(credStore)
 
 		repo := scroll.Name
 
@@ -93,7 +89,7 @@ var PushCommand = &cobra.Command{
 			time.Sleep(time.Duration(tries+1) * time.Second)
 		}
 
-		logger.Log().Info("Pushed "+scroll.Name+" to registry", zap.String("path", fullPath), zap.String("registry", host))
+		logger.Log().Info("Pushed "+scroll.Name+" to registry", zap.String("path", fullPath))
 		return nil
 	},
 }

cmd/registry_push_meta.go

@@ -7,7 +7,6 @@ import (
 	"github.com/highcard-dev/daemon/internal/core/services/registry"
 	"github.com/highcard-dev/daemon/internal/utils/logger"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"go.uber.org/zap"
 )
 
@@ -17,12 +16,9 @@ var PushMetaCommand = &cobra.Command{
 	Args:  cobra.RangeArgs(1, 2),
 	RunE: func(cmd *cobra.Command, args []string) error {
 
-		user := viper.GetString("registry.user")
-		password := viper.GetString("registry.password")
-		host := viper.GetString("registry.host")
-
-		if user == "" || password == "" || host == "" {
-			return fmt.Errorf("registry host, user and password must be set. Please use `druid registry login` to set them")
+		credStore := LoadRegistryStore()
+		if !credStore.HasCredentials() {
+			return fmt.Errorf("no registry credentials configured. Please use `druid registry login` to set them")
 		}
 
 		artifact := args[0]
@@ -33,9 +29,9 @@ var PushMetaCommand = &cobra.Command{
 
 		fullPath := path.Join(cwd, folder)
 
-		logger.Log().Info("Pushing "+artifact+" meta to registry", zap.String("path", fullPath), zap.String("registry", host))
+		logger.Log().Info("Pushing "+artifact+" meta to registry", zap.String("path", fullPath))
 
-		ociClient := registry.NewOciClient(host, user, password)
+		ociClient := registry.NewOciClient(credStore)
 
 		_, err := ociClient.PushMeta(fullPath, artifact)
 

cmd/root.go

@@ -3,13 +3,16 @@ package cmd
 import (
 	"os"
 
+	"github.com/highcard-dev/daemon/internal/core/domain"
+	"github.com/highcard-dev/daemon/internal/core/services/registry"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
 
 var envPath string
 var cwd string
 var ignoreLockfileQueue bool
+var configFile string
 
 var RootCmd = &cobra.Command{
 	Use:   "druid",
@@ -22,8 +25,6 @@ var RootCmd = &cobra.Command{
 }
 
 func init() {
-
-	viper.SetDefault("registry.host", "registry-1.docker.io")
 	cobra.OnInitialize(initConfig)
 
 	RootCmd.AddCommand(ServeCommand)
@@ -43,22 +44,26 @@ func init() {
 	RootCmd.PersistentFlags().StringVarP(&cwd, "cwd", "", c, "Path to environment file (.env)")
 
 	RootCmd.PersistentFlags().StringVarP(&envPath, "env-file", "e", "./.env", "Path to environment file (.env)")
+	RootCmd.PersistentFlags().StringVar(&configFile, "config", "", "Path to config file (default: ~/.druid.yaml)")
 	RootCmd.PersistentFlags().BoolVar(&ignoreVersionCheck, "ignore-version-check", false, "Ignore version check between scroll.yaml and scroll-lock.json")
 	RootCmd.PersistentFlags().BoolVar(&ignoreLockfileQueue, "ignore-lockfile-queue", false, "Skip queuing the lock file")
 
 }
 
 func initConfig() {
-	home, err := os.UserHomeDir()
-	cobra.CheckErr(err)
+	viper.AutomaticEnv()
 
-	viper.SetConfigType("yaml")
-	viper.SetConfigName(".druid")
+	if configFile != "" {
+		viper.SetConfigFile(configFile)
+	} else {
+		home, err := os.UserHomeDir()
+		cobra.CheckErr(err)
 
-	// Search config in home directory with name ".cobra" (without extension).
-	viper.AddConfigPath(home)
+		viper.SetConfigType("yaml")
+		viper.SetConfigName(".druid")
+		viper.AddConfigPath(home)
+	}
 
-	viper.AutomaticEnv()
 	viper.SafeWriteConfig()
 	viper.ReadInConfig()
 }
@@ -68,3 +73,24 @@ func Execute() {
 		os.Exit(1)
 	}
 }
+
+func LoadRegistryStore() *registry.CredentialStore {
+	var registries []domain.RegistryCredential
+	viper.UnmarshalKey("registries", &registries)
+
+	if len(registries) == 0 {
+		host := viper.GetString("registry.host")
+		user := viper.GetString("registry.user")
+		password := viper.GetString("registry.password")
+
+		if host != "" {
+			registries = append(registries, domain.RegistryCredential{
+				Host:     host,
+				Username: user,
+				Password: password,
+			})
+		}
+	}
+
+	return registry.NewCredentialStore(registries)
+}

cmd/run.go

@@ -8,7 +8,6 @@ import (
 	snapshotService "github.com/highcard-dev/daemon/internal/core/services/snapshot"
 	"github.com/highcard-dev/daemon/internal/utils/logger"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"go.uber.org/zap"
 )
 
@@ -20,11 +19,7 @@ var RunCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		command := args[0]
 
-		host := viper.GetString("registry.host")
-		user := viper.GetString("registry.user")
-		password := viper.GetString("registry.password")
-
-		client := registry.NewOciClient(host, user, password)
+		client := registry.NewOciClient(LoadRegistryStore())
 
 		ctx := cmd.Context()
 

cmd/serve.go

@@ -19,7 +19,6 @@ import (
 	"github.com/highcard-dev/daemon/internal/signals"
 	"github.com/highcard-dev/daemon/internal/utils/logger"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"go.uber.org/zap"
 )
 
@@ -60,11 +59,7 @@ to interact and monitor the Scroll Application`,
 			return err
 		}
 
-		host := viper.GetString("registry.host")
-		user := viper.GetString("registry.user")
-		password := viper.GetString("registry.password")
-
-		client := registry.NewOciClient(host, user, password)
+		client := registry.NewOciClient(LoadRegistryStore())
 		logManager := services.NewLogManager()
 		consoleService := services.NewConsoleManager(logManager)
 

cmd/update.go

@@ -11,7 +11,6 @@ import (
 	"github.com/highcard-dev/daemon/internal/utils/logger"
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
 var UpdateCommand = &cobra.Command{
@@ -39,11 +38,7 @@ var UpdateCommand = &cobra.Command{
 		//ctx := context.Background()
 		logger.Log().Info("Checking for updates for " + artifact)
 
-		host := viper.GetString("registry.host")
-		user := viper.GetString("registry.user")
-		password := viper.GetString("registry.password")
-
-		registryClient := registry.NewOciClient(host, user, password)
+		registryClient := registry.NewOciClient(LoadRegistryStore())
 
 		canUpdate := false