refactor: ensure Viper is initialized only once

Before this change we have two separate methods, one for initializing
Viper - InitViper, and another to retrieve it - GetViper. This may lead
to either Viper not being initiated, thus leading to nil pointer
dereference error or initializing more than once.

After this change, we will ensure Viper is initialized only once.

Signed-off-by: Maciej Szulik <[email protected]>

src/cmd/common/viper.go

@@ -116,13 +116,8 @@ var (
 	vConfigError error
 )
 
-// InitViper initializes the viper singleton for the CLI
-func InitViper() *viper.Viper {
-	// Already initialized by some other command
-	if v != nil {
-		return v
-	}
-
+// initializes the viper singleton for the CLI
+func initViper() *viper.Viper {
 	v = viper.New()
 
 	// Skip for vendor-only commands or the version command
@@ -159,6 +154,10 @@ func InitViper() *viper.Viper {
 
 // GetViper returns the viper singleton
 func GetViper() *viper.Viper {
+	if v == nil {
+		v = initViper()
+	}
+
 	return v
 }
 

src/cmd/initialize.go

@@ -45,7 +45,7 @@ func NewInitCommand() *cobra.Command {
 		RunE:    o.Run,
 	}
 
-	v := common.InitViper()
+	v := common.GetViper()
 
 	// Init package variable defaults that are non-zero values
 	// NOTE: these are not in common.setDefaults so that zarf tools update-creds does not erroneously update values back to the default

src/cmd/package.go

@@ -43,7 +43,7 @@ func NewPackageCommand() *cobra.Command {
 		Short:   lang.CmdPackageShort,
 	}
 
-	v := common.InitViper()
+	v := common.GetViper()
 
 	persistentFlags := cmd.PersistentFlags()
 	persistentFlags.IntVar(&config.CommonOptions.OCIConcurrency, "oci-concurrency", v.GetInt(common.VPkgOCIConcurrency), lang.CmdPackageFlagConcurrency)

src/cmd/root.go

@@ -178,7 +178,7 @@ func init() {
 		return
 	}
 
-	v := common.InitViper()
+	v := common.GetViper()
 
 	// Logs
 	rootCmd.PersistentFlags().StringVarP(&LogLevelCLI, "log-level", "l", v.GetString(common.VLogLevel), lang.RootCmdFlagLogLevel)