fixing observations

kubernetes-sigs · Nov 11, 2024 · cbf6bf7 · cbf6bf7
1 parent e2f9810
commit cbf6bf7
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/cmd/policy-assistant/pkg/cli/analyze.go b/cmd/policy-assistant/pkg/cli/analyze.go
@@ -315,6 +315,8 @@ func VerdictWalkthrough(policies *matcher.Policy, sourceWorkloadTraffic string,
 
 	if trafficPath != "" && (sourceWorkloadTraffic != "" || destinationWorkloadTraffic != "" || port != 0 || protocol != "") {
 		logrus.Fatalf("%+v", errors.Errorf("If using traffic path, you can't input traffic via CLI and viceversa"))
+	} else if trafficPath == "" && (sourceWorkloadTraffic == "" || destinationWorkloadTraffic == "" || port == 0 || protocol == "") {
+		logrus.Fatalf("%+v", errors.Errorf("For this mode, you must either set --traffic-path or set all of --source-workload-traffic (<namespace>/<workloadType>/workloadName), --destination-workload-traffic (<namespace>/<workloadType>/workloadName), --port (integer from 0 to 65535) and --protocol (TCP, UDP and SCTP) parameters"))
 	}
 
 	if trafficPath != "" {
@@ -330,10 +332,6 @@ func VerdictWalkthrough(policies *matcher.Policy, sourceWorkloadTraffic string,
 			podA = matcher.CreateTrafficPeer(traffic.Source.IP, nil)
 			podB = matcher.CreateTrafficPeer(traffic.Destination.IP, nil)
 
-			// Resolve internal peer info based on workloads
-			//sourcePeer := GetInternalPeerInfo(sourceInternal.Workload)
-			//destinationPeer := GetInternalPeerInfo(destinationInternal.Workload)
-
 			// Update podA and podB if internal information is available
 			if sourceInternal != nil {
 				podA = matcher.CreateTrafficPeer(traffic.Source.IP, &matcher.InternalPeer{
@@ -354,16 +352,17 @@ func VerdictWalkthrough(policies *matcher.Policy, sourceWorkloadTraffic string,
 			}
 
 			// Special case handling for workload-specific traffic (internal vs. external)
-			if sourceInternal != nil && destinationInternal != nil {
-				if sourceInternal.Workload != "" && destinationInternal.Workload != "" {
-					podA = matcher.GetInternalPeerInfo(sourceInternal.Workload)
-					podB = matcher.GetInternalPeerInfo(destinationInternal.Workload)
-				} else if sourceInternal.Workload != "" {
-					podA = matcher.GetInternalPeerInfo(sourceInternal.Workload)
-				} else if destinationInternal.Workload != "" {
-					podB = matcher.GetInternalPeerInfo(destinationInternal.Workload)
-				}
-			}
+		    if sourceInternal != nil  {
+		        if sourceInternal.Workload != "" {
+		            podA = matcher.GetInternalPeerInfo(sourceInternal.Workload)
+		        } 
+		    }
+
+		    if destinationInternal != nil  {
+		        if destinationInternal.Workload != "" {
+		            podB = matcher.GetInternalPeerInfo(destinationInternal.Workload)
+		        } 
+		    }
 
 			// Append the resolved traffic to the allTraffic slice
 			allTraffic = append(allTraffic, matcher.CreateTraffic(podA, podB, traffic.ResolvedPort, string(traffic.Protocol)))