[Fleet] support force flag to add/remove package_policies #96713
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
jfsiii
added
release_note:skip
jfsiii
commented
Apr 11, 2021
| @@ -79,18 +79,20 @@ export const createPackagePolicyHandler: RequestHandler< | |||
| > = async (context, request, response) => { | |||
| const soClient = context.core.savedObjects.client; | |||
| const esClient = context.core.elasticsearch.client.asCurrentUser; | |||
| const user = (await appContextService.getSecurity()?.authc.getCurrentUser(request)) || undefined; | |||
| const user = appContextService.getSecurity()?.authc.getCurrentUser(request) || undefined; | |||
There was a problem hiding this comment.
saw this in VS code:
Everything I found also indicates getCurrentUser is sync
jfsiii
commented
Apr 11, 2021
| version: '0.13.0', | ||
| }, | ||
| }) | ||
| .expect(400); |
There was a problem hiding this comment.
now expects 400 vs 500
jfsiii
commented
Apr 11, 2021
| version: '0.1.0', | ||
| }, | ||
| }) | ||
| .expect(400); |
There was a problem hiding this comment.
now expects 400 vs 500
jfsiii
commented
Apr 11, 2021
| } else { | ||
| warnAndSkipTest(this, log); | ||
| } | ||
| it('should return a 400 if there is another package policy with the same name', async function () { |
There was a problem hiding this comment.
now expects 400 vs 500
jfsiii
commented
Apr 11, 2021
| namespace: 'default', | ||
| is_managed: true, | ||
| }); | ||
| it('can only add to managed agent policies using the force parameter', async function () { |
There was a problem hiding this comment.
Test the new behavior (force bypasses hosted policy restriction)
jfsiii
commented
Apr 11, 2021
| @@ -47,230 +46,229 @@ export default function ({ getService }: FtrProviderContext) { | |||
| .send({ agentPolicyId }); | |||
| }); | |||
|
|
|||
| it('should fail for managed agent policies', async function () { | |||
| if (server.enabled) { | |||
There was a problem hiding this comment.
Most of the changes here are whitespace only from replacing the if (server.enabled) { ... } else { ... } pattern with skipIfNoDockerRegistry.
|
Pinging @elastic/fleet (Team:Fleet) |
|
@elasticmachine merge upstream |
|
cc @simitt this means the "make it unmanaged first" workaround from #90675 (comment) is no longer required |
|
/run-fleet-e2e-tests |
nchaulet
approved these changes
Apr 12, 2021
💚 Build SucceededMetrics [docs]
History
To update your PR or re-run it, just comment with: cc @jfsiii |
jfsiii
added
the
auto-backport
kibanamachine
added a commit
to kibanamachine/kibana
that referenced
this pull request
Apr 12, 2021
) ## Summary Can now pass a `force=true` parameter to add & remove integrations on hosted policies as originally intended [1] & [2] * Add `force` param for `POST` `/api/fleet/package_policies` & `/api/fleet/package_policies/delete` to a policy. Update tests to confirm * Not strictly required, but "while I was in there" * Updated a few places to throw `IngestManagerError` vs `Error` for `400` response vs `500`. Updated tests. * removed a few unnecessary `await`s of sync function [1] elastic#92426 (comment) [2] elastic#90445 ### Checklist - [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
💚 Backport successful
This backport PR will be merged automatically after passing CI. |
kibanamachine
added a commit
that referenced
this pull request
Apr 12, 2021
…96868) ## Summary Can now pass a `force=true` parameter to add & remove integrations on hosted policies as originally intended [1] & [2] * Add `force` param for `POST` `/api/fleet/package_policies` & `/api/fleet/package_policies/delete` to a policy. Update tests to confirm * Not strictly required, but "while I was in there" * Updated a few places to throw `IngestManagerError` vs `Error` for `400` response vs `500`. Updated tests. * removed a few unnecessary `await`s of sync function [1] #92426 (comment) [2] #90445 ### Checklist - [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: John Schulz <john.schulz@elastic.co>
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.
Summary
Can now pass a
force=trueparameter to add & remove integrations on hosted policies as originally intended [1] & [2]forceparam forPOST/api/fleet/package_policies&/api/fleet/package_policies/deleteto a policy. Update tests to confirmIngestManagerErrorvsErrorfor400response vs500. Updated tests.awaits of sync function[1] #92426 (comment)
[2] #90445
Checklist