Skip to content
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

Jump to bottom

Fix context of the ReadDir templating function #2058

Merged
merged 2 commits into from
Jan 23, 2022
Merged

Fix context of the ReadDir templating function #2058

merged 2 commits into from
Jan 23, 2022

Conversation

nlueb
Copy link
Contributor

@nlueb nlueb commented Jan 22, 2022

This PR fixes an issue brought up by @bhester01 in #1934. I made ReadDir a method of *Context as suggested by @mumoshu, and that seems to have resolved the issue.

@nlueb nlueb mentioned this pull request Jan 22, 2022
Merged
mumoshu
mumoshu approved these changes Jan 23, 2022
View reviewed changes
Copy link
Collaborator

@mumoshu mumoshu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nlueb I tweaked the code style and ran make fmt for automated code formatting a bit, but this LGTM. Thanks a lot for your contribution!

@mumoshu mumoshu merged commit 1d70130 into roboll:master Jan 23, 2022
@nlueb
Copy link
Contributor Author

nlueb commented Jan 23, 2022

@mumoshu There was a reason why context_path was separated from path. The context must be added for the call to os.ReadDir(), but returning the file path with the context added causes readFile to add the context a second time.

mumoshu added a commit that referenced this pull request Jan 23, 2022
@mumoshu
Fix readdir regression while merging
c407420 
Ref #2058 (comment)
@mumoshu mumoshu mentioned this pull request Jan 23, 2022
Merged
@mumoshu
Copy link
Collaborator

mumoshu commented Jan 23, 2022 •
edited
Loading

@nlueb Ah, thanks for pointing that out! I've tried to fix it in #2061. I'd appreciate it if you could review it.

mumoshu added a commit that referenced this pull request Jan 23, 2022
@mumoshu
Fix readdir regression while merging (#2061)
061644c 
Ref #2058 (comment)
w33dw0r7d pushed a commit to w33dw0r7d/helmfile that referenced this pull request Mar 8, 2022
@nlueb @w33dw0r7d
Fix ReadDir templating function to respect base path (roboll#2058)
288579f 
Ref roboll#1934 (comment)
w33dw0r7d pushed a commit to w33dw0r7d/helmfile that referenced this pull request Mar 8, 2022
@mumoshu @w33dw0r7d
Fix readdir regression while merging (roboll#2061)
626a385 
Ref roboll#2058 (comment)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mumoshu mumoshu mumoshu approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nlueb @mumoshu