feat(ansible): return include_vars file list
Co-Authored-By: Virgil <virgil@lethean.io>
This commit is contained in:
parent
7833c872a4
commit
d8798ec56f
2 changed files with 16 additions and 1 deletions
|
|
@ -2774,7 +2774,14 @@ func (e *Executor) moduleIncludeVars(args map[string]any) (*TaskResult, error) {
|
|||
msg += ": " + join(", ", sources)
|
||||
}
|
||||
|
||||
return &TaskResult{Changed: true, Msg: msg}, nil
|
||||
result := &TaskResult{Changed: true, Msg: msg}
|
||||
if len(sources) > 0 {
|
||||
result.Data = map[string]any{
|
||||
"ansible_included_var_files": append([]string(nil), sources...),
|
||||
}
|
||||
}
|
||||
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func normalizeIncludeVarsExtensions(values []string) []string {
|
||||
|
|
|
|||
|
|
@ -1089,6 +1089,9 @@ func TestModulesAdv_ModuleIncludeVars_Good_LoadSingleFile(t *testing.T) {
|
|||
assert.True(t, result.Changed)
|
||||
assert.False(t, result.Failed)
|
||||
assert.Contains(t, result.Msg, varsPath)
|
||||
require.NotNil(t, result.Data)
|
||||
require.Contains(t, result.Data, "ansible_included_var_files")
|
||||
assert.Equal(t, []string{varsPath}, result.Data["ansible_included_var_files"])
|
||||
assert.Equal(t, "demo", e.vars["app_name"])
|
||||
assert.Equal(t, 8080, e.vars["app_port"])
|
||||
|
||||
|
|
@ -1153,6 +1156,11 @@ func TestModulesAdv_ModuleIncludeVars_Good_LoadDirectoryWithMerge(t *testing.T)
|
|||
assert.False(t, result.Failed)
|
||||
assert.Contains(t, result.Msg, joinPath(dir, "01-base.yml"))
|
||||
assert.Contains(t, result.Msg, joinPath(dir, "02-override.yaml"))
|
||||
require.NotNil(t, result.Data)
|
||||
assert.Equal(t, []string{
|
||||
joinPath(dir, "01-base.yml"),
|
||||
joinPath(dir, "02-override.yaml"),
|
||||
}, result.Data["ansible_included_var_files"])
|
||||
assert.Equal(t, "demo", e.vars["app_name"])
|
||||
assert.Equal(t, 8080, e.vars["app_port"])
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue