From 793e4f1f29f12ca2b342a1eb42cf2c5b96bda4c7 Mon Sep 17 00:00:00 2001 From: Maycon Santos Date: Wed, 18 Jan 2023 14:01:50 +0100 Subject: [PATCH] Allow empty groups for DNS setting (#656) We should allow passing empty group slice for DisabledManagementGroups to reset any setting. Fix DNS settings activities message --- management/server/activity/codes.go | 4 ++-- management/server/dns.go | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/management/server/activity/codes.go b/management/server/activity/codes.go index 1cdecd933..3cae2bd64 100644 --- a/management/server/activity/codes.go +++ b/management/server/activity/codes.go @@ -97,9 +97,9 @@ const ( // GroupRemovedFromSetupKeyMessage is a human-readable text message of the GroupRemovedFromSetupKey activity GroupRemovedFromSetupKeyMessage string = "Group removed from user setup key" // GroupAddedToDisabledManagementGroupsMessage is a human-readable text message of the GroupAddedToDisabledManagementGroups activity - GroupAddedToDisabledManagementGroupsMessage + GroupAddedToDisabledManagementGroupsMessage string = "Group added to disabled management DNS setting" // GroupRemovedFromDisabledManagementGroupsMessage is a human-readable text message of the GroupRemovedFromDisabledManagementGroups activity - GroupRemovedFromDisabledManagementGroupsMessage + GroupRemovedFromDisabledManagementGroupsMessage string = "Group removed from disabled management DNS setting" ) // Activity that triggered an Event diff --git a/management/server/dns.go b/management/server/dns.go index 1c0499725..74de3dd5b 100644 --- a/management/server/dns.go +++ b/management/server/dns.go @@ -87,9 +87,11 @@ func (am *DefaultAccountManager) SaveDNSSettings(accountID string, userID string return status.Errorf(status.InvalidArgument, "the dns settings provided are nil") } - err = validateGroups(dnsSettingsToSave.DisabledManagementGroups, account.Groups) - if err != nil { - return err + if len(dnsSettingsToSave.DisabledManagementGroups) != 0 { + err = validateGroups(dnsSettingsToSave.DisabledManagementGroups, account.Groups) + if err != nil { + return err + } } oldSettings := &DNSSettings{}