yohamta
commented
2 months ago 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/ifconfigI 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
codecov[bot]
export env
func newSSHExec(_ context.Context, step dag.Step) (Executor, error) { // expend env if err = expendExecConfigEnv(step.ExecutorConfig.Config); err != nil { return nil, err }
}
