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.

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

[8.5](backport #2044) Add active filter for enrollment key queries. #2047

Merged
merged 2 commits into from
Nov 1, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 1, 2022

This is an automatic backport of pull request #2044 done by Mergify.
Cherry-pick of 3d15e24 has failed:

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

You are currently cherry-picking commit 3d15e24.
  (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:   internal/pkg/dl/enrollment_api_key.go
	modified:   internal/pkg/dl/enrollment_api_key_integration_test.go
	modified:   internal/pkg/policy/self.go
	modified:   internal/pkg/policy/self_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.next.asciidoc

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

* Add active filter for enrollment key queries.

Add an active: true filter to enrollment key queries. This allows
fleet-server to handle cases where there may be 10+ inactive keys
associated with a policy.

* review feedback

* fix linter

* fix tests

* Fix test cases

(cherry picked from commit 3d15e24)

# Conflicts:
#	CHANGELOG.next.asciidoc
@mergify mergify bot requested a review from a team as a code owner November 1, 2022 19:46
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 1, 2022
@mergify mergify bot requested review from AndersonQ and blakerouse November 1, 2022 19:46
@elasticmachine
Copy link
Contributor

elasticmachine commented Nov 1, 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-11-01T20:58:42.422+0000

  • Duration: 12 min 11 sec

Test stats 🧪

Test Results
Failed 0
Passed 359
Skipped 1
Total 360

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

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

  • /test : Re-trigger the build.

michel-laterman
michel-laterman previously approved these changes Nov 1, 2022
@mergify mergify bot merged commit 1dde0a3 into 8.5 Nov 1, 2022
@mergify mergify bot deleted the mergify/bp/8.5/pr-2044 branch November 1, 2022 21:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants