Skip to content

Various fixes: use fork of go-plugins-helpers, Functionbeat, templates#16191

Merged
kvch merged 9 commits intoelastic:go-modulesfrom
kvch:use-go-plugins-helpers-fork
Feb 10, 2020
Merged

Various fixes: use fork of go-plugins-helpers, Functionbeat, templates#16191
kvch merged 9 commits intoelastic:go-modulesfrom
kvch:use-go-plugins-helpers-fork

Conversation

@kvch
Copy link
Copy Markdown
Contributor

@kvch kvch commented Feb 7, 2020

What does this PR do?

From now on our for of github.com/docker/go-plugins-helpers is used until that lib migrates to modules.

Furthermore, vendoring dependencies for GCP functions is fixed. In modules mode, the output of go list -deps does not contain the prefix github.com/elastic/beats/vendor. As it does not look for packages under vendor.

As Beat generators were moved to the folder _templates, the license header check needed adjustment to exclude the templates.

Why is it important?

Dockerlogbeat could not be built because of the lib is not a module.

make update runs successfully under x-pack/functionbeat.

Checklist

- [ ] My code follows the style guidelines of this project
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] I have made corresponding change to the default configuration files
- [ ] I have added tests that prove my fix is effective or that my feature works

@kvch kvch mentioned this pull request Feb 7, 2020
18 tasks
@kvch kvch added the Team:Services (Deprecated) Label for the former Integrations-Services team label Feb 7, 2020
@kvch kvch changed the title Use our fork of github.com/docker/go-plugins-helpers Various fixes to let make check pass Feb 7, 2020
@kvch kvch mentioned this pull request Feb 7, 2020
2 tasks
@kvch kvch changed the title Various fixes to let make check pass Various fixes: use fork of go-plugins-helpers, Functionbeat, templates Feb 10, 2020
Comment thread magefile.go
licenser.Exclude("generator/beat/{beat}"),
licenser.Exclude("generator/metricbeat/{beat}"),
licenser.Exclude("generator/_templates/beat/{beat}"),
licenser.Exclude("generator/_templates/metricbeat/{beat}"),
Copy link
Copy Markdown
Member

@jsoriano jsoriano Feb 10, 2020

Choose a reason for hiding this comment

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

Were they moved in a previous PR?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes. It has to be moved, otherwise go test and co. are trying to run the code. But if the folder name starts with _, go skips it.
I only checked if go test ./... is passing. That's how I missed adjusting the paths.

"os"

"github.com/coreos/go-systemd/activation"
"github.com/coreos/go-systemd/v22/activation"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This systemd dependency is going to be interesting.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

there is a tool named mod: https://github.com/marwan-at-work/mod which does the dirty work of updating mejor versions for you. :)

@kvch kvch merged commit 8883820 into elastic:go-modules Feb 10, 2020
kvch added a commit that referenced this pull request Feb 26, 2020
#16191)

## What does this PR do?

From now on our for of `github.com/docker/go-plugins-helpers` is used until that lib migrates to modules.

Furthermore, vendoring dependencies for GCP functions is fixed. In modules mode, the output of `go list -deps` does not contain the prefix `github.com/elastic/beats/vendor`. As it does not look for packages under vendor.

As Beat generators were moved to the folder `_templates`, the license header check needed adjustment to exclude the templates.

## Why is it important?

Dockerlogbeat could not be built because of the lib is not a module.

`make update` runs successfully under `x-pack/functionbeat`.
kvch added a commit that referenced this pull request Feb 27, 2020
#16191)

## What does this PR do?

From now on our for of `github.com/docker/go-plugins-helpers` is used until that lib migrates to modules.

Furthermore, vendoring dependencies for GCP functions is fixed. In modules mode, the output of `go list -deps` does not contain the prefix `github.com/elastic/beats/vendor`. As it does not look for packages under vendor.

As Beat generators were moved to the folder `_templates`, the license header check needed adjustment to exclude the templates.

## Why is it important?

Dockerlogbeat could not be built because of the lib is not a module.

`make update` runs successfully under `x-pack/functionbeat`.
kvch added a commit that referenced this pull request Feb 28, 2020
#16191)

## What does this PR do?

From now on our for of `github.com/docker/go-plugins-helpers` is used until that lib migrates to modules.

Furthermore, vendoring dependencies for GCP functions is fixed. In modules mode, the output of `go list -deps` does not contain the prefix `github.com/elastic/beats/vendor`. As it does not look for packages under vendor.

As Beat generators were moved to the folder `_templates`, the license header check needed adjustment to exclude the templates.

## Why is it important?

Dockerlogbeat could not be built because of the lib is not a module.

`make update` runs successfully under `x-pack/functionbeat`.
kvch added a commit that referenced this pull request Mar 2, 2020
#16191)

## What does this PR do?

From now on our for of `github.com/docker/go-plugins-helpers` is used until that lib migrates to modules.

Furthermore, vendoring dependencies for GCP functions is fixed. In modules mode, the output of `go list -deps` does not contain the prefix `github.com/elastic/beats/vendor`. As it does not look for packages under vendor.

As Beat generators were moved to the folder `_templates`, the license header check needed adjustment to exclude the templates.

## Why is it important?

Dockerlogbeat could not be built because of the lib is not a module.

`make update` runs successfully under `x-pack/functionbeat`.
kvch added a commit that referenced this pull request Mar 3, 2020
#16191)

## What does this PR do?

From now on our for of `github.com/docker/go-plugins-helpers` is used until that lib migrates to modules.

Furthermore, vendoring dependencies for GCP functions is fixed. In modules mode, the output of `go list -deps` does not contain the prefix `github.com/elastic/beats/vendor`. As it does not look for packages under vendor.

As Beat generators were moved to the folder `_templates`, the license header check needed adjustment to exclude the templates.

## Why is it important?

Dockerlogbeat could not be built because of the lib is not a module.

`make update` runs successfully under `x-pack/functionbeat`.
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
elastic#16191)

## What does this PR do?

From now on our for of `github.com/docker/go-plugins-helpers` is used until that lib migrates to modules.

Furthermore, vendoring dependencies for GCP functions is fixed. In modules mode, the output of `go list -deps` does not contain the prefix `github.com/elastic/beats/vendor`. As it does not look for packages under vendor.

As Beat generators were moved to the folder `_templates`, the license header check needed adjustment to exclude the templates.

## Why is it important?

Dockerlogbeat could not be built because of the lib is not a module.

`make update` runs successfully under `x-pack/functionbeat`.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Team:Services (Deprecated) Label for the former Integrations-Services team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants