Skip to content

Set byod_fleet for dogfood Apple Business Manager tokens - #49564

Merged
allenhouchins merged 1 commit into
mainfrom
add-byod-fleet-dogfood-abm
Jul 20, 2026
Merged

Set byod_fleet for dogfood Apple Business Manager tokens#49564
allenhouchins merged 1 commit into
mainfrom
add-byod-fleet-dogfood-abm

Conversation

@allenhouchins

@allenhouchins allenhouchins commented Jul 20, 2026

Copy link
Copy Markdown
Member

Sets the new byod_fleet option on both Apple Business Manager tokens in the dogfood GitOps config, so BYOD hosts appearing in Apple Business Manager are automatically added to the right fleet instead of "Unassigned":

  • Fleet Device Management Inc.📱🔐 Personal mobile devices
  • Mactivate LLC🧪 Testing & QA

Fleet names match the definitions in it-and-security/fleets/personal-mobile-devices.yml and it-and-security/fleets/testing-and-qa.yml verbatim (including emoji prefixes). The file keeps the existing apple_business_manager parent key (deprecated alias for apple_business) to match the surrounding config; the alias machinery renames the parent before resolving nested keys, so byod_fleet resolves correctly under it.

Note for reviewers: this only affects where newly appearing BYOD hosts are placed — existing BYOD hosts in "Unassigned" are not retroactively moved.

Checklist for submitter

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

Testing

  • QA'd all new/changed functionality manually — verified the YAML parses (yaml.v3) and both ABM entries resolve to the intended fleet names; config-only change to the dogfood GitOps setup, no product code touched.

Summary by CodeRabbit

  • Bug Fixes
    • Updated device fleet mappings to correctly include BYOD devices.
    • Ensured BYOD devices are assigned to the appropriate personal mobile or testing fleet categories.

BYOD hosts appearing in Apple Business Manager now land in
'📱🔐 Personal mobile devices' (Fleet Device Management Inc. token)
and '🧪 Testing & QA' (Mactivate LLC token) instead of Unassigned.
@allenhouchins
allenhouchins marked this pull request as ready for review July 20, 2026 14:41
Copilot AI review requested due to automatic review settings July 20, 2026 14:41

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Copilot wasn't able to review any files in this pull request.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@allenhouchins
allenhouchins merged commit 8d2a3ab into main Jul 20, 2026
10 checks passed
@allenhouchins
allenhouchins deleted the add-byod-fleet-dogfood-abm branch July 20, 2026 14:41
@coderabbitai

coderabbitai Bot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

Caution

Review failed

The pull request is closed.

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 2341c896-1d5b-421c-a5dd-1c40980c58af

📥 Commits

Reviewing files that changed from the base of the PR and between a5cfb70 and 1a3192c.

📒 Files selected for processing (1)
  • it-and-security/default.yml

Walkthrough

Updated the Apple Business Manager organization mappings in default.yml to assign BYOD devices to the corresponding fleet labels for Fleet Device Management Inc. and Mactivate LLC.

Possibly related PRs

  • fleetdm/fleet#49559: Updates Apple Business Manager assignment handling for persisting BYOD and platform fleet fields.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch add-byod-fleet-dogfood-abm

Warning

There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure.

🔧 Checkov (3.3.8)
it-and-security/default.yml

Traceback (most recent call last):
File "/usr/local/bin/checkov", line 2, in
from checkov.main import Checkov
ModuleNotFoundError: No module named 'checkov'


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

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.

3 participants