[Fleet] Bulk upgrade api response change #95236
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
9 tasks
|
Pinging @elastic/fleet (Team:Fleet) |
Zacqary
requested changes
Mar 24, 2021
| for (const agentResult of givenAgentsResults) { | ||
| if (agentResult.found === false) { | ||
| outgoingErrors[agentResult._id] = new AgentReassignmentError( | ||
| `Cannot find agent ${agentResult._id}` |
There was a problem hiding this comment.
This error message needs to be wrapped in i18n.translate
| if (policy.is_managed) { | ||
| throw new IngestManagerError(`Cannot upgrade agent in managed policy ${policy.id}`); | ||
| if (!options.force && agent.policy_id && managedPolicies[agent.policy_id]) { | ||
| throw new IngestManagerError(`Cannot upgrade agent in managed policy ${agent.policy_id}`); |
| givenAgents.map(async (agent) => { | ||
| const isAllowed = options.force || isAgentUpgradeable(agent, kibanaVersion); | ||
| if (!isAllowed) { | ||
| throw new IngestManagerError(`${agent.id} is not upgradeable`); |
nchaulet
approved these changes
Mar 25, 2021
|
@elasticmachine merge upstream |
💚 Build SucceededMetrics [docs]
History
To update your PR or re-run it, just comment with: cc @jfsiii |
|
@Zacqary Thanks for the review. I agree with you that those error messages should have translations. However, as @nchaulet notes, there are many places which don't yet do that. Are you OK with doing those changes in another PR? I was going to add them in this PR just to start the process, but I have another PR I'm focusing on right now and I'd really like to merge this one. |
|
@jfsiii Sure, we can merge this one, but let's try to avoid adding new string literals without translations in the future. |
Zacqary
approved these changes
Mar 26, 2021
kibanamachine
added a commit
to kibanamachine/kibana
that referenced
this pull request
Mar 26, 2021
## Summary `/agents/bulk_upgrade` should return a response with a result for each agent given; including invalid or missing ids. It currently returns an empty object. This PR includes commits from open PR elastic#95024. The additions from this PR are https://github.com/jfsiii/kibana/compare/bulk-reassign-response-should-include-all-given-agents..871ebcb [TS type diff for response](https://github.com/jfsiii/kibana/compare/bulk-reassign-response-should-include-all-given-agents..871ebcb#diff-7006a6c170a608c8c7211fc218c0a6f4bc8ff642c170ea264db4b1b5545fb728) ```diff - // eslint-disable-next-line @typescript-eslint/no-empty-interface - export interface PostBulkAgentUpgradeResponse {} + export type PostBulkAgentUpgradeResponse = Record< + Agent['id'], + { + success: boolean; + error?: string; + } + >; ``` ### 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>
kibanamachine
added a commit
that referenced
this pull request
Mar 26, 2021
## Summary `/agents/bulk_upgrade` should return a response with a result for each agent given; including invalid or missing ids. It currently returns an empty object. This PR includes commits from open PR #95024. The additions from this PR are https://github.com/jfsiii/kibana/compare/bulk-reassign-response-should-include-all-given-agents..871ebcb [TS type diff for response](https://github.com/jfsiii/kibana/compare/bulk-reassign-response-should-include-all-given-agents..871ebcb#diff-7006a6c170a608c8c7211fc218c0a6f4bc8ff642c170ea264db4b1b5545fb728) ```diff - // eslint-disable-next-line @typescript-eslint/no-empty-interface - export interface PostBulkAgentUpgradeResponse {} + export type PostBulkAgentUpgradeResponse = Record< + Agent['id'], + { + success: boolean; + error?: string; + } + >; ``` ### 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
/agents/bulk_upgradeshould return a response with a result for each agent given; including invalid or missing ids. It currently returns an empty object.This PR includes commits from open PR #95024. The additions from this PR are https://github.com/jfsiii/kibana/compare/bulk-reassign-response-should-include-all-given-agents..871ebcb
TS type diff for response
Checklist