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

Revert "Default fleet policy removal" #1287

Merged
merged 1 commit into from
Apr 1, 2022
Merged

Conversation

ph
Copy link
Contributor

@ph ph commented Apr 1, 2022

Reverts #1157

Reverting we will rework it to make it non-breaking.

@ph ph added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Apr 1, 2022
@ph ph requested a review from a team as a code owner April 1, 2022 13:12
@ph ph self-assigned this Apr 1, 2022
@ph ph added the backport-v8.2.0 Automated backport with mergify label Apr 1, 2022
@elasticmachine
Copy link
Contributor

elasticmachine commented Apr 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-04-01T14:21:03.899+0000

  • Duration: 12 min 51 sec

Test stats 🧪

Test Results
Failed 0
Passed 271
Skipped 0
Total 271

🤖 GitHub comments

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

  • /test : Re-trigger the build.

@ph
Copy link
Contributor Author

ph commented Apr 1, 2022

test this please

@ph
Copy link
Contributor Author

ph commented Apr 1, 2022

[2022-04-01T13:17:50.735Z]     enrollment_api_key_integration_test.go:113:   []model.EnrollmentApiKey{
[2022-04-01T13:17:50.735Z]           	{
[2022-04-01T13:17:50.735Z]           		ESDocument: model.ESDocument{
[2022-04-01T13:17:50.735Z]         - 			Id:      "c93fmvc2jgjfauojood0",
[2022-04-01T13:17:50.735Z]         + 			Id:      "c93fmvc2jgjfauojooe0",
[2022-04-01T13:17:50.735Z]           			Version: 0,
[2022-04-01T13:17:50.735Z]           			SeqNo:   0,
[2022-04-01T13:17:50.735Z]           		},
[2022-04-01T13:17:50.735Z]           		Active:    true,
[2022-04-01T13:17:50.735Z]           		ApiKey:    "d2JndlFIWUJJUVVxWDVia2NJTV86X0d6ZmljZGNTc1d4R1otbklrZFFRZw==",
[2022-04-01T13:17:50.735Z]         - 		ApiKeyId:  "c93fmvc2jgjfauojoodg",
[2022-04-01T13:17:50.735Z]         + 		ApiKeyId:  "c93fmvc2jgjfauojooeg",
[2022-04-01T13:17:50.735Z]           		CreatedAt: "2022-04-01T13:17:49Z",
[2022-04-01T13:17:50.735Z]           		ExpireAt:  "",
[2022-04-01T13:17:50.735Z]           		... // 3 identical fields
[2022-04-01T13:17:50.735Z]           	},
[2022-04-01T13:17:50.735Z]           	{
[2022-04-01T13:17:50.735Z]           		ESDocument: model.ESDocument{
[2022-04-01T13:17:50.735Z]         - 			Id:      "c93fmvc2jgjfauojooe0",
[2022-04-01T13:17:50.735Z]         + 			Id:      "c93fmvc2jgjfauojood0",
[2022-04-01T13:17:50.735Z]           			Version: 0,
[2022-04-01T13:17:50.735Z]           			SeqNo:   0,
[2022-04-01T13:17:50.735Z]           		},
[2022-04-01T13:17:50.735Z]           		Active:    true,
[2022-04-01T13:17:50.735Z]           		ApiKey:    "d2JndlFIWUJJUVVxWDVia2NJTV86X0d6ZmljZGNTc1d4R1otbklrZFFRZw==",
[2022-04-01T13:17:50.735Z]         - 		ApiKeyId:  "c93fmvc2jgjfauojooeg",
[2022-04-01T13:17:50.735Z]         + 		ApiKeyId:  "c93fmvc2jgjfauojoodg",
[2022-04-01T13:17:50.735Z]           		CreatedAt: "2022-04-01T13:17:49Z",
[2022-04-01T13:17:50.735Z]           		ExpireAt:  "",
[2022-04-01T13:17:50.735Z]           		... // 3 identical fields
[2022-04-01T13:17:50.735Z]           	},
[2022-04-01T13:17:50.735Z]           }
[2022-04-01T13:17:50.735Z]         
[2022-04-01T13:17:50.735Z] --- FAIL: TestSearchEnrollmentAPIKeyByPolicyID (1.10s)

The ci was hiding the real reason.. again :(

@ph
Copy link
Contributor Author

ph commented Apr 1, 2022

I think its either the query or the expectation are wrong in this integration test, I am not familiar with the logic but this could potentially hide a bug, I am going to retrigger this test and create an issue to investigate it.

@ph
Copy link
Contributor Author

ph commented Apr 1, 2022

/test

@ph
Copy link
Contributor Author

ph commented Apr 1, 2022

Please ignore lint, we are reverting changes the linter will yield at us.

Copy link
Contributor

@narph narph left a comment

Choose a reason for hiding this comment

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

compared with initial PR , LGTM

@ph ph merged commit e54a959 into main Apr 1, 2022
@ph ph added backport-v8.2.0 Automated backport with mergify and removed backport-v8.2.0 Automated backport with mergify labels Apr 1, 2022
@ph
Copy link
Contributor Author

ph commented Apr 1, 2022

@Mergifyio requeue

@mergify
Copy link
Contributor

mergify bot commented Apr 1, 2022

requeue

❌ This pull request head commit has not been previously disembarked from queue.

@mdelapenya
Copy link
Contributor

@Mergifyio refresh

@mergify
Copy link
Contributor

mergify bot commented Apr 1, 2022

refresh

✅ Pull request refreshed

@mdelapenya
Copy link
Contributor

@Mergifyio backport 8.2

@mergify
Copy link
Contributor

mergify bot commented Apr 1, 2022

backport 8.2

✅ Backports have been created

ph added a commit that referenced this pull request Apr 1, 2022
Revert "Default fleet policy removal" (backport #1287)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-v8.2.0 Automated backport with mergify Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants