.changes/unreleased/Added-20250316-234047.yaml

@@ -1,3 +0,0 @@
-kind: Added
-body: Variable support. Can be referenced with `%{var:nameOfVar}%` in select string fields.
-time: 2025-03-16T23:40:47.248328622-05:00

pkg/backy/config.go

@@ -103,12 +103,6 @@ func (opts *ConfigOpts) ReadConfig() *ConfigOpts {
 
 	backyKoanf := opts.koanf
 
-	if backyKoanf.Exists("variables") {
-		unmarshalConfig(backyKoanf, "variables", &opts.Vars, opts.Logger)
-	}
-
-	getConfigDir(opts)
-
 	opts.loadEnv()
 
 	if backyKoanf.Bool(getNestedConfig("logging", "cmd-std-out")) {
@@ -143,11 +137,6 @@ func (opts *ConfigOpts) ReadConfig() *ConfigOpts {
 
 	resolveHostConfigs(opts)
 
-	for k, v := range opts.Vars {
-		v = getExternalConfigDirectiveValue(v, opts)
-		opts.Vars[k] = v
-	}
-
 	loadCommandLists(opts, backyKoanf)
 
 	validateCommandLists(opts)
@@ -293,22 +282,16 @@ func resolveProxyHosts(host *Host, opts *ConfigOpts) {
 	}
 }
 
-func getConfigDir(opts *ConfigOpts) {
-	if isRemoteURL(opts.ConfigFilePath) {
-		p, _ := getRemoteDir(opts.ConfigFilePath)
-		opts.ConfigDir = p
-	} else {
-		opts.ConfigDir = path.Dir(opts.ConfigFilePath)
-	}
-}
-
 func loadCommandLists(opts *ConfigOpts, backyKoanf *koanf.Koanf) {
 	var listConfigFiles []string
 	var u *url.URL
 	var p string
+	// if config file is remote, use the directory of the remote file
 	if isRemoteURL(opts.ConfigFilePath) {
 		p, u = getRemoteDir(opts.ConfigFilePath)
 		opts.ConfigDir = p
+		println(p)
+		// // Still use local list files if a remote config file is used, but use them last
 		listConfigFiles = []string{u.JoinPath("lists.yml").String(), u.JoinPath("lists.yaml").String()}
 	} else {
 		opts.ConfigDir = path.Dir(opts.ConfigFilePath)
@@ -496,10 +479,7 @@ func processCmds(opts *ConfigOpts) error {
 
 	// process commands
 	for cmdName, cmd := range opts.Cmds {
-		for i, v := range cmd.Args {
-			v = replaceVarInString(opts.Vars, v, opts.Logger)
-			cmd.Args[i] = v
-		}
+
 		if cmd.Name == "" {
 			cmd.Name = cmdName
 		}
@@ -524,10 +504,6 @@ func processCmds(opts *ConfigOpts) error {
 
 		// resolve hosts
 		if cmd.Host != nil {
-			cmdHost := replaceVarInString(opts.Vars, *cmd.Host, opts.Logger)
-			if cmdHost != *cmd.Host {
-				cmd.Host = &cmdHost
-			}
 			host, hostFound := opts.Hosts[*cmd.Host]
 			if hostFound {
 				cmd.RemoteHost = host
@@ -587,7 +563,7 @@ func processCmds(opts *ConfigOpts) error {
 			if cmd.Username == "" {
 				return fmt.Errorf("username is required for user command %s", cmd.Name)
 			}
-			cmd.Username = replaceVarInString(opts.Vars, cmd.Username, opts.Logger)
+
 			err := detectOSType(cmd, opts)
 			if err != nil {
 				opts.Logger.Info().Err(err).Str("command", cmdName).Send()
@@ -713,18 +689,3 @@ func keyNotSupported(oldKey, newKey string, koanf *koanf.Koanf, opts *ConfigOpts
 		}
 	}
 }
-
-func replaceVarInString(vars map[string]string, str string, logger zerolog.Logger) string {
-	if strings.Contains(str, "%{var:") && strings.Contains(str, "}%") {
-		logger.Debug().Msgf("replacing vars in string %s", str)
-		for k, v := range vars {
-			if strings.Contains(str, "%{var:"+k+"}%") {
-				str = strings.ReplaceAll(str, "%{var:"+k+"}%", v)
-			}
-		}
-		if strings.Contains(str, "%{var:") && strings.Contains(str, "}%") {
-			logger.Warn().Msg("could not replace all vars in string")
-		}
-	}
-	return str
-}

pkg/backy/types.go

@@ -205,8 +205,6 @@ type (
 
 		List ListConfig
 
-		Vars map[string]string `yaml:"variables"`
-
 		VaultKeys []*VaultKey `yaml:"keys"`
 
 		koanf *koanf.Koanf

pkg/backy/utils.go

@@ -362,7 +362,6 @@ func getExternalConfigDirectiveValue(key string, opts *ConfigOpts) string {
 	if !(strings.HasPrefix(key, externDirectiveStart) && strings.HasSuffix(key, externDirectiveEnd)) {
 		return key
 	}
-	key = replaceVarInString(opts.Vars, key, opts.Logger)
 	opts.Logger.Debug().Str("expanding external key", key).Send()
 	if strings.HasPrefix(key, envExternDirectiveStart) {
 		key = strings.TrimPrefix(key, envExternDirectiveStart)