Skip to content

Allow updating auto-assign-gw on enrollment keys #3768

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

Merged
abhishek9686 merged 3 commits into from
Dec 11, 2025
Merged

Allow updating auto-assign-gw on enrollment keys #3768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2f69ca
feat(go): allow updating auto-assign-gw on enrollment keys;
VishalDalwadi Dec 8, 2025
7944cb9
feat: prevent auto assign gateway if relay is set;
VishalDalwadi Dec 10, 2025
0a6893a
Merge branch 'develop' into fix/key-update
VishalDalwadi Dec 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions controllers/enrollmentkeys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,8 @@ func updateEnrollmentKey(w http.ResponseWriter, r *http.Request) {
return
}

relayId := uuid.Nil
if enrollmentKeyBody.Relay != "" {
relayId, err = uuid.Parse(enrollmentKeyBody.Relay)
_, err = uuid.Parse(enrollmentKeyBody.Relay)
if err != nil {
slog.Error("error parsing relay id", "error", err)
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
Expand All @@ -253,7 +252,7 @@ func updateEnrollmentKey(w http.ResponseWriter, r *http.Request) {
}
currKey, _ := logic.GetEnrollmentKey(keyId)

newEnrollmentKey, err := logic.UpdateEnrollmentKey(keyId, relayId, enrollmentKeyBody.Groups)
newEnrollmentKey, err := logic.UpdateEnrollmentKey(keyId, &enrollmentKeyBody)
if err != nil {
slog.Error("failed to update enrollment key", "error", err)
logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
Expand Down
20 changes: 15 additions & 5 deletions logic/enrollmentkey.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,19 @@ func CreateEnrollmentKey(uses int, expiration time.Time, networks,
}

// UpdateEnrollmentKey - updates an existing enrollment key's associated relay
func UpdateEnrollmentKey(keyId string, relayId uuid.UUID, groups []models.TagID) (*models.EnrollmentKey, error) {
func UpdateEnrollmentKey(keyId string, updates *models.APIEnrollmentKey) (*models.EnrollmentKey, error) {
key, err := GetEnrollmentKey(keyId)
if err != nil {
return nil, err
}

if relayId != uuid.Nil {
relayNode, err := GetNodeByID(relayId.String())
relayID := uuid.Nil
if updates.Relay != "" {
relayID = uuid.MustParse(updates.Relay)
}

if relayID != uuid.Nil {
relayNode, err := GetNodeByID(relayID.String())
if err != nil {
return nil, err
}
Expand All @@ -115,8 +120,13 @@ func UpdateEnrollmentKey(keyId string, relayId uuid.UUID, groups []models.TagID)
}
}

key.Relay = relayId
key.Groups = groups
if relayID != uuid.Nil {
updates.AutoAssignGateway = false
}

key.Relay = relayID
key.Groups = updates.Groups
key.AutoAssignGateway = updates.AutoAssignGateway
if err = upsertEnrollmentKey(&key); err != nil {
return nil, err
}
Expand Down