Replace generate_imports python script with mage imports#14498
Merged
ChrsMark merged 13 commits intoelastic:masterfrom Nov 14, 2019
Merged
Replace generate_imports python script with mage imports#14498ChrsMark merged 13 commits intoelastic:masterfrom
ChrsMark merged 13 commits intoelastic:masterfrom
Conversation
Signed-off-by: chrismark <chrismarkou92@gmail.com>
3 tasks
Signed-off-by: chrismark <chrismarkou92@gmail.com>
Signed-off-by: chrismark <chrismarkou92@gmail.com>
Signed-off-by: chrismark <chrismarkou92@gmail.com>
jsoriano
reviewed
Nov 13, 2019
Member
jsoriano
left a comment
There was a problem hiding this comment.
Yet another python script in the way to be removed 😃
Signed-off-by: chrismark <chrismarkou92@gmail.com>
Signed-off-by: chrismark <chrismarkou92@gmail.com>
Signed-off-by: chrismark <chrismarkou92@gmail.com>
Signed-off-by: chrismark <chrismarkou92@gmail.com>
houndci-bot
reviewed
Nov 13, 2019
houndci-bot
reviewed
Nov 13, 2019
Signed-off-by: chrismark <chrismarkou92@gmail.com>
Signed-off-by: chrismark <chrismarkou92@gmail.com>
jsoriano
reviewed
Nov 14, 2019
ChrsMark
commented
Nov 14, 2019
| if err != nil { | ||
| return errors.Wrap(err, "error gettting current directory") | ||
| } | ||
| return sh.Run("ln", "-sf", filepath.Join(pwd, vendorPath, "elastic/beats/metricbeat/scripts/generate_imports_helper.py"), filepath.Join(pwd, vendorPath, "elastic/beats/script/generate_imports_helper.py")) |
Member
Author
There was a problem hiding this comment.
This is sth which requires a careful look, not sure if it's ok to remove. Maybe @fearful-symmetry can comment here.
Contributor
There was a problem hiding this comment.
The new go generator has its own code for linking that, so I'm not sure what's using this?
beats/generator/common/beatgen/setup/setup.go
Lines 55 to 62 in 72f2bf9
Signed-off-by: chrismark <chrismarkou92@gmail.com>
kvch
approved these changes
Nov 14, 2019
jsoriano
approved these changes
Nov 14, 2019
fearful-symmetry
approved these changes
Nov 14, 2019
ChrsMark
added a commit
to ChrsMark/beats
that referenced
this pull request
Nov 14, 2019
(cherry picked from commit 6b46c29)
ChrsMark
added a commit
that referenced
this pull request
Nov 19, 2019
3 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR tries to refactor and unify the way we create
include/list.gofiles. This came after we moved light modules to OSS and while trying to create a light module under OSS. In that case this module will be included inlist.gofile despite the fact that it has no.gofiles. This was not a problem when light modules where underx-packbecause there thelist.gowas created bymageand the script was taking into consideration the existence of.gofiles in a module so as to decide if it should be included inlist.go.So far we had:
x-packway: https://github.com/elastic/beats/blob/master/x-pack/metricbeat/magefile.go#L128ossway: https://github.com/elastic/beats/blob/master/metricbeat/Makefile#L46This PR refactors the OSS part so as to make use of the
magerespective target likewisex-pack.cc: @jsoriano , @exekias