.changes/v0.10.2.md

@@ -1,6 +0,0 @@
-## v0.10.2 - 2025-03-19
-### Added
-* Notifications: http service added
-* Variable support. Can be referenced with `%{var:nameOfVar}%` in select string fields.
-### Changed
-* vault: initialize vault before validating config

.woodpecker/go-lint.yml

@@ -5,7 +5,7 @@ steps:
       - go build
       - go test
   release:
-    image: golangci/golangci-lint:v1.64.7
+    image: golangci/golangci-lint:v1.53.3
     commands:
       - golangci-lint run -v --timeout 5m
 

CHANGELOG.md

@@ -6,13 +6,6 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
-## v0.10.2 - 2025-03-19
-### Added
-* Notifications: http service added
-* Variable support. Can be referenced with `%{var:nameOfVar}%` in select string fields.
-### Changed
-* vault: initialize vault before validating config
-
 ## v0.10.1 - 2025-03-11
 ### Added
 * UserCommands: add ssh public keys when running locally

cmd/version.go

@@ -7,7 +7,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-const versionStr = "0.10.2"
+const versionStr = "0.10.1"
 
 var (
 	versionCmd = &cobra.Command{

go.mod

@@ -2,7 +2,9 @@ module git.andrewnw.xyz/CyberShell/backy
 
 go 1.23
 
-toolchain go1.23.7
+toolchain go1.23.6
+
+replace git.andrewnw.xyz/CyberShell/backy => /home/andrew/Projects/backy
 
 require (
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.76.0

pkg/backy/allowedexternaldirectives_enumer.go

@@ -1,145 +0,0 @@
-// Code generated by "enumer -linecomment -yaml -text -json -type=AllowedExternalDirectives"; DO NOT EDIT.
-
-package backy
-
-import (
-	"encoding/json"
-	"fmt"
-	"strings"
-)
-
-const _AllowedExternalDirectivesName = "DefaultExternalDirvaultvault-filevault-file-envfile-envfileenv"
-
-var _AllowedExternalDirectivesIndex = [...]uint8{0, 18, 23, 33, 47, 55, 59, 62}
-
-const _AllowedExternalDirectivesLowerName = "defaultexternaldirvaultvault-filevault-file-envfile-envfileenv"
-
-func (i AllowedExternalDirectives) String() string {
-	if i < 0 || i >= AllowedExternalDirectives(len(_AllowedExternalDirectivesIndex)-1) {
-		return fmt.Sprintf("AllowedExternalDirectives(%d)", i)
-	}
-	return _AllowedExternalDirectivesName[_AllowedExternalDirectivesIndex[i]:_AllowedExternalDirectivesIndex[i+1]]
-}
-
-// An "invalid array index" compiler error signifies that the constant values have changed.
-// Re-run the stringer command to generate them again.
-func _AllowedExternalDirectivesNoOp() {
-	var x [1]struct{}
-	_ = x[DefaultExternalDir-(0)]
-	_ = x[AllowedExternalDirectiveVault-(1)]
-	_ = x[AllowedExternalDirectiveVaultFile-(2)]
-	_ = x[AllowedExternalDirectiveAll-(3)]
-	_ = x[AllowedExternalDirectiveFileEnv-(4)]
-	_ = x[AllowedExternalDirectiveFile-(5)]
-	_ = x[AllowedExternalDirectiveEnv-(6)]
-}
-
-var _AllowedExternalDirectivesValues = []AllowedExternalDirectives{DefaultExternalDir, AllowedExternalDirectiveVault, AllowedExternalDirectiveVaultFile, AllowedExternalDirectiveAll, AllowedExternalDirectiveFileEnv, AllowedExternalDirectiveFile, AllowedExternalDirectiveEnv}
-
-var _AllowedExternalDirectivesNameToValueMap = map[string]AllowedExternalDirectives{
-	_AllowedExternalDirectivesName[0:18]:       DefaultExternalDir,
-	_AllowedExternalDirectivesLowerName[0:18]:  DefaultExternalDir,
-	_AllowedExternalDirectivesName[18:23]:      AllowedExternalDirectiveVault,
-	_AllowedExternalDirectivesLowerName[18:23]: AllowedExternalDirectiveVault,
-	_AllowedExternalDirectivesName[23:33]:      AllowedExternalDirectiveVaultFile,
-	_AllowedExternalDirectivesLowerName[23:33]: AllowedExternalDirectiveVaultFile,
-	_AllowedExternalDirectivesName[33:47]:      AllowedExternalDirectiveAll,
-	_AllowedExternalDirectivesLowerName[33:47]: AllowedExternalDirectiveAll,
-	_AllowedExternalDirectivesName[47:55]:      AllowedExternalDirectiveFileEnv,
-	_AllowedExternalDirectivesLowerName[47:55]: AllowedExternalDirectiveFileEnv,
-	_AllowedExternalDirectivesName[55:59]:      AllowedExternalDirectiveFile,
-	_AllowedExternalDirectivesLowerName[55:59]: AllowedExternalDirectiveFile,
-	_AllowedExternalDirectivesName[59:62]:      AllowedExternalDirectiveEnv,
-	_AllowedExternalDirectivesLowerName[59:62]: AllowedExternalDirectiveEnv,
-}
-
-var _AllowedExternalDirectivesNames = []string{
-	_AllowedExternalDirectivesName[0:18],
-	_AllowedExternalDirectivesName[18:23],
-	_AllowedExternalDirectivesName[23:33],
-	_AllowedExternalDirectivesName[33:47],
-	_AllowedExternalDirectivesName[47:55],
-	_AllowedExternalDirectivesName[55:59],
-	_AllowedExternalDirectivesName[59:62],
-}
-
-// AllowedExternalDirectivesString retrieves an enum value from the enum constants string name.
-// Throws an error if the param is not part of the enum.
-func AllowedExternalDirectivesString(s string) (AllowedExternalDirectives, error) {
-	if val, ok := _AllowedExternalDirectivesNameToValueMap[s]; ok {
-		return val, nil
-	}
-
-	if val, ok := _AllowedExternalDirectivesNameToValueMap[strings.ToLower(s)]; ok {
-		return val, nil
-	}
-	return 0, fmt.Errorf("%s does not belong to AllowedExternalDirectives values", s)
-}
-
-// AllowedExternalDirectivesValues returns all values of the enum
-func AllowedExternalDirectivesValues() []AllowedExternalDirectives {
-	return _AllowedExternalDirectivesValues
-}
-
-// AllowedExternalDirectivesStrings returns a slice of all String values of the enum
-func AllowedExternalDirectivesStrings() []string {
-	strs := make([]string, len(_AllowedExternalDirectivesNames))
-	copy(strs, _AllowedExternalDirectivesNames)
-	return strs
-}
-
-// IsAAllowedExternalDirectives returns "true" if the value is listed in the enum definition. "false" otherwise
-func (i AllowedExternalDirectives) IsAAllowedExternalDirectives() bool {
-	for _, v := range _AllowedExternalDirectivesValues {
-		if i == v {
-			return true
-		}
-	}
-	return false
-}
-
-// MarshalJSON implements the json.Marshaler interface for AllowedExternalDirectives
-func (i AllowedExternalDirectives) MarshalJSON() ([]byte, error) {
-	return json.Marshal(i.String())
-}
-
-// UnmarshalJSON implements the json.Unmarshaler interface for AllowedExternalDirectives
-func (i *AllowedExternalDirectives) UnmarshalJSON(data []byte) error {
-	var s string
-	if err := json.Unmarshal(data, &s); err != nil {
-		return fmt.Errorf("AllowedExternalDirectives should be a string, got %s", data)
-	}
-
-	var err error
-	*i, err = AllowedExternalDirectivesString(s)
-	return err
-}
-
-// MarshalText implements the encoding.TextMarshaler interface for AllowedExternalDirectives
-func (i AllowedExternalDirectives) MarshalText() ([]byte, error) {
-	return []byte(i.String()), nil
-}
-
-// UnmarshalText implements the encoding.TextUnmarshaler interface for AllowedExternalDirectives
-func (i *AllowedExternalDirectives) UnmarshalText(text []byte) error {
-	var err error
-	*i, err = AllowedExternalDirectivesString(string(text))
-	return err
-}
-
-// MarshalYAML implements a YAML Marshaler for AllowedExternalDirectives
-func (i AllowedExternalDirectives) MarshalYAML() (interface{}, error) {
-	return i.String(), nil
-}
-
-// UnmarshalYAML implements a YAML Unmarshaler for AllowedExternalDirectives
-func (i *AllowedExternalDirectives) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	var s string
-	if err := unmarshal(&s); err != nil {
-		return err
-	}
-
-	var err error
-	*i, err = AllowedExternalDirectivesString(s)
-	return err
-}

pkg/backy/backy.go

@@ -217,13 +217,7 @@ func (command *Command) RunCmd(cmdCtxLogger zerolog.Logger, opts *ConfigOpts) ([
 					command.UserHome = strings.TrimSpace(string(userHome))
 					userSshDir := fmt.Sprintf("%s/.ssh", command.UserHome)
 
-					if _, err := os.Stat(userSshDir); os.IsNotExist(err) {
+					os.MkdirAll(userSshDir, 0700)
-						err := os.MkdirAll(userSshDir, 0700)
-						if err != nil {
-							return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.OutputToLog), fmt.Errorf("error creating directory %s %v", userSshDir, err)
-						}
-					}
-
 					if _, err := os.Stat(fmt.Sprintf("%s/authorized_keys", userSshDir)); os.IsNotExist(err) {
 						_, err := os.Create(fmt.Sprintf("%s/authorized_keys", userSshDir))
 						if err != nil {
@@ -463,7 +457,7 @@ func (cmd *Command) ExecuteHooks(hookType string, opts *ConfigOpts) {
 			cmdLogger := opts.Logger.With().
 				Str("backy-cmd", v).Str("hookType", "error").
 				Logger()
-			_, _ = errCmd.RunCmd(cmdLogger, opts)
+			errCmd.RunCmd(cmdLogger, opts)
 		}
 
 	case "success":
@@ -473,7 +467,7 @@ func (cmd *Command) ExecuteHooks(hookType string, opts *ConfigOpts) {
 			cmdLogger := opts.Logger.With().
 				Str("backy-cmd", v).Str("hookType", "success").
 				Logger()
-			_, _ = successCmd.RunCmd(cmdLogger, opts)
+			successCmd.RunCmd(cmdLogger, opts)
 		}
 	case "final":
 		for _, v := range cmd.Hooks.Final {
@@ -482,7 +476,7 @@ func (cmd *Command) ExecuteHooks(hookType string, opts *ConfigOpts) {
 			cmdLogger := opts.Logger.With().
 				Str("backy-cmd", v).Str("hookType", "final").
 				Logger()
-			_, _ = finalCmd.RunCmd(cmdLogger, opts)
+			finalCmd.RunCmd(cmdLogger, opts)
 		}
 	}
 }
@@ -537,12 +531,6 @@ func logCommandOutput(command *Command, cmdOutBuf bytes.Buffer, cmdCtxLogger zer
 	return outputArr
 }
 
-func (c *Command) GetVariablesFromConf(opts *ConfigOpts) {
-	c.ScriptEnvFile = replaceVarInString(opts.Vars, c.ScriptEnvFile, opts.Logger)
-	c.Name = replaceVarInString(opts.Vars, c.Name, opts.Logger)
-	c.OutputFile = replaceVarInString(opts.Vars, c.OutputFile, opts.Logger)
-}
-
 // func executeUserCommands() []string {
 
 // }

pkg/backy/config.go

@@ -103,12 +103,6 @@ func (opts *ConfigOpts) ReadConfig() *ConfigOpts {
 
 	backyKoanf := opts.koanf
 
-	if backyKoanf.Exists("variables") {
-		unmarshalConfigIntoStruct(backyKoanf, "variables", &opts.Vars, opts.Logger)
-	}
-
-	getConfigDir(opts)
-
 	opts.loadEnv()
 
 	if backyKoanf.Bool(getNestedConfig("logging", "cmd-std-out")) {
@@ -131,23 +125,14 @@ func (opts *ConfigOpts) ReadConfig() *ConfigOpts {
 
 	log.Info().Str("config file", opts.ConfigFilePath).Send()
 
-	if err := opts.initVault(); err != nil {
+	unmarshalConfig(backyKoanf, "commands", &opts.Cmds, opts.Logger)
-		log.Err(err).Send()
-	}
-
-	unmarshalConfigIntoStruct(backyKoanf, "commands", &opts.Cmds, opts.Logger)
 
 	getCommandEnvironments(opts)
 
-	unmarshalConfigIntoStruct(backyKoanf, "hosts", &opts.Hosts, opts.Logger)
+	unmarshalConfig(backyKoanf, "hosts", &opts.Hosts, opts.Logger)
 
 	resolveHostConfigs(opts)
 
-	for k, v := range opts.Vars {
-		v = getExternalConfigDirectiveValue(v, opts)
-		opts.Vars[k] = v
-	}
-
 	loadCommandLists(opts, backyKoanf)
 
 	validateCommandLists(opts)
@@ -163,11 +148,15 @@ func (opts *ConfigOpts) ReadConfig() *ConfigOpts {
 	filterExecuteLists(opts)
 
 	if backyKoanf.Exists("notifications") {
-		unmarshalConfigIntoStruct(backyKoanf, "notifications", &opts.NotificationConf, opts.Logger)
+		unmarshalConfig(backyKoanf, "notifications", &opts.NotificationConf, opts.Logger)
 	}
 
 	opts.SetupNotify()
 
+	if err := opts.setupVault(); err != nil {
+		log.Err(err).Send()
+	}
+
 	return opts
 }
 
@@ -231,7 +220,6 @@ func setLoggingOptions(k *koanf.Koanf, opts *ConfigOpts) {
 		logFile = k.String(getLoggingKeyFromConfig("file"))
 		opts.LogFilePath = logFile
 	}
-	opts.LogFilePath = logFile
 
 	zerolog.SetGlobalLevel(zerolog.InfoLevel)
 	if isLoggingVerbose {
@@ -251,7 +239,7 @@ func setupLogger(opts *ConfigOpts) zerolog.Logger {
 	return zerolog.New(writers).With().Timestamp().Logger()
 }
 
-func unmarshalConfigIntoStruct(k *koanf.Koanf, key string, target interface{}, log zerolog.Logger) {
+func unmarshalConfig(k *koanf.Koanf, key string, target interface{}, log zerolog.Logger) {
 	if err := k.UnmarshalWithConf(key, target, koanf.UnmarshalConf{Tag: "yaml"}); err != nil {
 		logging.ExitWithMSG(fmt.Sprintf("error unmarshaling key %s into struct: %v", key, err), 1, &log)
 	}
@@ -293,22 +281,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)
@@ -331,7 +313,7 @@ func loadCommandLists(opts *ConfigOpts, backyKoanf *koanf.Koanf) {
 		if backyKoanf.Exists("cmdLists.file") {
 			loadCmdListsFile(backyKoanf, listsConfig, opts)
 		} else {
-			unmarshalConfigIntoStruct(backyKoanf, "cmdLists", &opts.CmdConfigLists, opts.Logger)
+			unmarshalConfig(backyKoanf, "cmdLists", &opts.CmdConfigLists, opts.Logger)
 		}
 	}
 }
@@ -371,7 +353,7 @@ func loadListConfigFile(filePath string, k *koanf.Koanf, opts *ConfigOpts) bool
 		return false
 	}
 
-	unmarshalConfigIntoStruct(k, "cmdLists", &opts.CmdConfigLists, opts.Logger)
+	unmarshalConfig(k, "cmdLists", &opts.CmdConfigLists, opts.Logger)
 	keyNotSupported("cmd-lists", "cmdLists", k, opts, true)
 	opts.CmdListFile = filePath
 	return true
@@ -399,7 +381,7 @@ func loadCmdListsFile(backyKoanf *koanf.Koanf, listsConfig *koanf.Koanf, opts *C
 	}
 
 	keyNotSupported("cmd-lists", "cmdLists", listsConfig, opts, true)
-	unmarshalConfigIntoStruct(listsConfig, "cmdLists", &opts.CmdConfigLists, opts.Logger)
+	unmarshalConfig(listsConfig, "cmdLists", &opts.CmdConfigLists, opts.Logger)
 	opts.Logger.Info().Str("using lists config file", opts.CmdListFile).Send()
 }
 
@@ -456,7 +438,7 @@ func getLoggingKeyFromConfig(key string) string {
 // 	return fmt.Sprintf("cmdLists.%s", list)
 // }
 
-func (opts *ConfigOpts) initVault() error {
+func (opts *ConfigOpts) setupVault() error {
 	if !opts.koanf.Bool("vault.enabled") {
 		return nil
 	}
@@ -477,7 +459,7 @@ func (opts *ConfigOpts) initVault() error {
 		token = os.Getenv("VAULT_TOKEN")
 	}
 	if strings.TrimSpace(token) == "" {
-		return fmt.Errorf("no token found. One is required. \n\nSet the config key vault.token or the environment variable VAULT_TOKEN")
+		return fmt.Errorf("no token found, but one was required. \n\nSet the config key vault.token or the environment variable VAULT_TOKEN")
 	}
 
 	client.SetToken(token)
@@ -489,11 +471,6 @@ func (opts *ConfigOpts) initVault() error {
 
 	opts.vaultClient = client
 
-	for _, v := range opts.VaultKeys {
-		v.Name = replaceVarInString(opts.Vars, v.Key, opts.Logger)
-		v.MountPath = replaceVarInString(opts.Vars, v.MountPath, opts.Logger)
-	}
-
 	return nil
 }
 
@@ -501,10 +478,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
 		}
@@ -529,10 +503,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
@@ -592,7 +562,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()
@@ -718,24 +688,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
-}
-
-func VariadicFunctionParameterTest(allowedKeys ...string) {
-	if contains(allowedKeys, "file") {
-		println("file param included")
-	}
-}

pkg/backy/notification.go

@@ -9,7 +9,6 @@ import (
 
 	"git.andrewnw.xyz/CyberShell/backy/pkg/logging"
 	"github.com/nikoksr/notify"
-	"github.com/nikoksr/notify/service/http"
 	"github.com/nikoksr/notify/service/mail"
 	"github.com/nikoksr/notify/service/matrix"
 	"maunium.net/go/mautrix/id"
@@ -31,12 +30,6 @@ type MailConfig struct {
 	Password      string   `yaml:"password"`
 }
 
-type HttpConfig struct {
-	URL     string              `yaml:"url"`
-	Method  string              `yaml:"method"`
-	Headers map[string][]string `yaml:"headers"`
-}
-
 // SetupNotify sets up notify instances for each command list.
 func (opts *ConfigOpts) SetupNotify() {
 
@@ -66,7 +59,6 @@ func (opts *ConfigOpts) SetupNotify() {
 					continue
 				}
 				conf.Password = getExternalConfigDirectiveValue(conf.Password, opts)
-				opts.Logger.Debug().Str("list", confName).Str("id", confId).Msg("adding mail notification service")
 				mailConf := setupMail(conf)
 				services = append(services, mailConf)
 			case "matrix":
@@ -76,22 +68,13 @@ func (opts *ConfigOpts) SetupNotify() {
 					continue
 				}
 				conf.AccessToken = getExternalConfigDirectiveValue(conf.AccessToken, opts)
-				opts.Logger.Debug().Str("list", confName).Str("id", confId).Msg("adding matrix notification service")
 				mtrxConf, mtrxErr := setupMatrix(conf)
 				if mtrxErr != nil {
 					opts.Logger.Info().Str("list", confName).Err(fmt.Errorf("error: configuring matrix id %s failed during setup: %w", id, mtrxErr))
 					continue
 				}
 				services = append(services, mtrxConf)
-			case "http":
+
-				conf, ok := opts.NotificationConf.HttpConfig[confId]
-				if !ok {
-					opts.Logger.Info().Err(fmt.Errorf("error: ID %s not found in http object", confId)).Str("list", confName).Send()
-					continue
-				}
-				opts.Logger.Debug().Str("list", confName).Str("id", confId).Msg("adding http notification service")
-				httpConf := setupHttp(conf)
-				services = append(services, httpConf)
 			default:
 				opts.Logger.Info().Err(fmt.Errorf("id %s not found", id)).Str("list", confName).Send()
 			}
@@ -117,19 +100,3 @@ func setupMail(config MailConfig) *mail.Mail {
 	mailClient.BodyFormat(mail.PlainText)
 	return mailClient
 }
-
-func setupHttp(httpConf HttpConfig) *http.Service {
-
-	httpService := http.New()
-	httpService.AddReceivers(&http.Webhook{
-		URL:         httpConf.URL,
-		Header:      httpConf.Headers,
-		ContentType: "text/plain",
-		Method:      httpConf.Method,
-		BuildPayload: func(subject, message string) (payload any) {
-			return subject + "\n\n" + message
-		},
-	})
-
-	return httpService
-}

pkg/backy/ssh.go

@@ -523,19 +523,12 @@ func (command *Command) RunCmdSSH(cmdCtxLogger zerolog.Logger, opts *ConfigOpts)
 				return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.OutputToLog), fmt.Errorf("error creating file /tmp/%s: %v", uuidFile.String(), passFileErr)
 			}
 
-			_, err = passFile.Write([]byte(userNamePass))
+			passFile.Write([]byte(userNamePass))
-			if err != nil {
-				return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.OutputToLog), fmt.Errorf("error writing to file /tmp/%s: %v", uuidFile.String(), err)
-			}
 
 			ArgsStr = fmt.Sprintf("cat %s | chpasswd", passFilePath)
 			defer passFile.Close()
 
-			rmFileFunc := func() {
+			defer client.Remove(passFilePath)
-				_ = client.Remove(passFilePath)
-			}
-
-			defer rmFileFunc()
 			// commandSession.Stdin = command.stdin
 		}
 		if err := commandSession.Run(ArgsStr); err != nil {
@@ -568,10 +561,7 @@ func (command *Command) RunCmdSSH(cmdCtxLogger zerolog.Logger, opts *ConfigOpts)
 						return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.OutputToLog), fmt.Errorf("error creating sftp client: %v", err)
 					}
 
-					err = client.MkdirAll(userSshDir)
+					client.MkdirAll(userSshDir)
-					if err != nil {
-						return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.OutputToLog), fmt.Errorf("error creating directory %s: %v", userSshDir, err)
-					}
 					_, err = client.Create(fmt.Sprintf("%s/authorized_keys", userSshDir))
 					if err != nil {
 						return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.OutputToLog), fmt.Errorf("error opening file %s/authorized_keys: %v", userSshDir, err)

pkg/backy/types.go

@@ -205,8 +205,6 @@ type (
 
 		List ListConfig
 
-		Vars map[string]string `yaml:"variables"`
-
 		VaultKeys []*VaultKey `yaml:"keys"`
 
 		koanf *koanf.Koanf
@@ -241,7 +239,6 @@ type (
 	Notifications struct {
 		MailConfig   map[string]MailConfig   `yaml:"mail,omitempty"`
 		MatrixConfig map[string]MatrixStruct `yaml:"matrix,omitempty"`
-		HttpConfig   map[string]HttpConfig   `yaml:"http,omitempty"`
 	}
 
 	CmdOutput struct {
@@ -278,9 +275,8 @@ type (
 	}
 
 	// use ints so we can use enums
-	CommandType               int
+	CommandType      int
-	PackageOperation          int
+	PackageOperation int
-	AllowedExternalDirectives int
 )
 
 //go:generate go run github.com/dmarkham/enumer -linecomment -yaml -text -json -type=CommandType
@@ -303,14 +299,3 @@ const (
 	PackOpCheckVersion                         // checkVersion
 	PackOpIsInstalled                          // isInstalled
 )
-
-//go:generate go run github.com/dmarkham/enumer -linecomment -yaml -text -json -type=AllowedExternalDirectives
-const (
-	DefaultExternalDir                AllowedExternalDirectives = iota
-	AllowedExternalDirectiveVault                               // vault
-	AllowedExternalDirectiveVaultFile                           // vault-file
-	AllowedExternalDirectiveAll                                 // vault-file-env
-	AllowedExternalDirectiveFileEnv                             // file-env
-	AllowedExternalDirectiveFile                                // file
-	AllowedExternalDirectiveEnv                                 // env
-)

pkg/backy/utils.go

@@ -110,11 +110,7 @@ func injectEnvIntoSSH(envVarsToInject environmentVars, process *ssh.Session, opt
 			goto errEnvFile
 		}
 		for key, val := range envMap {
-			err = process.Setenv(key, GetVaultKey(val, opts, log))
+			process.Setenv(key, GetVaultKey(val, opts, log))
-			if err != nil {
-				log.Error().Err(err).Send()
-
-			}
 		}
 	}
 
@@ -125,11 +121,7 @@ errEnvFile:
 		if strings.Contains(envVal, "=") {
 			envVarArr := strings.Split(envVal, "=")
 
-			err := process.Setenv(envVarArr[0], getExternalConfigDirectiveValue(envVarArr[1], opts))
+			process.Setenv(envVarArr[0], getExternalConfigDirectiveValue(envVarArr[1], opts))
-			if err != nil {
-				log.Error().Err(err).Send()
-
-			}
 		}
 	}
 }
@@ -362,7 +354,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)
@@ -394,6 +385,7 @@ func getExternalConfigDirectiveValue(key string, opts *ConfigOpts) string {
 		key = strings.TrimSuffix(key, externDirectiveEnd)
 		key = GetVaultKey(key, opts, opts.Logger)
 	}
+	println(key)
 
 	return key
 }
@@ -418,6 +410,7 @@ func getVaultSecret(vaultClient *vault.Client, key *VaultKey) (string, error) {
 	}
 
 	value, ok := secret.Data[key.Key].(string)
+	println(value)
 	if !ok {
 		return "", fmt.Errorf("value type assertion failed for vault key %s: %T %#v", key.Name, secret.Data[key.Name], secret.Data[key.Name])
 	}

pkg/remotefetcher/cache.go

@@ -116,7 +116,7 @@ func (c *Cache) Set(source, hash string, data []byte, dataType string) (CacheDat
 	path := filepath.Join(c.dir, fmt.Sprintf("%s-%s", fileName, sourceHash))
 
 	if _, err := os.Stat(path); os.IsNotExist(err) {
-		_ = os.MkdirAll(c.dir, 0700)
+		os.MkdirAll(c.dir, 0700)
 	}
 
 	err := os.WriteFile(path, data, 0644)
@@ -171,7 +171,7 @@ func (cf *CachedFetcher) Hash(data []byte) string {
 func LoadMetadataFromFile(filePath string) ([]*CacheData, error) {
 	if _, err := os.Stat(filePath); os.IsNotExist(err) {
 		// Create the file if it does not exist
-		_ = os.MkdirAll(path.Dir(filePath), 0700)
+		os.MkdirAll(path.Dir(filePath), 0700)
 		emptyData := []byte("[]")
 		err := os.WriteFile(filePath, emptyData, 0644)
 		if err != nil {