Skip to content

Trivial - use consts rather than literals for env vars #3430

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

Merged
joelanford merged 1 commit into from
Jul 15, 2020
Merged

Trivial - use consts rather than literals for env vars #3430

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
5 changes: 3 additions & 2 deletions pkg/ansible/watches/watches.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
yaml "sigs.k8s.io/yaml"

"github.com/operator-framework/operator-sdk/internal/util/projutil"
"github.com/operator-framework/operator-sdk/pkg/ansible/flags"
)

var log = logf.Log.WithName("watches")
Expand Down Expand Up @@ -230,7 +231,7 @@ func getPossibleRolePaths(path string) []string {
fqcn := strings.Split(path, ".")
// If fqcn is a valid fully qualified collection name, it is <namespace>.<collectionName>.<roleName>
if len(fqcn) == 3 {
ansibleCollectionsPathEnv, ok := os.LookupEnv("ANSIBLE_COLLECTIONS_PATH")
ansibleCollectionsPathEnv, ok := os.LookupEnv(flags.AnsibleCollectionsPathEnvVar)
if !ok || len(ansibleCollectionsPathEnv) == 0 {
ansibleCollectionsPathEnv = "/usr/share/ansible/collections"
home, err := os.UserHomeDir()
Expand All @@ -246,7 +247,7 @@ func getPossibleRolePaths(path string) []string {
}

// Check for the role where Ansible would. If it exists, use it.
ansibleRolesPathEnv, ok := os.LookupEnv("ANSIBLE_ROLES_PATH")
ansibleRolesPathEnv, ok := os.LookupEnv(flags.AnsibleRolesPathEnvVar)
if ok && len(ansibleRolesPathEnv) > 0 {
for _, possiblePathParent := range strings.Split(ansibleRolesPathEnv, ":") {
// "roles" is optionally a part of the path. Check with, and without.
Expand Down