-
Notifications
You must be signed in to change notification settings - Fork 483
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
fix issue with resetting abm token teams #26259
Conversation
6031f3c
to
2ab6128
Compare
2ab6128
to
ff926b8
Compare
ff926b8
to
16d8171
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #26259 +/- ##
==========================================
- Coverage 63.78% 63.78% -0.01%
==========================================
Files 1653 1655 +2
Lines 158729 158962 +233
Branches 4093 4093
==========================================
+ Hits 101253 101392 +139
- Misses 49542 49624 +82
- Partials 7934 7946 +12
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
I'm sorry, I still don't understand the issue. In the code, it looks like you're checking It seems like you should just check
{
"mdm": { /* empty */ }
}
{
"mdm": {
"apple_business_manager": null
}
} or {
"mdm": {
"apple_business_manager": []
}
} I don't see the need for the new GitOps query option.
So, gitops should look at existing teams and set this array to match existing teams. Then, after teams have been processed (if new teams have been added), gitops can come back and patch this endpoint with the added teams. (I'm just speculating how this could work since I don't know the exact interactions.) |
ac2f284
to
aaf984e
Compare
16eff48
to
0d803d9
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's missing the new tests, I think I'm too early to review?
For #24040 Add gitops option for the request to modify the app config. There was an issue with the abm token teams getting reset to default anytime the `PATCH /fleet/config` endpoint was called. @jahzielv and I discussed various options on how to solve this and agreed that the approach taken in this PR was the quickest but not the best. Ideally, we'd like the gitops client to send back the data to the endpoint that its going to update. This will allow the `PATCH /fleet/config` endpoint to work like a standard `PATCH` request and only update the options provided instead of updating the app config differently depending on the client calling the endpoint. - [x] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. See [Changes files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/Committing-Changes.md#changes-files) for more information. - [x] Added/updated automated tests - [x] Manual QA for all new/changed functionality
For #24040 Add gitops option for the request to modify the app config. There was an issue with the abm token teams getting reset to default anytime the `PATCH /fleet/config` endpoint was called. @jahzielv and I discussed various options on how to solve this and agreed that the approach taken in this PR was the quickest but not the best. Ideally, we'd like the gitops client to send back the data to the endpoint that its going to update. This will allow the `PATCH /fleet/config` endpoint to work like a standard `PATCH` request and only update the options provided instead of updating the app config differently depending on the client calling the endpoint. - [x] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. See [Changes files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/Committing-Changes.md#changes-files) for more information. - [x] Added/updated automated tests - [x] Manual QA for all new/changed functionality
For #24040 Add gitops option for the request to modify the app config. There was an issue with the abm token teams getting reset to default anytime the `PATCH /fleet/config` endpoint was called. @jahzielv and I discussed various options on how to solve this and agreed that the approach taken in this PR was the quickest but not the best. Ideally, we'd like the gitops client to send back the data to the endpoint that its going to update. This will allow the `PATCH /fleet/config` endpoint to work like a standard `PATCH` request and only update the options provided instead of updating the app config differently depending on the client calling the endpoint. - [x] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. See [Changes files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/Committing-Changes.md#changes-files) for more information. - [x] Added/updated automated tests - [x] Manual QA for all new/changed functionality
For #24040 Add gitops option for the request to modify the app config. There was an issue with the abm token teams getting reset to default anytime the `PATCH /fleet/config` endpoint was called. @jahzielv and I discussed various options on how to solve this and agreed that the approach taken in this PR was the quickest but not the best. Ideally, we'd like the gitops client to send back the data to the endpoint that its going to update. This will allow the `PATCH /fleet/config` endpoint to work like a standard `PATCH` request and only update the options provided instead of updating the app config differently depending on the client calling the endpoint. - [x] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. See [Changes files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/Committing-Changes.md#changes-files) for more information. - [x] Added/updated automated tests - [x] Manual QA for all new/changed functionality
For #24040
Add gitops option for the request to modify the app config.
There was an issue with the abm token teams getting reset to default anytime the
PATCH /fleet/config
endpoint was called. @jahzielv and I discussed various options on how to solve this and agreed that the approach taken in this PR was the quickest but not the best. Ideally, we'd like the gitops client to send back the data to the endpoint that its going to update. This will allow thePATCH /fleet/config
endpoint to work like a standardPATCH
request and only update the options provided instead of updating the app config differently depending on the client calling the endpoint.changes/
,orbit/changes/
oree/fleetd-chrome/changes
.See Changes files for more information.