fix: enable env vars in setup steps (and deprecate admin subcommand) (#3871)

* fix: enable env vars in setup steps (and deprecate admin subcommand)

* fix tests and error text

cmd/admin/admin.go

@@ -6,17 +6,18 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/zitadel/zitadel/cmd/admin/initialise"
-	"github.com/zitadel/zitadel/cmd/admin/key"
-	"github.com/zitadel/zitadel/cmd/admin/setup"
-	"github.com/zitadel/zitadel/cmd/admin/start"
+	"github.com/zitadel/zitadel/cmd/initialise"
+	"github.com/zitadel/zitadel/cmd/key"
+	"github.com/zitadel/zitadel/cmd/setup"
+	"github.com/zitadel/zitadel/cmd/start"
 )
 
 func New() *cobra.Command {
 	adminCMD := &cobra.Command{
-		Use:   "admin",
-		Short: "The ZITADEL admin CLI lets you interact with your instance",
-		Long:  `The ZITADEL admin CLI lets you interact with your instance`,
+		Use:        "admin",
+		Short:      "The ZITADEL admin CLI lets you interact with your instance",
+		Long:       `The ZITADEL admin CLI lets you interact with your instance`,
+		Deprecated: "please use subcommands directly, e.g. `zitadel start`",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return errors.New("no additional command provided")
 		},

cmd/initialise/config.go

@@ -3,6 +3,7 @@ package initialise
 import (
 	"github.com/spf13/viper"
 	"github.com/zitadel/logging"
+
 	"github.com/zitadel/zitadel/internal/database"
 	"github.com/zitadel/zitadel/internal/id"
 )

cmd/setup/config.go

@@ -58,9 +58,9 @@ type encryptionKeyConfig struct {
 }
 
 func MustNewSteps(v *viper.Viper) *Steps {
-	viper.AutomaticEnv()
-	viper.SetEnvPrefix("ZITADEL")
-	viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
+	v.AutomaticEnv()
+	v.SetEnvPrefix("ZITADEL")
+	v.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
 	v.SetConfigType("yaml")
 	err := v.ReadConfig(bytes.NewBuffer(defaultSteps))
 	logging.OnError(err).Fatal("unable to read setup steps")

cmd/setup/setup.go

@@ -8,8 +8,8 @@ import (
 	"github.com/spf13/viper"
 	"github.com/zitadel/logging"
 
-	"github.com/zitadel/zitadel/cmd/admin/key"
-	"github.com/zitadel/zitadel/cmd/admin/tls"
+	"github.com/zitadel/zitadel/cmd/key"
+	"github.com/zitadel/zitadel/cmd/tls"
 	"github.com/zitadel/zitadel/internal/database"
 	"github.com/zitadel/zitadel/internal/eventstore"
 	"github.com/zitadel/zitadel/internal/migration"

cmd/start/flags.go

@@ -4,8 +4,8 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"github.com/zitadel/zitadel/cmd/admin/key"
-	"github.com/zitadel/zitadel/cmd/admin/tls"
+	"github.com/zitadel/zitadel/cmd/key"
+	"github.com/zitadel/zitadel/cmd/tls"
 )
 
 var tlsMode *string

cmd/start/start.go

@@ -21,8 +21,8 @@ import (
 	"golang.org/x/net/http2"
 	"golang.org/x/net/http2/h2c"
 
-	"github.com/zitadel/zitadel/cmd/admin/key"
-	cmd_tls "github.com/zitadel/zitadel/cmd/admin/tls"
+	"github.com/zitadel/zitadel/cmd/key"
+	cmd_tls "github.com/zitadel/zitadel/cmd/tls"
 	admin_es "github.com/zitadel/zitadel/internal/admin/repository/eventsourcing"
 	"github.com/zitadel/zitadel/internal/api"
 	"github.com/zitadel/zitadel/internal/api/assets"

cmd/start/start_from_init.go

@@ -5,10 +5,10 @@ import (
 	"github.com/spf13/viper"
 	"github.com/zitadel/logging"
 
-	"github.com/zitadel/zitadel/cmd/admin/initialise"
-	"github.com/zitadel/zitadel/cmd/admin/key"
-	"github.com/zitadel/zitadel/cmd/admin/setup"
-	"github.com/zitadel/zitadel/cmd/admin/tls"
+	"github.com/zitadel/zitadel/cmd/initialise"
+	"github.com/zitadel/zitadel/cmd/key"
+	"github.com/zitadel/zitadel/cmd/setup"
+	"github.com/zitadel/zitadel/cmd/tls"
 )
 
 func NewStartFromInit() *cobra.Command {

cmd/zitadel.go

@@ -12,6 +12,10 @@ import (
 	"github.com/zitadel/logging"
 
 	"github.com/zitadel/zitadel/cmd/admin"
+	"github.com/zitadel/zitadel/cmd/initialise"
+	"github.com/zitadel/zitadel/cmd/key"
+	"github.com/zitadel/zitadel/cmd/setup"
+	"github.com/zitadel/zitadel/cmd/start"
 )
 
 var (
@@ -41,7 +45,14 @@ func New(out io.Writer, in io.Reader, args []string) *cobra.Command {
 	cobra.OnInitialize(initConfig)
 	cmd.PersistentFlags().StringArrayVar(&configFiles, "config", nil, "path to config file to overwrite system defaults")
 
-	cmd.AddCommand(admin.New())
+	cmd.AddCommand(
+		admin.New(), //is now deprecated, remove later on
+		initialise.New(),
+		setup.New(),
+		start.New(),
+		start.NewStartFromInit(),
+		key.New(),
+	)
 
 	return cmd
 }