Skip to content
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

Revert changes to DEP enrollment flow #20506

Merged
merged 2 commits into from
Jul 16, 2024
Merged

Revert changes to DEP enrollment flow #20506

merged 2 commits into from
Jul 16, 2024

Conversation

gillespi314
Copy link
Contributor

Reverts #20162 and #20355 per QA findings

@gillespi314
Copy link
Contributor Author

Down migrations to be applied manually to dogfood and QA environments:

ALTER TABLE mdm_idp_accounts DROP INDEX idx_mdm_idp_accounts_host_uuid;

ALTER TABLE mdm_idp_accounts DROP COLUMN host_uuid;

ALTER TABLE mdm_idp_accounts DROP COLUMN fleet_enroll_ref;

DELETE FROM migration_status_tables WHERE version_id IN(20240709175341, 20240710152744)

Copy link
Member

@mna mna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Backend revert LGTM.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should send a message to #help-engineering so that devs know that this change might break their local setups.

Copy link
Member

@lucasmrod lucasmrod left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes look good (assuming it's an exact revert).

Copy link

codecov bot commented Jul 16, 2024

Codecov Report

Attention: Patch coverage is 47.05882% with 18 lines in your changes missing coverage. Please review.

Project coverage is 37.20%. Comparing base (b4b4498) to head (b2e1106).
Report is 4 commits behind head on main.

Files Patch % Lines
server/mock/datastore_mock.go 0.00% 6 Missing ⚠️
server/service/osquery_utils/queries.go 0.00% 3 Missing and 1 partial ⚠️
server/datastore/mysql/hosts.go 62.50% 2 Missing and 1 partial ⚠️
server/service/apple_mdm.go 60.00% 1 Missing and 1 partial ⚠️
server/worker/apple_mdm.go 66.66% 2 Missing ⚠️
server/datastore/mysql/apple_mdm.go 80.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##             main   #20506       +/-   ##
===========================================
- Coverage   55.12%   37.20%   -17.93%     
===========================================
  Files        1426     1423        -3     
  Lines      134052   133761      -291     
  Branches     3218     3216        -2     
===========================================
- Hits        73900    49764    -24136     
- Misses      54125    79508    +25383     
+ Partials     6027     4489     -1538     
Flag Coverage Δ
backend 35.77% <47.05%> (-19.48%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@georgekarrv georgekarrv merged commit 7dda2e9 into main Jul 16, 2024
26 checks passed
@georgekarrv georgekarrv deleted the revert-20162 branch July 16, 2024 16:44
gillespi314 added a commit that referenced this pull request Jul 16, 2024
georgekarrv pushed a commit that referenced this pull request Jul 16, 2024
> [!NOTE]
> This PR already merged in `main`, see #20506. This is against the
release branch so it can be included in 4.54.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants