diff --git a/server/service/apple_mdm.go b/server/service/apple_mdm.go index 66e4ba30c6..c230ccbec7 100644 --- a/server/service/apple_mdm.go +++ b/server/service/apple_mdm.go @@ -3342,7 +3342,7 @@ func (svc *MDMAppleDDMService) handleDeclarationsResponse(ctx context.Context, e case "configuration": return svc.handleConfigurationDeclaration(ctx, parts, hostUUID) default: - return nil, nano_service.NewHTTPStatusError(http.StatusBadRequest, ctxerr.Errorf(ctx, "declaration type not supported: %s", parts[1])) + return nil, nano_service.NewHTTPStatusError(http.StatusNotFound, ctxerr.Errorf(ctx, "declaration type not supported: %s", parts[1])) } } diff --git a/server/service/integration_ddm_test.go b/server/service/integration_ddm_test.go index b6d7e72e0f..a2c5425ca3 100644 --- a/server/service/integration_ddm_test.go +++ b/server/service/integration_ddm_test.go @@ -450,16 +450,14 @@ INSERT INTO host_mdm_apple_declarations ( // try getting a non-existent declaration, should fail 404 nonExistantDeclarationPath := fmt.Sprintf("declaration/%s/%s", "configuration", "nonexistent") - res, err := mdmDevice.DeclarativeManagement(nonExistantDeclarationPath) + _, err = mdmDevice.DeclarativeManagement(nonExistantDeclarationPath) require.Error(t, err) - require.Equal(t, http.StatusNotFound, res.StatusCode) require.ErrorContains(t, err, "404 Not Found") // try getting an unsupported declaration, should fail 404 unsupportedDeclarationPath := fmt.Sprintf("declaration/%s/%s", "asset", "nonexistent") - res, err = mdmDevice.DeclarativeManagement(unsupportedDeclarationPath) + _, err = mdmDevice.DeclarativeManagement(unsupportedDeclarationPath) require.Error(t, err) - require.Equal(t, http.StatusNotFound, res.StatusCode) require.ErrorContains(t, err, "404 Not Found") // typo should fail as bad request