mirror of
https://github.com/fleetdm/fleet
synced 2026-04-21 21:47:20 +00:00
For #26519 This PR allows Fleet server to use Android with either fleetdm.com proxy or locally. It also removes the Android feature flag from the backend. The frontend changes and proxy API documentation will be in separate PRs. Updated contributor docs: https://github.com/fleetdm/fleet/pull/29880/files Integration tests are missing and tracked as a separate issue: https://github.com/fleetdm/fleet/issues/27080 # Checklist for submitter - [x] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. - [x] Added/updated automated tests - [x] Manual QA for all new/changed functionality
21 lines
593 B
Go
21 lines
593 B
Go
package android
|
|
|
|
// ConflictError is returned when there is a conflict with the current resource state,
|
|
// such as trying to create a resource that already exists.
|
|
// It implements the conflictErrorInterface from transport_error.go
|
|
type ConflictError struct {
|
|
error
|
|
}
|
|
|
|
func (e *ConflictError) IsConflict() bool {
|
|
return true
|
|
}
|
|
|
|
// IsClientError ensures that this error will be logged with info/debug level (and not error level) in the server logs.
|
|
func (e *ConflictError) IsClientError() bool {
|
|
return true
|
|
}
|
|
|
|
func NewConflictError(err error) *ConflictError {
|
|
return &ConflictError{err}
|
|
}
|