feat: add support for relative paths (ansible) #2273
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
joelanford
requested changes
Dec 9, 2019
cmd/operator-sdk/up/local.go
Outdated
Comment on lines
170
to
174
| // Set local env | ||
| if err := os.Setenv(k8sutil.ForceRunModeEnv, "local"); err != nil { | ||
| return fmt.Errorf("failed to set %s environment variable: (%v)", k8sutil.ForceRunModeEnv, err) | ||
| } | ||
|
|
There was a problem hiding this comment.
Is this change related to this PR?
There was a problem hiding this comment.
Yes, because the env var has not been set.
It also is required in the fix: #2190
|
All done @joelanford 👍 |
joelanford
previously requested changes
Feb 4, 2020
pkg/ansible/watches/watches_test.go
Outdated
| func Test_getFullRolePathWithEnvVarSet(t *testing.T) { | ||
| // Mock customized Path | ||
| customPath := "customized/myroles" | ||
| os.Setenv("ANSIBLE_ROLES_PATH", customPath) |
There was a problem hiding this comment.
Can we add a couple of other tests with the following paths:
- "nonexistent/roles"
- "customized/myroles:nonexistent/roles"
- "nonexistent/roles:customized/myroles"
- "nonexistent1/roles:nonexistent2/roles"
There was a problem hiding this comment.
The tests were improved.
We are testing the func getFullRolePath with and whiteout the envVar + we are checking the load well with the successful scenarios.
pkg/ansible/watches/watches.go
Outdated
Comment on lines
173
to
176
| envVar, ok := os.LookupEnv("ANSIBLE_ROLES_PATH") | ||
| if ok && len(envVar) > 0 { | ||
| return filepath.Join(envVar, path) | ||
| } |
There was a problem hiding this comment.
Don't we still need to handle the case of a multiple paths in the ANSIBLE_ROLES_PATH value? (e.g. path1/roles:path2/roles:/absolute/path3/roles)
I might be unavailable to review again next time around :)
|
/hold Pending support for colon-separate path handling and tests around that. |
joelanford
reviewed
Feb 4, 2020
pkg/ansible/watches/watches.go
Outdated
Comment on lines
184
to
188
| // Check if the role can be found in the envVar + roles + role role | ||
| infoPathWithRolesDir := filepath.Join(result[i], "roles", path) | ||
| if _, err := os.Stat(infoPathWithRolesDir); err == nil { | ||
| return infoPathWithRolesDir | ||
| } |
There was a problem hiding this comment.
Does ANSIBLE_ROLES_PATH work this way (where it checks in <path>/<role> and <path>/roles/<role>)?
There was a problem hiding this comment.
The Ansible documentation do not explain how it should work.
However, according to it maintainer
A role should be found in the defined "roles path" (via config) or in a roles/ directory adjacent to the play
From: ansible/ansible#16911 (comment)
joelanford
reviewed
Feb 4, 2020
pkg/ansible/watches/watches.go
Outdated
| @@ -290,7 +304,7 @@ func verifyAnsiblePath(playbook string, role string) error { | |||
| case role != "": | |||
| rolePath := getFullRolePath(role) | |||
| if _, err := os.Stat(rolePath); err != nil { | |||
| return fmt.Errorf("role path: %v was not found", role) | |||
| return fmt.Errorf("role role: %v was not found", role) | |||
There was a problem hiding this comment.
Looks like there was a global search/replace of path to role?
|
/lgtm when CI passes |
|
/hold cancel |
|
New changes are detected. LGTM label has been removed. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
operator-SDK up localwith the roles and playbooks using relative pathsPS.: Now, when roles/playbooks are configured with a relative path then, the operator will looking for them in the current directory.