Remove ip access list validator (#852)

Author: Sugar-pack

pkg/controller/atlasproject/ipaccess_list.go

@@ -2,7 +2,6 @@ package atlasproject
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -120,11 +119,6 @@ func validateSingleIPAccessList(list project.IPAccessList) error {
 			return err
 		}
 	}
-	onlyOneSpecified := onlyOneSpecified(list.AwsSecurityGroup, list.CIDRBlock, list.IPAddress)
-	allSpecified := isNotEmpty(list.AwsSecurityGroup) && isNotEmpty(list.CIDRBlock) && isNotEmpty(list.IPAddress)
-	if !onlyOneSpecified || allSpecified {
-		return errors.New("only one of the 'awsSecurityGroup', 'cidrBlock' or 'ipAddress' is required be specified")
-	}
 	if strings.Contains(list.IPAddress, "/") {
 		return fmt.Errorf("ipAddress %s cannot contain a / character", list.IPAddress)
 	}
@@ -251,24 +245,3 @@ func filterActiveIPAccessLists(accessLists []project.IPAccessList) ([]project.IP
 	}
 	return active, expired
 }
-
-func isNotEmpty(s string) bool {
-	return s != ""
-}
-
-func onlyOneSpecified(values ...string) bool {
-	found := false
-	for _, v := range values {
-		if v == "" {
-			continue
-		}
-
-		if found {
-			return false
-		}
-
-		found = true
-	}
-
-	return found
-}

pkg/controller/atlasproject/ipaccess_list_test.go

@@ -21,13 +21,6 @@ func TestValidateSingleIPAccessList(t *testing.T) {
 		{in: project.IPAccessList{DeleteAfterDate: "2020-11-02T20:04:05-0700", IPAddress: "192.158.0.0"}},
 		{in: project.IPAccessList{DeleteAfterDate: "2020-11-02T20:04:05+03", IPAddress: "192.158.0.0"}},
 		{in: project.IPAccessList{DeleteAfterDate: "2011-01-02T15:04:05", IPAddress: "192.158.0.0"}},
-
-		// Only one other field is allowed (and required)
-		{in: project.IPAccessList{DeleteAfterDate: "2011-01-02T15:04:05", IPAddress: "192.158.0.0", CIDRBlock: "203.0.113.0/24"}, errorExpectedRegex: "only one of the "},
-		{in: project.IPAccessList{IPAddress: "192.158.0.0", AwsSecurityGroup: "sg-0026348ec11780bd1"}, errorExpectedRegex: "only one of the "},
-		{in: project.IPAccessList{CIDRBlock: "203.0.113.0/24", AwsSecurityGroup: "sg-0026348ec11780bd1"}, errorExpectedRegex: "only one of the "},
-		{in: project.IPAccessList{CIDRBlock: "203.0.113.0/24", AwsSecurityGroup: "sg-0026348ec11780bd1", IPAddress: "192.158.0.0"}, errorExpectedRegex: "only one of the "},
-		{in: project.IPAccessList{}, errorExpectedRegex: "only one of the "},
 	}
 
 	for _, testCase := range testCases {