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

includes: Move osquery/include files into respective CMake targets #6557

Merged
merged 1 commit into from
Aug 11, 2020

Conversation

theopolis
Copy link
Member

@theopolis theopolis commented Jul 17, 2020

The goal is to move everything from ./osquery/include/osquery to their respective targets, and remove the osquery_headers CMake target.

 rename osquery/{include/osquery => config}/packs.h (98%)
 rename osquery/{include/osquery => core}/core.h (100%)
 rename osquery/{include/osquery => core}/flagalias.h (98%)
 rename osquery/{include/osquery => core}/flags.h (99%)
 rename osquery/{include/osquery => core}/query.h (99%)
 rename osquery/{include/osquery => core}/shutdown.h (100%)
 rename osquery/{include/osquery => core}/system.h (99%)
 rename osquery/{include/osquery => core}/tables.h (99%)
 rename osquery/{include/osquery => database}/database.h (100%)
 rename osquery/{include/osquery => dispatcher}/dispatcher.h (99%)
 rename osquery/{include/osquery => distributed}/distributed.h (99%)
 rename osquery/{include/osquery => events}/events.h (99%)
 rename osquery/{include/osquery => extensions}/extensions.h (98%)
 rename osquery/{include/osquery => logger}/data_logger.h (97%)
 rename osquery/{include/osquery => numeric_monitoring}/numeric_monitoring.h (100%)
 rename osquery/{include/osquery => registry}/registry.h (74%)
 rename osquery/{include/osquery => registry}/registry_factory.h (99%)
 rename osquery/{include/osquery => registry}/registry_interface.h (99%)
 rename osquery/{include/osquery => remote/enroll}/enroll.h (98%)
 rename osquery/{include/osquery => sql}/sql.h (98%)

A step on the path towards detangling (see #5990).

@theopolis theopolis force-pushed the includes_refactor branch 4 times, most recently from c9526f2 to 6a54707 Compare July 18, 2020 20:32
@theopolis theopolis changed the title includes: Move registry.h includes: Move osquery/include files into respective CMake targets Jul 18, 2020
@theopolis theopolis added merge with rebase refactor Related to osquery code refactoring labels Jul 18, 2020
@theopolis
Copy link
Member Author

Let's not merge with rebase. I will have to keep updating this as new PRs are merged and I'd rather not rebase each commit.

@theopolis
Copy link
Member Author

Alright @directionless, ready to land this and then the copyright change soon after.

@directionless
Copy link
Member

While this is too giant for me to review in totality, I attempted to filter out what looked like header re-arranging. The remaining diff looked okay. Specifically, I examined 8abb89f by running:

git diff master --unified=0 | grep -vE '^.#include'  | grep -vE '^(---|\+\+\+|@@|index)' 

The resultant diff was ~909 lines. The vast majority of them file names, and a handful of cmake changes.

@theopolis theopolis merged commit 8ee7e3a into osquery:master Aug 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build refactor Related to osquery code refactoring
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants