NET-1784: Migrate All Policies (#3245)

* migrate all policies * migrate all policies * add acl policy type for any traffic * use any service type for migration
gravitl · Dec 10, 2024 · 7093373 · 7093373
1 parent a2c7c25
commit 7093373
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 31 deletions.
diff --git a/controllers/acls.go b/controllers/acls.go
@@ -53,6 +53,14 @@ func aclPolicyTypes(w http.ResponseWriter, r *http.Request) {
 			// models.NetmakerSubNetRangeAClID,
 		},
 		ProtocolTypes: []models.ProtocolType{
+			{
+				Name: models.Any,
+				AllowedProtocols: []models.Protocol{
+					models.ALL,
+				},
+				PortRange:        "All ports",
+				AllowPortSetting: false,
+			},
 			{
 				Name: models.Http,
 				AllowedProtocols: []models.Protocol{

diff --git a/logic/acls.go b/logic/acls.go
@@ -18,37 +18,17 @@ var (
 	aclCacheMap   = make(map[string]models.Acl)
 )
 
-func MigrateDefaulAclPolicies(netID models.NetworkID) {
-	if netID.String() == "" {
-		return
-	}
-	acl, err := GetAcl(fmt.Sprintf("%s.%s", netID, "all-nodes"))
-	if err == nil {
-		//if acl.Proto.String() == "" {
-		acl.Proto = models.ALL
-		acl.ServiceType = models.Custom
-		acl.Port = []string{}
-		UpsertAcl(acl)
-		//}
-	}
-	acl, err = GetAcl(fmt.Sprintf("%s.%s", netID, "all-users"))
-	if err == nil {
-		//if acl.Proto.String() == "" {
-		acl.Proto = models.ALL
-		acl.ServiceType = models.Custom
-		acl.Port = []string{}
-		UpsertAcl(acl)
-		//}
-	}
-	acl, err = GetAcl(fmt.Sprintf("%s.%s", netID, "all-remote-access-gws"))
-	if err == nil {
-		//if acl.Proto.String() == "" {
-		acl.Proto = models.ALL
-		acl.ServiceType = models.Custom
-		acl.Port = []string{}
-		UpsertAcl(acl)
-		//}
+func MigrateAclPolicies() {
+	acls := ListAcls()
+	for _, acl := range acls {
+		if acl.Proto.String() == "" {
+			acl.Proto = models.ALL
+			acl.ServiceType = models.Any
+			acl.Port = []string{}
+			UpsertAcl(acl)
+		}
 	}
+
 }
 
 // CreateDefaultAclNetworkPolicies - create default acl network policies

diff --git a/migrate/migrate.go b/migrate/migrate.go
@@ -437,6 +437,7 @@ func createDefaultTagsAndPolicies() {
 	for _, network := range networks {
 		logic.CreateDefaultTags(models.NetworkID(network.NetID))
 		logic.CreateDefaultAclNetworkPolicies(models.NetworkID(network.NetID))
-		logic.MigrateDefaulAclPolicies(models.NetworkID(network.NetID))
+
 	}
+	logic.MigrateAclPolicies()
 }
diff --git a/models/acl.go b/models/acl.go
@@ -34,6 +34,7 @@ const (
 	AllUDP      = "All UDP"
 	ICMPService = "ICMP"
 	Custom      = "Custom"
+	Any         = "Any"
 )
 
 func (p Protocol) String() string {