zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2026-04-22 16:07:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* feat(go): allow updating auto-assign-gw on enrollment keys;

* feat: prevent auto assign gateway if relay is set;
This commit is contained in:
Vishal Dalwadi
2025-12-11 12:09:44 +05:30
committed by GitHub
parent 3a315bf1ce
commit b48c705c67
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/enrollmentkeys.go
+2 -3
View File
@@ -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"))
@@ -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"))
logic/enrollmentkey.go
+15 -5
View File
@@ -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
}
@@ -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
}