Interpreted destination(s): field

olasaadi99 · olasaadi99 · commit e9d38a4c408c · 2024-11-07T18:28:54.000+02:00
diff --git a/pkg/awsvpc/examples/out/explain_out/from_external_public_subnet_all_vpcs_explain_detail.txt b/pkg/awsvpc/examples/out/explain_out/from_external_public_subnet_all_vpcs_explain_detail.txt
@@ -1,5 +1,5 @@
 Explaining connectivity from 147.235.0.0/16 to 10.240.0.96 within mixed
-Interpreted source(s): 147.235.0.0/16 (external)
+Interpreted source(s): 147.235.0.0/16 (Public Internet)
 Interpreted destination(s): p3[10.240.0.96]
 =======================================================================
 
diff --git a/pkg/awsvpc/examples/out/explain_out/to_external_blocked_only_private_subnet_all_vpcs_explain_detail.txt b/pkg/awsvpc/examples/out/explain_out/to_external_blocked_only_private_subnet_all_vpcs_explain_detail.txt
@@ -1,6 +1,6 @@
 Explaining connectivity from 10.240.20.245 to 161.26.0.0 within vpc0
 Interpreted source(s): app1[10.240.20.245]
-Interpreted destination(s): 161.26.0.0 (external)
+Interpreted destination(s): 161.26.0.0 (Public Internet)
 ====================================================================
 
 No connectivity from app1[10.240.20.245] to Public Internet 161.26.0.0/32;
diff --git a/pkg/awsvpc/examples/out/explain_out/to_external_private_subnet_all_vpcs_explain_detail.txt b/pkg/awsvpc/examples/out/explain_out/to_external_private_subnet_all_vpcs_explain_detail.txt
@@ -1,6 +1,6 @@
 Explaining connectivity from 10.240.20.245 to 161.26.0.0 within vpc0
 Interpreted source(s): app1[10.240.20.245]
-Interpreted destination(s): 161.26.0.0 (external)
+Interpreted destination(s): 161.26.0.0 (Public Internet)
 ====================================================================
 
 No connectivity from app1[10.240.20.245] to Public Internet 161.26.0.0/32;
diff --git a/pkg/awsvpc/examples/out/explain_out/to_external_public_subnet_all_vpcs_explain_detail.txt b/pkg/awsvpc/examples/out/explain_out/to_external_public_subnet_all_vpcs_explain_detail.txt
@@ -1,6 +1,6 @@
 Explaining connectivity from 10.240.10.42 to 161.26.0.0 within vpc0
 Interpreted source(s): proxy[10.240.10.42]
-Interpreted destination(s): 161.26.0.0 (external)
+Interpreted destination(s): 161.26.0.0 (Public Internet)
 ===================================================================
 
 Connections from proxy[10.240.10.42] to Public Internet 161.26.0.0/32: All Connections
diff --git a/pkg/ibmvpc/examples/out/explain_out/GroupingExternalSG1_all_vpcs_explain.txt b/pkg/ibmvpc/examples/out/explain_out/GroupingExternalSG1_all_vpcs_explain.txt
@@ -1,6 +1,6 @@
 Explaining connectivity from vsi1-ky to 161.26.0.0/8 within test-vpc1-ky
 Interpreted source(s): vsi1-ky[10.240.10.4]
-Interpreted destination(s): 161.26.0.0/8 (external)
+Interpreted destination(s): 161.26.0.0/8 (Service Network)
 ========================================================================
 
 Connections from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/16: protocol: UDP
diff --git a/pkg/ibmvpc/examples/out/explain_out/GroupingExternalSG1_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/GroupingExternalSG1_all_vpcs_explain_detail.txt
@@ -1,6 +1,6 @@
 Explaining connectivity from 10.240.10.4 to 161.26.0.0/8 within test-vpc1-ky
 Interpreted source(s): vsi1-ky[10.240.10.4]
-Interpreted destination(s): 161.26.0.0/8 (external)
+Interpreted destination(s): 161.26.0.0/8 (Service Network)
 ============================================================================
 
 Connections from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/16: protocol: UDP
diff --git a/pkg/ibmvpc/examples/out/explain_out/NACLExternal1_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/NACLExternal1_all_vpcs_explain_detail.txt
@@ -1,6 +1,6 @@
 Explaining connectivity from vsi1-ky to 161.26.0.0/16 within test-vpc1-ky
 Interpreted source(s): vsi1-ky[10.240.10.4]
-Interpreted destination(s): 161.26.0.0/16 (external)
+Interpreted destination(s): 161.26.0.0/16 (Service Network)
 =========================================================================
 
 Connections from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/16: protocol: UDP
diff --git a/pkg/ibmvpc/examples/out/explain_out/NACLExternal2_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/NACLExternal2_all_vpcs_explain_detail.txt
@@ -1,6 +1,6 @@
 Explaining connectivity from vsi1-ky to 100.128.0.0/32 within test-vpc1-ky
 Interpreted source(s): vsi1-ky[10.240.10.4]
-Interpreted destination(s): 100.128.0.0/32 (external)
+Interpreted destination(s): 100.128.0.0/32 (Public Internet)
 ==========================================================================
 
 No connectivity from vsi1-ky[10.240.10.4] to Public Internet 100.128.0.0/32;
diff --git a/pkg/ibmvpc/examples/out/explain_out/NACLExternal3_all_vpcs_explain.txt b/pkg/ibmvpc/examples/out/explain_out/NACLExternal3_all_vpcs_explain.txt
@@ -1,5 +1,5 @@
 Explaining connectivity from 100.128.0.0/32 to vsi1-ky within test-vpc1-ky
-Interpreted source(s): 100.128.0.0/32 (external)
+Interpreted source(s): 100.128.0.0/32 (Public Internet)
 Interpreted destination(s): vsi1-ky[10.240.10.4]
 ==========================================================================
 
diff --git a/pkg/ibmvpc/examples/out/explain_out/NACLGrouping_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/NACLGrouping_all_vpcs_explain_detail.txt
@@ -1,6 +1,6 @@
 Explaining connectivity from 10.240.10.4 to 161.26.0.0/15 within test-vpc1-ky
 Interpreted source(s): vsi1-ky[10.240.10.4]
-Interpreted destination(s): 161.26.0.0/15 (external)
+Interpreted destination(s): 161.26.0.0/15 (Public Internet)
 =============================================================================
 
 Connections from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/16: protocol: UDP
diff --git a/pkg/ibmvpc/examples/out/explain_out/NACLQueryAllowSubset_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/NACLQueryAllowSubset_all_vpcs_explain_detail.txt
@@ -1,6 +1,6 @@
 Explaining connectivity from vsi1-ky to 161.26.0.0/16 within test-vpc1-ky using "protocol: UDP"
 Interpreted source(s): vsi1-ky[10.240.10.4]
-Interpreted destination(s): 161.26.0.0/16 (external)
+Interpreted destination(s): 161.26.0.0/16 (Service Network)
 ===============================================================================================
 
 Connections are allowed from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/16 using "protocol: UDP src-ports: 1-600 dst-ports: 1-50"
diff --git a/pkg/ibmvpc/examples/out/explain_out/NACLQueryConnection1_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/NACLQueryConnection1_all_vpcs_explain_detail.txt
@@ -1,6 +1,6 @@
 Explaining connectivity from vsi1-ky to 161.26.0.0/16 within test-vpc1-ky using "protocol: UDP"
 Interpreted source(s): vsi1-ky[10.240.10.4]
-Interpreted destination(s): 161.26.0.0/16 (external)
+Interpreted destination(s): 161.26.0.0/16 (Service Network)
 ===============================================================================================
 
 Connections are allowed from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/16 using "protocol: UDP"
diff --git a/pkg/ibmvpc/examples/out/explain_out/NACLQueryConnection2_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/NACLQueryConnection2_all_vpcs_explain_detail.txt
@@ -1,6 +1,6 @@
 Explaining connectivity from vsi1-ky to 161.26.0.0/16 within test-vpc1-ky using "protocol: TCP"
 Interpreted source(s): vsi1-ky[10.240.10.4]
-Interpreted destination(s): 161.26.0.0/16 (external)
+Interpreted destination(s): 161.26.0.0/16 (Service Network)
 ===============================================================================================
 
 No connectivity from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/16 using "protocol: TCP";
diff --git a/pkg/ibmvpc/examples/out/explain_out/NACLQueryConnectionRules2_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/NACLQueryConnectionRules2_all_vpcs_explain_detail.txt
@@ -1,6 +1,6 @@
 Explaining connectivity from vsi1-ky to 161.26.0.0/16 within test-vpc1-ky
 Interpreted source(s): vsi1-ky[10.240.10.4]
-Interpreted destination(s): 161.26.0.0/16 (external)
+Interpreted destination(s): 161.26.0.0/16 (Service Network)
 =========================================================================
 
 Connections from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/16: All Connections
diff --git a/pkg/ibmvpc/examples/out/explain_out/NACLQueryConnectionRules3_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/NACLQueryConnectionRules3_all_vpcs_explain_detail.txt
@@ -1,6 +1,6 @@
 Explaining connectivity from vsi1-ky to 161.26.0.0/16 within test-vpc1-ky using "protocol: TCP"
 Interpreted source(s): vsi1-ky[10.240.10.4]
-Interpreted destination(s): 161.26.0.0/16 (external)
+Interpreted destination(s): 161.26.0.0/16 (Service Network)
 ===============================================================================================
 
 Connections are allowed from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/16 using "protocol: TCP"
diff --git a/pkg/ibmvpc/examples/out/explain_out/NACLQueryConnectionRules4_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/NACLQueryConnectionRules4_all_vpcs_explain_detail.txt
@@ -1,6 +1,6 @@
 Explaining connectivity from 10.240.10.4/32 to 161.26.0.0/16 within test-vpc1-ky using "protocol: UDP"
 Interpreted source(s): vsi1-ky[10.240.10.4]
-Interpreted destination(s): 161.26.0.0/16 (external)
+Interpreted destination(s): 161.26.0.0/16 (Service Network)
 ======================================================================================================
 
 Connections are allowed from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/16 using "protocol: UDP"
diff --git a/pkg/ibmvpc/examples/out/explain_out/QueryConnectionSGBasic1_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/QueryConnectionSGBasic1_all_vpcs_explain_detail.txt
@@ -1,6 +1,6 @@
 Explaining connectivity from vsi1-ky to 161.26.0.0/16 within test-vpc1-ky using "protocol: UDP"
 Interpreted source(s): vsi1-ky[10.240.10.4]
-Interpreted destination(s): 161.26.0.0/16 (external)
+Interpreted destination(s): 161.26.0.0/16 (Service Network)
 ===============================================================================================
 
 Connections are allowed from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/16 using "protocol: UDP"
diff --git a/pkg/ibmvpc/examples/out/explain_out/QueryConnectionSGBasic2_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/QueryConnectionSGBasic2_all_vpcs_explain_detail.txt
@@ -1,6 +1,6 @@
 Explaining connectivity from 10.240.10.4 to 161.26.0.0/16 within test-vpc1-ky using "protocol: UDP src-ports: 10-100 dst-ports: 443"
 Interpreted source(s): vsi1-ky[10.240.10.4]
-Interpreted destination(s): 161.26.0.0/16 (external)
+Interpreted destination(s): 161.26.0.0/16 (Service Network)
 ====================================================================================================================================
 
 Connections are allowed from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/16 using "protocol: UDP src-ports: 10-100 dst-ports: 443"
diff --git a/pkg/ibmvpc/examples/out/explain_out/QueryConnectionSGBasic3_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/QueryConnectionSGBasic3_all_vpcs_explain_detail.txt
@@ -1,6 +1,6 @@
 Explaining connectivity from crn:v1:staging:public:is:us-south:a/6527::vpc:a456 to 161.26.0.0/20 within test-vpc1-ky using "protocol: UDP src-ports: 10-100 dst-ports: 443"
 Interpreted source(s): vsi1-ky[10.240.10.4]
-Interpreted destination(s): 161.26.0.0/20 (external)
+Interpreted destination(s): 161.26.0.0/20 (Service Network)
 ===========================================================================================================================================================================
 
 Connections are allowed from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/20 using "protocol: UDP src-ports: 10-100 dst-ports: 443"
diff --git a/pkg/ibmvpc/examples/out/explain_out/QueryConnectionSGBasic4_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/QueryConnectionSGBasic4_all_vpcs_explain_detail.txt
@@ -1,6 +1,6 @@
 Explaining connectivity from vsi1-ky to 161.26.0.0/12 within test-vpc1-ky using "protocol: UDP src-ports: 10-100 dst-ports: 443"
 Interpreted source(s): vsi1-ky[10.240.10.4]
-Interpreted destination(s): 161.26.0.0/12 (external)
+Interpreted destination(s): 161.26.0.0/12 (Service Network)
 ================================================================================================================================
 
 Connections are allowed from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/16 using "protocol: UDP src-ports: 10-100 dst-ports: 443"
diff --git a/pkg/ibmvpc/examples/out/explain_out/QueryConnectionSGSubsetPorts_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/QueryConnectionSGSubsetPorts_all_vpcs_explain_detail.txt
@@ -1,5 +1,5 @@
 Explaining connectivity from 147.235.219.206/32 to vsi2-ky within test-vpc1-ky using "protocol: TCP dst-ports: 10-30"
-Interpreted source(s): 147.235.219.206/32 (external)
+Interpreted source(s): 147.235.219.206/32 (Public Internet)
 Interpreted destination(s): vsi2-ky[10.240.20.4]
 =====================================================================================================================
 
diff --git a/pkg/ibmvpc/examples/out/explain_out/SGInternal3SrcToExternalGroup_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/SGInternal3SrcToExternalGroup_all_vpcs_explain_detail.txt
@@ -1,6 +1,6 @@
 Explaining connectivity from 10.240.30.4/24 to 161.26.0.0/8 within test-vpc1-ky
 Interpreted source(s): vsi3a-ky[10.240.30.5], vsi3b-ky[10.240.30.4], db-endpoint-gateway-ky[10.240.30.6]
-Interpreted destination(s): 161.26.0.0/8 (external)
+Interpreted destination(s): 161.26.0.0/8 (Service Network)
 ===============================================================================
 
 Connections from db-endpoint-gateway-ky[10.240.30.6] to Service Network 161.26.0.0/16: All Connections
diff --git a/pkg/ibmvpc/examples/out/explain_out/SimpleExternalSG1_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/SimpleExternalSG1_all_vpcs_explain_detail.txt
@@ -1,6 +1,6 @@
 Explaining connectivity from vsi1-ky to 161.26.0.0/16 within test-vpc1-ky
 Interpreted source(s): vsi1-ky[10.240.10.4]
-Interpreted destination(s): 161.26.0.0/16 (external)
+Interpreted destination(s): 161.26.0.0/16 (Service Network)
 =========================================================================
 
 Connections from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/16: protocol: UDP
diff --git a/pkg/ibmvpc/examples/out/explain_out/SimpleExternalSG2_all_vpcs_explain.txt b/pkg/ibmvpc/examples/out/explain_out/SimpleExternalSG2_all_vpcs_explain.txt
@@ -1,5 +1,5 @@
 Explaining connectivity from 161.26.0.0/16 to vsi1-ky within test-vpc1-ky
-Interpreted source(s): 161.26.0.0/16 (external)
+Interpreted source(s): 161.26.0.0/16 (Service Network)
 Interpreted destination(s): vsi1-ky[10.240.10.4]
 =========================================================================
 
diff --git a/pkg/ibmvpc/examples/out/explain_out/SimpleExternalSG3_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/SimpleExternalSG3_all_vpcs_explain_detail.txt
@@ -1,6 +1,6 @@
 Explaining connectivity from vsi1-ky to 161.26.0.0/32 within test-vpc1-ky
 Interpreted source(s): vsi1-ky[10.240.10.4]
-Interpreted destination(s): 161.26.0.0/32 (external)
+Interpreted destination(s): 161.26.0.0/32 (Service Network)
 =========================================================================
 
 Connections from vsi1-ky[10.240.10.4] to Service Network 161.26.0.0/32: protocol: UDP
diff --git a/pkg/ibmvpc/examples/out/explain_out/SimpleExternalSG4_all_vpcs_explain.txt b/pkg/ibmvpc/examples/out/explain_out/SimpleExternalSG4_all_vpcs_explain.txt
@@ -1,6 +1,6 @@
 Explaining connectivity from vsi3b-ky to 161.26.0.0/32 within test-vpc1-ky
 Interpreted source(s): vsi3b-ky[10.240.30.4]
-Interpreted destination(s): 161.26.0.0/32 (external)
+Interpreted destination(s): 161.26.0.0/32 (Service Network)
 ==========================================================================
 
 No connectivity from vsi3b-ky[10.240.30.4] to Service Network 161.26.0.0/32;
diff --git a/pkg/ibmvpc/examples/out/explain_out/externalToSubnet_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/externalToSubnet_all_vpcs_explain_detail.txt
@@ -1,5 +1,5 @@
 Explaining connectivity from 161.26.0.0 to subnet3-ky within test-vpc1-ky
-Interpreted source(s): 161.26.0.0 (external)
+Interpreted source(s): 161.26.0.0 (Service Network)
 Interpreted destination(s): vsi3a-ky[10.240.30.5], vsi3b-ky[10.240.30.4], db-endpoint-gateway-ky[10.240.30.6]
 =========================================================================
 
diff --git a/pkg/ibmvpc/examples/out/explain_out/multiVPCVsiToExternalMissingRouter_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/multiVPCVsiToExternalMissingRouter_all_vpcs_explain_detail.txt
@@ -1,6 +1,6 @@
 Explaining connectivity from vsi11-ky to 172.217.22.46/32 within test-vpc1-ky
 Interpreted source(s): vsi11-ky[10.240.11.4]
-Interpreted destination(s): 172.217.22.46/32 (external)
+Interpreted destination(s): 172.217.22.46/32 (Public Internet)
 =============================================================================
 
 No connectivity from vsi11-ky[10.240.11.4] to Public Internet 172.217.22.46/32;
diff --git a/pkg/ibmvpc/examples/out/explain_out/multiVPCVsiToExternal_all_vpcs_explain_detail.txt b/pkg/ibmvpc/examples/out/explain_out/multiVPCVsiToExternal_all_vpcs_explain_detail.txt
@@ -1,6 +1,6 @@
 Explaining connectivity from test-vpc0-ky/vsi1-ky to 172.217.22.46/32 within test-vpc0-ky
 Interpreted source(s): vsi1-ky[10.240.1.4]
-Interpreted destination(s): 172.217.22.46/32 (external)
+Interpreted destination(s): 172.217.22.46/32 (Public Internet)
 =========================================================================================
 
 Connections from vsi1-ky[10.240.1.4] to Public Internet 172.217.22.46/32: All Connections
diff --git a/pkg/vpcmodel/explainabilityPrint.go b/pkg/vpcmodel/explainabilityPrint.go
@@ -60,8 +60,12 @@ func connHeader(connQuery *netset.TransportSet) string {
 
 // in case the src/dst is not external address, returns a string of all relevant nodes names
 func endPointInterpretation(c *VPCConfig, userInput string, nodes []Node) string {
+	externalType := serviceNetworkNodeName
 	if nodes[0].IsExternal() {
-		return userInput + " (external)"
+		if nodes[0].IsPublicInternet() {
+			externalType = publicInternetNodeName
+		}
+		return fmt.Sprintf("%s (%s)", userInput, externalType)
 	}
 	networkInterfaces := make([]string, len(nodes))
 	for i, node := range nodes {
diff --git a/pkg/vpcmodel/externalNetwork.go b/pkg/vpcmodel/externalNetwork.go
@@ -181,7 +181,7 @@ func newExternalNode(isPublicInternet bool, ipb *netset.IPBlock, resourceType st
 		ipblock:          ipb}, nil
 }
 
-func newExternalNodeForCidr(cidr, resourceType string) (Node, error) { //nolint:unparam // resourceType is param
+func newExternalNodeForCidr(cidr, resourceType string) (Node, error) {
 	cidrIPBlodk, err := netset.IPBlockFromCidr(cidr)
 	if err != nil {
 		return nil, err
