Skip to content

fix(ansible): use ENV vars also on ansible-galaxy step #3459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
divialth wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(ansible): use ENV vars also on ansible-galaxy step #3459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions db_lib/AnsibleApp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ func (t *AnsibleApp) Clear() {
}

func (t *AnsibleApp) InstallRequirements(args LocalAppInstallingArgs) error {
if err := t.installCollectionsRequirements(); err != nil {
if err := t.installCollectionsRequirements(args.EnvironmentVars); err != nil {
return err
}
if err := t.installRolesRequirements(); err != nil {
if err := t.installRolesRequirements(args.EnvironmentVars); err != nil {
return err
}
return nil
Expand All @@ -88,7 +88,7 @@ func (t *AnsibleApp) getRepoPath() string {
return t.Repository.GetFullPath(t.Template.ID)
}

func (t *AnsibleApp) installGalaxyRequirementsFile(requirementsType GalaxyRequirementsType, requirementsFilePath string) error {
func (t *AnsibleApp) installGalaxyRequirementsFile(requirementsType GalaxyRequirementsType, requirementsFilePath string, environmentVars []string) error {
requirementsHashFilePath := fmt.Sprintf("%s_%s.md5", requirementsFilePath, requirementsType)

if _, err := os.Stat(requirementsFilePath); err != nil {
Expand All @@ -103,7 +103,7 @@ func (t *AnsibleApp) installGalaxyRequirementsFile(requirementsType GalaxyRequir
"-r",
requirementsFilePath,
"--force",
}); err != nil {
}, environmentVars); err != nil {
return err
}
if err := writeMD5Hash(requirementsFilePath, requirementsHashFilePath); err != nil {
Expand All @@ -129,46 +129,46 @@ const (
GalaxyCollection GalaxyRequirementsType = "collection"
)

func (t *AnsibleApp) installRolesRequirements() (err error) {
func (t *AnsibleApp) installRolesRequirements(environmentVars []string) (err error) {
// default roles path
err = t.installGalaxyRequirementsFile(GalaxyRole, path.Join(t.GetPlaybookDir(), "roles", "requirements.yml"))
err = t.installGalaxyRequirementsFile(GalaxyRole, path.Join(t.GetPlaybookDir(), "roles", "requirements.yml"), environmentVars)
if err != nil {
return
}
err = t.installGalaxyRequirementsFile(GalaxyRole, path.Join(t.GetPlaybookDir(), "requirements.yml"))
err = t.installGalaxyRequirementsFile(GalaxyRole, path.Join(t.GetPlaybookDir(), "requirements.yml"), environmentVars)
if err != nil {
return
}

// alternative roles path
err = t.installGalaxyRequirementsFile(GalaxyRole, path.Join(t.getRepoPath(), "roles", "requirements.yml"))
err = t.installGalaxyRequirementsFile(GalaxyRole, path.Join(t.getRepoPath(), "roles", "requirements.yml"), environmentVars)
if err != nil {
return
}
err = t.installGalaxyRequirementsFile(GalaxyRole, path.Join(t.getRepoPath(), "requirements.yml"))
err = t.installGalaxyRequirementsFile(GalaxyRole, path.Join(t.getRepoPath(), "requirements.yml"), environmentVars)
return
}

func (t *AnsibleApp) installCollectionsRequirements() (err error) {
func (t *AnsibleApp) installCollectionsRequirements(environmentVars []string) (err error) {
// default collections path
err = t.installGalaxyRequirementsFile(GalaxyCollection, path.Join(t.GetPlaybookDir(), "collections", "requirements.yml"))
err = t.installGalaxyRequirementsFile(GalaxyCollection, path.Join(t.GetPlaybookDir(), "collections", "requirements.yml"), environmentVars)
if err != nil {
return
}
err = t.installGalaxyRequirementsFile(GalaxyCollection, path.Join(t.GetPlaybookDir(), "requirements.yml"))
err = t.installGalaxyRequirementsFile(GalaxyCollection, path.Join(t.GetPlaybookDir(), "requirements.yml"), environmentVars)
if err != nil {
return
}

// alternative collections path
err = t.installGalaxyRequirementsFile(GalaxyCollection, path.Join(t.getRepoPath(), "collections", "requirements.yml"))
err = t.installGalaxyRequirementsFile(GalaxyCollection, path.Join(t.getRepoPath(), "collections", "requirements.yml"), environmentVars)
if err != nil {
return
}
err = t.installGalaxyRequirementsFile(GalaxyCollection, path.Join(t.getRepoPath(), "requirements.yml"))
err = t.installGalaxyRequirementsFile(GalaxyCollection, path.Join(t.getRepoPath(), "requirements.yml"), environmentVars)
return
}

func (t *AnsibleApp) runGalaxy(args []string) error {
return t.Playbook.RunGalaxy(args)
func (t *AnsibleApp) runGalaxy(args []string, environmentVars []string) error {
return t.Playbook.RunGalaxy(args, environmentVars)
}
8 changes: 4 additions & 4 deletions db_lib/AnsiblePlaybook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ func (p AnsiblePlaybook) makeCmd(command string, args []string, environmentVars
return cmd
}

func (p AnsiblePlaybook) runCmd(command string, args []string) error {
cmd := p.makeCmd(command, args, nil)
func (p AnsiblePlaybook) runCmd(command string, args []string, environmentVars []string) error {
cmd := p.makeCmd(command, args, environmentVars)
p.Logger.LogCmd(cmd)
err := cmd.Run()
// Wait for all log processing to complete before returning
Expand Down Expand Up @@ -87,8 +87,8 @@ func (p AnsiblePlaybook) RunPlaybook(args []string, environmentVars []string, in
return err
}

func (p AnsiblePlaybook) RunGalaxy(args []string) error {
return p.runCmd("ansible-galaxy", args)
func (p AnsiblePlaybook) RunGalaxy(args []string, environmentVars []string) error {
return p.runCmd("ansible-galaxy", args, environmentVars)
}

func (p AnsiblePlaybook) GetFullPath() (path string) {
Expand Down
Loading