[Fleet] Update package policy id when agent id changes #151886
Merged
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
orouz
commented
Feb 22, 2023
Comment on lines
-89
to
-100
| // Update package policy's package and agent policy info | ||
| useEffect(() => { | ||
| // TODO move this to parent hook | ||
| // If agent policy has changed, update package policy's agent policy ID and namespace | ||
| if (agentPolicy && packagePolicy.policy_id !== agentPolicy.id) { | ||
| updatePackagePolicy({ | ||
| policy_id: agentPolicy.id, | ||
| namespace: agentPolicy.namespace, | ||
| }); | ||
| } | ||
| }, [packagePolicy, agentPolicy, packageInfo, updatePackagePolicy]); | ||
|
|
There was a problem hiding this comment.
this effect was lifted to a single parent hook - onSubmit, which is 1 of 3 usages. the other two are not relevant:
- edit screen doesn't allow changing agent policy
- multi page layout doesn't use
package-policy-replace-define-step
alternatively, we can instead keep it as is and duplicate it in our custom extension component.
orouz
added
release_note:skip
|
Pinging @elastic/fleet (Team:Fleet) |
kpollich
approved these changes
Feb 23, 2023
nchaulet
approved these changes
Feb 23, 2023
💚 Build Succeeded
Metrics [docs]Async chunks
Unknown metric groupsESLint disabled line counts
Total ESLint disabled count
History
To update your PR or re-run it, just comment with: |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Feb 26, 2023
(cherry picked from commit 69420e1)
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
kibanamachine
added a commit
that referenced
this pull request
Feb 26, 2023
#152169) # Backport This will backport the following commits from `main` to `8.7`: - [[Fleet] Update package policy id when agent id changes (#151886)](#151886) <!--- Backport version: 8.9.7 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Or Ouziel","email":"or.ouziel@elastic.co"},"sourceCommit":{"committedDate":"2023-02-26T11:32:42Z","message":"[Fleet] Update package policy id when agent id changes (#151886)","sha":"69420e1bae7e3821b7b861255c3da0a0c893161b","branchLabelMapping":{"^v8.8.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","ci:cloud-redeploy","v8.7.0","v8.8.0"],"number":151886,"url":"https://github.com/elastic/kibana/pull/151886","mergeCommit":{"message":"[Fleet] Update package policy id when agent id changes (#151886)","sha":"69420e1bae7e3821b7b861255c3da0a0c893161b"}},"sourceBranch":"main","suggestedTargetBranches":["8.7"],"targetPullRequestStates":[{"branch":"8.7","label":"v8.7.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.8.0","labelRegex":"^v8.8.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/151886","number":151886,"mergeCommit":{"message":"[Fleet] Update package policy id when agent id changes (#151886)","sha":"69420e1bae7e3821b7b861255c3da0a0c893161b"}}]}] BACKPORT--> Co-authored-by: Or Ouziel <or.ouziel@elastic.co>
bmorelli25
pushed a commit
to bmorelli25/kibana
that referenced
this pull request
Mar 10, 2023
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
closes https://github.com/elastic/security-team/issues/6001 (2nd screenshot)
there is an effect firing in
StepDefinePackagePolicythat keeps package policy id in sync with agent policy.after merging #149653, usage of this new extension point will require duplicating that effect. this PR lifts it to the
onSubmithook.