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

Set config file mode to 0600 in packages #3382

Merged
merged 3 commits into from
Jan 17, 2017

Conversation

andrewkroh
Copy link
Member

This PR changes the main config file (.yml) from 0644 to 0600. It adds a test that checks all RPM, deb, tar.gz, and zip files to ensure that the config file has the correct file mode.

@andrewkroh
Copy link
Member Author

jenkins, package it

Copy link
Member

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

LGTM. Nice.

"strings"
"testing"

"github.com/blakesmith/ar"
Copy link
Member

Choose a reason for hiding this comment

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

Could we add a vendor directory to the dev-tools directory? I would prefer if we don't mix vendor packages for tools with actual libbeat / beats dependencies. This makes it easier to track where a dependency belongs to.

Long term I'm thinking also to move dependencies which only belong to one beat into the beat if possible.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, I can move these to dev-tools. I was thinking about that when I added them because glide was giving lots of errors and also because I wanted it to be clear that these deps were not used in any Beat that we release.

Copy link
Member Author

Choose a reason for hiding this comment

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

I update the PR to move the dependencies to ./dev-tools/vendor.

@@ -105,7 +105,7 @@ import:
- zlib
- package: github.com/klauspost/cpuid
version: v1.0
- package: https://github.com/go-inf/inf
- package: github.com/go-inf/inf
Copy link
Member

Choose a reason for hiding this comment

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

see comment above

This PR changes the main config file (<beatname>.yml) from 0644 to 0600. It adds a test that checks all RPM, deb, tar.gz, and zip files to ensure that the config file has the correct file mode.
@andrewkroh
Copy link
Member Author

jenkins, package it

@@ -0,0 +1,18 @@
package: github.com/elastic/beats/dev-tools
import: []
testImports:
Copy link
Member

Choose a reason for hiding this comment

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

wasn't aware of this glide feature.

@ruflin ruflin merged commit ddcd609 into elastic:master Jan 17, 2017
@ruflin
Copy link
Member

ruflin commented Jan 17, 2017

@monicasarbu @andrewkroh One thing I just realised now is that the next time we build the NOTICE file, it will also include the LICENSES from these dependencies. But I think we should leave this out, means excluding dev-tools?

@andrewkroh andrewkroh deleted the feature/config-0600 branch March 31, 2017 05:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants