GitOps & API design: Add multiple Apple Business Manager and Volume Purchasing Program connections

docs/REST API/rest-api.md

@@ -1164,7 +1164,7 @@ Modifies the Fleet's configuration with the supplied information.
   "mdm": {
     "apple_bm_default_team": "",
     "apple_bm_terms_expired": false,
-    "apple_bm_enabled_and_configured": false,
+    "apple_bm_enabled_and_configured": false, # set to true is there's one or more Apple Business Manager connections
     "enabled_and_configured": false,
     "windows_enabled_and_configured": false,
     "enable_disk_encryption": true,
@@ -6349,7 +6349,7 @@ This endpoint returns the list of custom MDM commands that have been executed.
 ## Integrations
 
 - [Get Apple Push Notification service (APNs)](#get-apple-push-notification-service-apns)
-- [Get Apple Business Manager (ABM)](#get-apple-business-manager-abm)
+- [List Apple Business Manager (ABM) connections](#get-apple-business-manager-abm)
 
 ### Get Apple Push Notification service (APNs)
 
@@ -6376,32 +6376,70 @@ None.
 }
 ```
 
-### Get Apple Business Manager (ABM)
+### List Apple Business Manager (ABM) connections
 
 _Available in Fleet Premium_
 
-`GET /api/v1/fleet/abm`
+`GET /api/v1/fleet/apple_business_manager`
 
 #### Parameters
 
 None.
 
 #### Example
 
-`GET /api/v1/fleet/abm`
+`GET /api/v1/fleet/apple_business_manager`
 
 ##### Default response
 
 `Status: 200`
 
 ```json
-{
-  "apple_id": "apple@example.com",
-  "org_name": "Fleet Device Management",
-  "mdm_server_url": "https://example.com/mdm/apple/mdm",
-  "renew_date": "2023-11-29T00:00:00Z",
-  "default_team": ""
-}
+[
+  {
+    "apple_id": "apple@example.com",
+    "org_name": "Fleet Device Management Inc.",
+    "mdm_server_url": "https://example.com/mdm/apple/mdm",
+    "renew_date": "2023-11-29T00:00:00Z",
+    "macos_team": "💻 Workstations",
+    "ios_team": "📱🏢 Company-owned iPhones",
+    "ipados_team": "🔳🏢 Company-owned iPads"
+  }
+]
+```
+
+### List Volume Purchasing Program (VPP) connections
+
+_Available in Fleet Premium_
+
+`GET /api/v1/fleet/volume_purchasing_program`
+
+#### Parameters
+
+None.
+
+#### Example
+
+`GET /api/v1/fleet/volume_purchasing_program`
+
+##### Default response
+
+`Status: 200`
+
+```json
+[
+  {
+    "org_name": "Fleet Device Management Inc.",
+    "location": "https://example.com/mdm/apple/mdm",
+    "renew_date": "2023-11-29T00:00:00Z",
+    "teams": [
+      "💻 Workstations",
+      "💻🐣 Workstations (canary)",
+      "📱🏢 Company-owned iPhones",
+      "🔳🏢 Company-owned iPads"
+    ],
+  }
+]
 ```
 
 ---

docs/Using Fleet/GitOps.md

@@ -569,16 +569,44 @@ Can only be configured for all teams (`org_settings`).
 
 #### mdm
 
-The `mdm` section lets you enable MDM features in Fleet.
+##### apple_business_manager
 
-- `apple_bm_default_team` - is name of the team that macOS hosts in Apple Business Manager automatically enroll to when they're first set up. If empty, hosts will enroll to "No team" (default: `""`).
+- `organization_name` - is the organziation name associated with the Apple Business Manager account.
+- `macos_team` - macOS hosts are automatically added to this team in Fleet when they appear in Apple Business Manager.
+- `ios_team` - iOS hosts are automatically added to this team in Fleet when they appear in Apple Business Manager.
+- `ipados_team` - iPadOS hosts are automatically added to this team in Fleet when they appear in Apple Business Manager.
 
 ##### Example
 
 ```yaml
 org_settings:
   mdm:
-    apple_bm_default_team: "Workstations" # Available in Fleet Premium
+    apple_business_manager: # Available in Fleet Premium
+    - organization_name: Fleet Device Management Inc.
+      macos_team: "💻 Workstations" 
+      ios_team: "📱🏢 Company-owned iPhones"
+      ipados_team: "🔳🏢 Company-owned iPads"
+```
+
+Can only be configured for all teams (`org_settings`).
+
+##### volume_purchasing_program
+
+- `location` - is the name of the location in the Apple Business Manager account.
+- `teams` - is a list of team names. If you choose specific teams, App Store apps in this VPP account will only be available to install on hosts in these teams. If not specified, App Store apps are available to install on hosts in all teams.
+
+##### Example
+
+```yaml
+org_settings:
+  mdm:
+    volume_purchasing_program: # Available in Fleet Premium
+    - location: Fleet Device Management Inc.
+      teams: 
+      - "💻 Workstations" 
+      - "💻🐣 Workstations (canary)"
+      - "📱🏢 Company-owned iPhones"
+      - "🔳🏢 Company-owned iPads"
 ```
 
 Can only be configured for all teams (`org_settings`).