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

codegen: Port Jinja2 to Templite #6470

Merged
merged 5 commits into from
May 31, 2020
Merged

codegen: Port Jinja2 to Templite #6470

merged 5 commits into from
May 31, 2020

Conversation

theopolis
Copy link
Member

This attempts to remove our dependency on Jinja2 and Markdown and replace them with Templite. This is not yet complete, only a preview.

@theopolis theopolis added the refactor Related to osquery code refactoring label May 29, 2020
@Smjert
Copy link
Member

Smjert commented May 30, 2020

@theopolis It seems we need to remove thirdparty_python_modules from here:

osquery/tools/codegen/CMakeLists.txt

Line 34 in d7c43e6

DEPENDS "codegen_gentable_utils_dependency" "thirdparty_python_modules" "${generatePythonModulePath_rootTarget}"

and here

osquery/tools/codegen/CMakeLists.txt

Line 197 in d7c43e6

DEPENDS "${category_spec_files}" ${generateTables_targetList} "thirdparty_python_modules"

then it compiles fine.

There are other references in the facebook layer, but I would ignore those since we are very near to remove that code anyway.

@amotmot amotmot mentioned this pull request May 31, 2020
Closed
@theopolis
Copy link
Member Author

@Smjert, I think I fixed it! :)

Smjert
Smjert approved these changes May 31, 2020
View reviewed changes
Copy link
Member

@Smjert Smjert left a comment

Choose a reason for hiding this comment

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

Ship it!

@theopolis theopolis merged commit c34bdf6 into osquery:master May 31, 2020
Smjert pushed a commit to Smjert/osquery that referenced this pull request Jun 1, 2020
@Smjert
codegen: Port Jinja2 to Templite (osquery#6470)
b2ae18a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Smjert Smjert Smjert approved these changes

Assignees
No one assigned
Labels
refactor Related to osquery code refactoring
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@theopolis @Smjert