From 0baf8441c6f064ecddc0ad22f56eb0a20a62ca6f Mon Sep 17 00:00:00 2001
From: Zachary Winnerman <98712682+zwinnerman-fleetdm@users.noreply.github.com>
Date: Mon, 24 Jul 2023 16:53:29 -0400
Subject: [PATCH] =?UTF-8?q?see=20https://github.com/fleetdm/confidential/i?=
 =?UTF-8?q?ssues/3166#issuecomment-=E2=80=A6=20(#12940)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…1648567704

# Checklist for submitter

If some of the following don't apply, delete the relevant line.

- [ ] Changes file added for user-visible changes in `changes/` or
`orbit/changes/`.
See [Changes
files](https://fleetdm.com/docs/contributing/committing-changes#changes-files)
for more information.
- [ ] Documented any API changes (docs/Using-Fleet/REST-API.md or
docs/Contributing/API-for-contributors.md)
- [ ] Documented any permissions changes
- [ ] Input data is properly validated, `SELECT *` is avoided, SQL
injection is prevented (using placeholders for values in statements)
- [ ] Added support on fleet's osquery simulator `cmd/osquery-perf` for
new osquery data ingestion features.
- [ ] Added/updated tests
- [ ] Manual QA for all new/changed functionality
  - For Orbit and Fleet Desktop changes:
- [ ] Manual QA must be performed in the three main OSs, macOS, Windows
and Linux.
- [ ] Auto-update manual QA, from released version of component to new
version (see [tools/tuf/test](../tools/tuf/test/README.md)).
---
 infrastructure/dogfood/terraform/aws-tf-module/main.tf | 2 +-
 terraform/addons/mdm/outputs.tf                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/infrastructure/dogfood/terraform/aws-tf-module/main.tf b/infrastructure/dogfood/terraform/aws-tf-module/main.tf
index 9e3c8d9434..7e9f42b529 100644
--- a/infrastructure/dogfood/terraform/aws-tf-module/main.tf
+++ b/infrastructure/dogfood/terraform/aws-tf-module/main.tf
@@ -176,7 +176,7 @@ module "migrations" {
 }
 
 module "mdm" {
-  source             = "github.com/fleetdm/fleet//terraform/addons/mdm?ref=tf-mod-addon-mdm-v1.2.1"
+  source             = "github.com/fleetdm/fleet//terraform/addons/mdm?ref=tf-mod-addon-mdm-v1.2.2"
   public_domain_name = "dogfood.fleetdm.com"
   enable_windows_mdm = true
   apn_secret_name    = "${local.customer}-apn"
diff --git a/terraform/addons/mdm/outputs.tf b/terraform/addons/mdm/outputs.tf
index 8799f6be9a..fcb86e7b10 100644
--- a/terraform/addons/mdm/outputs.tf
+++ b/terraform/addons/mdm/outputs.tf
@@ -2,7 +2,7 @@ output "extra_environment_variables" {
   value = merge({
     FLEET_MDM_APPLE_SERVER_ADDRESS = var.public_domain_name
     }, var.enable_windows_mdm == false ? {} : {
-    FLEET_MDM_WINDOWS_ENABLED_AND_CONFIGURED = "true"
+    FLEET_DEV_MDM_ENABLED = "1"
   })
 }