[ISSUE #674] feat: Add support for env variables in executor config

[halalala222]

export env

export DAGU_SSH_CONFIG_PASSWORD="password"
export DAGU_SSH_CONFIG_IP="ip"
export DAGU_SSH_CONFIG_USER="user"
export DAGU_SSH_CONFIG_PORT="22"

func newSSHExec(_ context.Context, step dag.Step) (Executor, error) {
// expend env
if err = expendExecConfigEnv(step.ExecutorConfig.Config); err != nil {
return nil, err
}

if err = md.Decode(step.ExecutorConfig.Config); err != nil {
	return nil, err
}

}

[yohamta]

Hi @halalala222, thank you very much for your great work! After reviewing the code, I noticed that it's replacing specific environment variables. I apologize for not being clear about this earlier, but we need to expand all environment variables included in the Config. For example, it should work like this:

steps:
  - name: step1
    executor:
      type: ssh
      config:
        user: "${SSH_USER}"
        ip: "${SSH_HOST}"
        port: "${SSH_PORT}"
        key: "${HOME}/.ssh/id_rsa"
    command: /usr/sbin/ifconfig

I think we can achieve this using the following approach:

// expandEnvHook is a mapstructure decode hook that expands environment variables in string fields
func expandEnvHook(f reflect.Type, t reflect.Type, data interface{}) (interface{}, error) {
	if f.Kind() != reflect.String || t.Kind() != reflect.String {
		return data, nil
	}
	return os.ExpandEnv(data.(string)), nil
}

func newSSHExec(_ context.Context, step dag.Step) (Executor, error) {
	cfg := new(sshExecConfig)
	decoder, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{
		Result: cfg,
		DecodeHook: expandEnvHook,
	})
	// ... omitted ...
}

Additionally, if possible, it would be great if you could add some tests for this functionality. Thank you very much for your help. It's really appreciated!

[halalala222]

Hi ! @yohamta Thank you ! I know ! I will try to work on it.

[yohamta]

Hi @halalala222, I understand you might be busy right now. Would you mind if I take over the task? If you'd prefer to continue working on it, that's great too.

[halalala222]

Hi @yohamta ,I'm really sorry, but I have some matters to attend to recently and may not be able to cover this task anymore. I apologize for the inconvenience.

[yohamta]

Hi @halalala222, no worries at all! Thank you so much for all the wonderful work you've done on developing Dagu, it was incredibly helpful. I'm closing this for now.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 64.68%. Comparing base (3c4f636) to head (b20c3ab).
Report is 1 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main     #677   +/-   ##
=======================================
  Coverage   64.68%   64.68%           
=======================================
  Files          53       53           
  Lines        4315     4315           
=======================================
  Hits         2791     2791           
  Misses       1269     1269           
  Partials      255      255           

---

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3c4f636...b20c3ab. Read the comment docs.