Fix generator jobs for go modules #16288
Merged
Conversation
This file contains 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
kvch
added
in progress
This was referenced Feb 13, 2020
Closed
kvch
added
[zube]: In Review
and removed
[zube]: In Progress
in progress
kvch
force-pushed
the
fix-gomodules-generators-once-and-for-all
branch
from
16ff9cc to
efe5ff9
Compare
jsoriano
reviewed
Feb 21, 2020
| @@ -480,3 +481,35 @@ func main() { | |||
|
|
|||
| When you're done with your new Beat, how about letting everyone know? Open | |||
| a pull request to add your link to the {beats-ref}/community-beats.html[Community Beats] list. | |||
|
|
|||
| [[newbeat-migrate-gomodules]] | |||
| === Migrate existing Beat to go modules | |||
There was a problem hiding this comment.
@radoondas you may be interested on that 🙂
There was a problem hiding this comment.
Ou yeah! This is something I will have a look once it is available! Thanks
| Key: "beats_revision", | ||
| Help: "Enter the github.com/elastic/beats revision", | ||
| Default: func(cfg map[string]string) string { | ||
| return "master" |
There was a problem hiding this comment.
Could we somehow reuse the versions in libbeat/docs/version.asciidoc for this default? So if someone creates a new beat from 7.7 branch, 7.7 is used by default and so on.
Maybe we already have some helper in mage to access these versions.
kvch
force-pushed
the
fix-gomodules-generators-once-and-for-all
branch
3 times, most recently
from
038a10d to
2d7b72f
Compare
|
Opened follow-up issue with possible improvements: #16555 |
fearful-symmetry
approved these changes
Feb 25, 2020
jsoriano
approved these changes
Feb 25, 2020
|
jenkins test this |
|
jenkins test this please |
|
jenkins retest this please |
kvch
force-pushed
the
go-modules
branch
4 times, most recently
from
3dbefdb to
cc275ad
Compare
kvch
force-pushed
the
fix-gomodules-generators-once-and-for-all
branch
from
c6ce496 to
b9d1775
Compare
|
jenkins test this |
|
jenkins retest this please |
kvch
force-pushed
the
fix-gomodules-generators-once-and-for-all
branch
from
4895c92 to
3ec8e03
Compare
kvch
force-pushed
the
fix-gomodules-generators-once-and-for-all
branch
from
3ec8e03 to
67e8807
Compare
|
This comment is written to trigger a CLA check. |
kvch
added a commit
to kvch/beats
that referenced
this pull request
Mar 5, 2020
* Set the correct path to `mage` for generator jobs
* Generated beats use go modules for dependency management
* New option `beats_revision` is added so users can select which beats revision they want to vendor
* if one does not want to depend on `elastic/beats`, he/she needs to add the appropriate `replace` directive to the generated `go.mod`
As Beats is moving to go modules for dependency management, generated Beats should use that as well.
Documentation is provided to help users migrate to go modules in their own Beats. Also, about the new option.
(cherry picked from commit a846029)
5 tasks
kvch
added
v7.7.0
and removed
needs_backport
kvch
added a commit
that referenced
this pull request
Mar 5, 2020
* Set the correct path to `mage` for generator jobs
* Generated beats use go modules for dependency management
* New option `beats_revision` is added so users can select which beats revision they want to vendor
* if one does not want to depend on `elastic/beats`, he/she needs to add the appropriate `replace` directive to the generated `go.mod`
As Beats is moving to go modules for dependency management, generated Beats should use that as well.
Documentation is provided to help users migrate to go modules in their own Beats. Also, about the new option.
(cherry picked from commit a846029)
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.
What does this PR do?
magefor generator jobsbeats_revisionis added so users can select which beats revision they want to vendorelastic/beats, he/she needs to add the appropriatereplacedirective to the generatedgo.modWhy is it important?
As Beats is moving to go modules for dependency management, generated Beats should use that as well.
Documentation is provided to help users migrate to go modules in their own Beats. Also, about the new option.
Checklist
How to test
Run the test which is executed by the jobs:
Then go to the generated beat and play around with the available make commands. For example run
make copyVendorormake create-metricseat, etc.