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.

Sign up for GitHub

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

Jump to bottom

Basic Android MDM on/off functionality #26309

Merged
merged 50 commits into from
Feb 18, 2025
Merged

Basic Android MDM on/off functionality #26309

merged 50 commits into from
Feb 18, 2025

Conversation

getvictor
Copy link
Member

@getvictor getvictor commented Feb 12, 2025 •
edited
Loading

For #26218

Basic Android MDM on/off backend functionality. Manually tested.

The following env vars must be set:

FLEET_DEV_ANDROID_ENABLED=1
FLEET_DEV_ANDROID_SERVICE_CREDENTIALS=$(cat credentials.json)
FLEET_DEV_ANDROID_PUBSUB_TOPIC=projects/your-project/topics/your-topic

I picked https://github.com/go-json-experiment/json as the JSON library, which seems like the safest option.

Plan for next work:

  • refactoring from 1st PR
  • add pubsub with device enroll -> spec proxy for fleetdm.com
  • come back to this sub-task to add tests and finish TODOs

Checklist for submitter

  • Added/updated automated tests
  • Manual QA for all new/changed functionality

@getvictor
Added feature migrations
1dda21f
@getvictor
Add feature schema.sql, and fix linting errors.
d42de45
@getvictor
Setting up android directories.
88db932
@getvictor
WIP
e7c4263
@getvictor
Temporarily skipping failing test.
534d50e
@getvictor
Hooked up DB for android enteprises.
a52b3e3
@getvictor
WIP
464fca3
@getvictor
Things mostly working.
e4bf250
@getvictor
Updating android schema.
61fe90b
@getvictor
Split off Android service.
acc0c73
@getvictor
Added devices.delete to tools/android
16be7ef
@getvictor
Added architecture test.
1614233
@getvictor
Minor cleanup.
655a44d
@getvictor
Merge remote-tracking branch 'origin/main' into victor/android-poc
0cb3c92
@getvictor
Improved arch_test.go
ac001b5
@getvictor
Improved archtest
9ac4983
@getvictor
Merge remote-tracking branch 'origin/main' into victor/android-poc
7c43db3
@getvictor
Applied refactorings from main.
29b39e8
@getvictor
Minor fixes
fe58e34
@getvictor
Merge remote-tracking branch 'origin/victor/android-poc' into victor/…
759c08f 
…26218-android-turn-on
@getvictor
WIP preparing for real Android implementation
5b4c3de
@getvictor
Merge remote-tracking branch 'origin/main' into victor/26218-android-…
5a61ea4 
…turn-on
@getvictor
Refactoring
35d9fde
@getvictor
Refactoring
a47516e
@getvictor
Refactoring, still
3d93714
@getvictor
Refactoring, still
caaa56f
@getvictor
Refactoring, done?
e1471d4
@getvictor
Cleanup
f79f67f
@getvictor
Removed AndroidCron const.
0b041d9
@getvictor
Fix issues in manual testing.
0f916e2
@getvictor
Rolling back migration-related split.
4d1f723
@getvictor
Add an empty line
7235ab4
@getvictor
Moved android package under MDM
e7b18da
@getvictor
Merge remote-tracking branch 'origin/main' into victor/26218-android-…
5f06d46 
…turn-on
@getvictor
Fixing issues
00f5acb
@getvictor
Cleanup
8f4c8ef
@getvictor
Moved routes type.
f7e2b00
@getvictor
Merge remote-tracking branch 'origin/victor/26218-android-turn-on' in…
cefd330 
…to victor/26218-basic-functionality

# Conflicts:
#	server/android/datastore.go
#	server/android/interfaces/interfaces.go
#	server/android/mysql/mysql.go
#	server/datastore/mysql/migrations/tables/20250213104005_AddAndroidEnterpriseTable.go
#	server/mdm/android/arch_test.go
#	server/mdm/android/service/service.go
@getvictor
Fixing up the merge.
0b9a70b
Base automatically changed from victor/26218-android-turn-on to main February 13, 2025 20:32
@getvictor
Merge remote-tracking branch 'origin/main' into victor/26218-basic-fu…
0e09daf 
…nctionality

# Conflicts:
#	server/archtest/archtest.go
#	server/mdm/android/android.go
#	server/mdm/android/arch_test.go
#	server/mdm/android/datastore.go
#	server/mdm/android/mysql/enterprises.go
#	server/mdm/android/mysql/enterprises_test.go
#	server/mdm/android/service.go
#	server/mdm/android/service/endpoint_utils.go
#	server/mdm/android/service/handler.go
#	server/mdm/android/service/service.go
@getvictor
Merge to main fixes.
a662600
@getvictor getvictor marked this pull request as ready for review February 13, 2025 21:40
@getvictor getvictor requested a review from a team as a code owner February 13, 2025 21:40
gillespi314
gillespi314 approved these changes Feb 18, 2025
View reviewed changes
Copy link
Contributor

@gillespi314 gillespi314 left a comment

Choose a reason for hiding this comment

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

LGTM!

@getvictor getvictor merged commit fc33df1 into main Feb 18, 2025
35 checks passed
@getvictor getvictor deleted the victor/26218-basic-functionality branch February 18, 2025 15:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gillespi314 gillespi314 gillespi314 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@getvictor @gillespi314