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.

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

[monitor] fix issues with directory creation on windows #678

Merged
merged 4 commits into from
Dec 31, 2019

Conversation

truthbk
Copy link
Member

@truthbk truthbk commented Dec 30, 2019

There was a bit of copy/paste going on here, so I'm sure this can be fixed in a cleaner way. I'll let you guys take the PR over, but it should be fixed as this is currently broken on windows.

Copy link
Contributor

@KSerrania KSerrania left a comment

Choose a reason for hiding this comment

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

LGTM, we can simplify the conditionals (there's one branch which cannot ever happen)

group 'dd-agent'
mode '755'
if node['platform_family'] == 'windows'
if Chef::Datadog.agent_major_version(node) > 5
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this check is not needed, we're already in the Chef::Datadog.agent_major_version(node) != 5 branch

Copy link
Member Author

@truthbk truthbk Dec 31, 2019

Choose a reason for hiding this comment

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

Yes, this is exactly what I was talking about, I hadn't even bother checking the logic, thanks.

Copy link
Member Author

@truthbk truthbk left a comment

Choose a reason for hiding this comment

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

LGTM now, not sure if we want to do the metadata version bump on this particular PR, or if you prefer to make a release PR where you do that sort of thing. Up to you, obviously. 🙇

Copy link
Contributor

@kbogtob kbogtob left a comment

Choose a reason for hiding this comment

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

LGTM! If you could just remove the metadata update, I'll take care of the releasing. We usually do it in a separate PR to update the changelog too.

@kbogtob kbogtob merged commit e5946b6 into master Dec 31, 2019
@kbogtob kbogtob deleted the jaime/fixmonitor branch December 31, 2019 10:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants