Merge branch 'output' into tcp_algo

np-guard · Sep 2, 2024 · 002a952 · 002a952
2 parents 524956c + 9692f06
commit 002a952
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/pkg/io/confio/sg.go b/pkg/io/confio/sg.go
@@ -53,7 +53,7 @@ func sgRemote(nameToSGRemoteRef map[string]*vpcv1.SecurityGroupRuleRemoteSecurit
 	st := rule.Remote.String()
 	switch t := rule.Remote.(type) {
 	case *netset.IPBlock:
-		if t.Size() == 1 { // single IP address
+		if ipString := t.ToIPAddressString(); ipString != "" { // single IP address
 			return &vpcv1.SecurityGroupRuleRemoteIP{
 				Address: &st,
 			}

diff --git a/pkg/io/csvio/sg.go b/pkg/io/csvio/sg.go
@@ -74,7 +74,7 @@ func sgPort(p interval.Interval) string {
 func sgRemoteType(t ir.RemoteType) string {
 	switch t := t.(type) {
 	case *netset.IPBlock:
-		if t.Size() == 1 {
+		if ipString := t.ToIPAddressString(); ipString != "" {
 			return "IP address"
 		}
 		return "CIDR block"

diff --git a/pkg/io/mdio/sg.go b/pkg/io/mdio/sg.go
@@ -88,7 +88,7 @@ func sGPort(p interval.Interval) string {
 func sGRemoteType(t ir.RemoteType) string {
 	switch t := t.(type) {
 	case *netset.IPBlock:
-		if t.Size() == 1 {
+		if ipString := t.ToIPAddressString(); ipString != "" {
 			return "IP address"
 		}
 		return "CIDR block"