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

Remove Windows MDM feature flag #15167

Merged
merged 7 commits into from
Dec 7, 2023
Merged

Remove Windows MDM feature flag #15167

merged 7 commits into from
Dec 7, 2023

Conversation

mna
Copy link
Member

@mna mna commented Nov 15, 2023

For #14959 , but I believe it also requires frontend changes.

Checklist for submitter

  • Changes file added for user-visible changes in changes/ or orbit/changes/.
    See Changes files for more information.
  • Added/updated tests
  • Manual QA for all new/changed functionality

@mna mna mentioned this pull request Nov 15, 2023
4 tasks
Copy link

codecov bot commented Nov 15, 2023

Codecov Report

Attention: 2 lines in your changes are missing coverage. Please review.

Comparison is base (6b128dd) 67.50% compared to head (752860e) 67.49%.
Report is 4 commits behind head on main.

Files Patch % Lines
cmd/fleet/serve.go 0.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main   #15167      +/-   ##
==========================================
- Coverage   67.50%   67.49%   -0.01%     
==========================================
  Files        1030     1030              
  Lines       89619    89669      +50     
  Branches     2306     2302       -4     
==========================================
+ Hits        60493    60519      +26     
- Misses      24622    24640      +18     
- Partials     4504     4510       +6     
Flag Coverage Δ
backend 68.82% <71.42%> (-0.02%) ⬇️
frontend 52.40% <ø> (+0.02%) ⬆️

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.

@mna mna force-pushed the mna-14959-remove-winmdm-fflag branch from de91b98 to 262cc20 Compare December 6, 2023 14:44
is released. the view all UI will show in the windows column when we
release the feature. */}
{!original.includeWindows && (
{!true && (
Copy link
Member Author

Choose a reason for hiding this comment

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

So here I'm really not sure what to do? By removing mdm_enabled, includeWindows is now always true, so that means I should delete the whole {...} part? So <ViewAllHostsLink> would not be rendered anymore, does that sound correct?

Copy link
Contributor

Choose a reason for hiding this comment

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

We want View all hosts to always appear now so I'm gonna remove the conditional and just render that component

@@ -234,11 +234,11 @@ const AppleBusinessManagerSection = ({
<div className={baseClass}>
<h2>Apple Business Manager</h2>
{isLoadingMdmAppleBm ? <Spinner /> : renderAppleBMInfo()}
{config?.mdm_enabled && (
{
Copy link
Member Author

Choose a reason for hiding this comment

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

Should I remove those {} around <WindowsAutomaticEnrollmentCard>?

<WindowsMdmCard
turnOnWindowsMdm={navigateToWindowsMdm}
editWindowsMdm={navigateToWindowsMdm}
/>
Copy link
Member Author

Choose a reason for hiding this comment

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

Or should I have kept the {} around <WindowsMdmCard>?

Copy link
Contributor

Choose a reason for hiding this comment

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

without the {} looks good to me! (the {} are used to wrap expressions)

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks, I'll remove them from here then.

@@ -1,8 +1,6 @@
output "extra_environment_variables" {
value = merge(var.enable_apple_mdm == false ? {} : {
FLEET_MDM_APPLE_SERVER_ADDRESS = var.public_domain_name
}, var.enable_windows_mdm == false ? {} : {
FLEET_DEV_MDM_ENABLED = "1"
Copy link
Member Author

Choose a reason for hiding this comment

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

For infra folks reviewing this - I removed the feature flag environment variable but left everything else intact in the terraform, this means the var.enable_windows_mdm variable is still there (as I think it should, since it is used to define the WSTEP cert or not). TBD if the default value should now be set to true as it is for Apple?

Copy link
Contributor

Choose a reason for hiding this comment

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

It'd be safe to do so either way because having the WSTEP cert bytes populated by the SCEP key/cert doesn't change anything until they add check they want Windows MDM in the UI. Setting the default to enabled would make it fairly easy to allow existing Mac MDM enjoyers to have the Windows needed-configurations in place right away.

Regardless I'm happy to approve from the Infra side either way.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks @rfairburn , in order to keep the impact of this PR as focused as possible I'll leave it as it is for now.

@mna mna marked this pull request as ready for review December 6, 2023 15:44
@mna mna requested review from edwardsb and a team as code owners December 6, 2023 15:44
rfairburn
rfairburn previously approved these changes Dec 6, 2023
Copy link
Contributor

@rfairburn rfairburn left a comment

Choose a reason for hiding this comment

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

Approval is for infra/terraform portion of the changes.

roperzh
roperzh previously approved these changes Dec 6, 2023
@mna mna dismissed stale reviews from roperzh and rfairburn via c597d48 December 6, 2023 20:34
@roperzh roperzh merged commit 8b7d1a7 into main Dec 7, 2023
23 checks passed
@roperzh roperzh deleted the mna-14959-remove-winmdm-fflag branch December 7, 2023 17:24
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.

4 participants