Skip to content
This repository has been archived by the owner on Sep 17, 2024. It is now read-only.

[7.16](backport #1943) feat: export Fetch&Download methods in the /pkg directory #1972

Merged
merged 2 commits into from
Jan 4, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 4, 2022

This is an automatic backport of pull request #1943 done by Mergify.
Cherry-pick of 63b6f42 has failed:

On branch mergify/bp/7.16/pr-1943
Your branch is up to date with 'origin/7.16'.

You are currently cherry-picking commit 63b6f427.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Makefile
	modified:   e2e/_suites/fleet/fleet.go
	modified:   internal/common/defaults.go
	modified:   internal/deploy/docker_test.go
	modified:   internal/installer/elasticagent_deb.go
	modified:   internal/installer/elasticagent_docker.go
	modified:   internal/installer/elasticagent_rpm.go
	modified:   internal/installer/elasticagent_tar.go
	modified:   internal/installer/elasticagent_tar_macos.go
	modified:   internal/installer/elasticagent_zip.go
	renamed:    internal/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-BEATS_VERSION-aarch64.rpm -> pkg/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-BEATS_VERSION-aarch64.rpm
	renamed:    internal/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-BEATS_VERSION-amd64.deb -> pkg/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-BEATS_VERSION-amd64.deb
	renamed:    internal/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-BEATS_VERSION-arm64.deb -> pkg/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-BEATS_VERSION-arm64.deb
	renamed:    internal/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-BEATS_VERSION-linux-amd64.docker.tar.gz -> pkg/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-BEATS_VERSION-linux-amd64.docker.tar.gz
	renamed:    internal/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-BEATS_VERSION-linux-amd64.tar.gz -> pkg/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-BEATS_VERSION-linux-amd64.tar.gz
	renamed:    internal/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-BEATS_VERSION-linux-arm64.docker.tar.gz -> pkg/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-BEATS_VERSION-linux-arm64.docker.tar.gz
	renamed:    internal/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-BEATS_VERSION-linux-arm64.tar.gz -> pkg/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-BEATS_VERSION-linux-arm64.tar.gz
	renamed:    internal/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-BEATS_VERSION-linux-x86_64.tar.gz -> pkg/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-BEATS_VERSION-linux-x86_64.tar.gz
	renamed:    internal/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-BEATS_VERSION-x86_64.rpm -> pkg/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-BEATS_VERSION-x86_64.rpm
	renamed:    internal/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-ubi8-BEATS_VERSION-linux-amd64.docker.tar.gz -> pkg/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-ubi8-BEATS_VERSION-linux-amd64.docker.tar.gz
	renamed:    internal/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-ubi8-BEATS_VERSION-linux-arm64.docker.tar.gz -> pkg/_testresources/beats/x-pack/elastic-agent/build/distributions/elastic-agent-ubi8-BEATS_VERSION-linux-arm64.docker.tar.gz
	renamed:    internal/_testresources/gcp/commits.json -> pkg/_testresources/gcp/commits.json
	renamed:    internal/_testresources/gcp/nextPageParam.json -> pkg/_testresources/gcp/nextPageParam.json
	renamed:    internal/_testresources/gcp/snapshots.json -> pkg/_testresources/gcp/snapshots.json
	renamed:    internal/versions.go -> pkg/downloads/versions.go
	renamed:    internal/versions_test.go -> pkg/downloads/versions_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   e2e/_suites/fleet/stand-alone.go
	both modified:   e2e/_suites/kubernetes-autodiscover/autodiscover_test.go
	both modified:   internal/deploy/docker.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* chore: copy internal's version files into the exported pkg public package

* chore: run unit tests from top-level goal

* chore: use public package instead of the internal one

* chore: remove old internal files for habdling downloads

* fix: update missing references

(cherry picked from commit 63b6f42)

# Conflicts:
#	e2e/_suites/fleet/stand-alone.go
#	e2e/_suites/kubernetes-autodiscover/autodiscover_test.go
#	internal/deploy/docker.go
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jan 4, 2022
@elasticmachine
Copy link
Contributor

elasticmachine commented Jan 4, 2022

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-01-04T11:27:27.769+0000

  • Duration: 38 min 23 sec

  • Commit: e3a8cfa

Test stats 🧪

Test Results
Failed 0
Passed 210
Skipped 0
Total 210

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

@mdelapenya mdelapenya removed the conflicts There is a conflict in the backported pull request label Jan 4, 2022
@mdelapenya mdelapenya merged commit 73af71d into 7.16 Jan 4, 2022
@mergify mergify bot deleted the mergify/bp/7.16/pr-1943 branch January 4, 2022 16:56
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants