Support md output format with all_subnets analysis type

Signed-off-by: Ola Saadi <[email protected]>
np-guard · Jan 9, 2024 · 9953768 · 9953768
1 parent 25e0bc3
commit 9953768
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/cmd/analyzer/parse_args.go b/cmd/analyzer/parse_args.go
@@ -212,8 +212,8 @@ func errorInErgs(args *InArgs, flagset *flag.FlagSet) error {
 
 func notSupportedYetArgs(args *InArgs) error {
 	diffAnalysis := *args.AnalysisType == allEndpointsDiff || *args.AnalysisType == allSubnetsDiff
-	if !diffAnalysis && *args.AnalysisType != allEndpoints && *args.OutputFormat != TEXTFormat &&
-		*args.OutputFormat != JSONFormat {
+	if !diffAnalysis && *args.AnalysisType != allEndpoints && *args.AnalysisType != allSubnets &&
+		*args.OutputFormat != TEXTFormat && *args.OutputFormat != JSONFormat {
 		return fmt.Errorf("currently only txt/json output format supported with %s analysis type", *args.AnalysisType)
 	}
 	if diffAnalysis && *args.OutputFormat != TEXTFormat && *args.OutputFormat != MDFormat {

diff --git a/pkg/vpcmodel/mdOutput.go b/pkg/vpcmodel/mdOutput.go
@@ -41,7 +41,11 @@ func (m *MDoutputFormatter) WriteOutput(c1, c2 *VPCConfig,
 	switch uc {
 	case AllEndpoints:
 		lines := []string{mdDefaultTitle, mdDefaultHeader}
-		connLines := m.getGroupedOutput(conn)
+		connLines := m.getGroupedOutput(conn.GroupedConnectivity)
+		out += linesToOutput(connLines, lines)
+	case AllSubnets:
+		lines := []string{mdDefaultTitle, mdDefaultHeader}
+		connLines := m.getGroupedOutput(subnetsConn.GroupedConnectivity)
 		out += linesToOutput(connLines, lines)
 	case SubnetsDiff, EndpointsDiff:
 		var mdTitle, mdHeader string
@@ -55,8 +59,6 @@ func (m *MDoutputFormatter) WriteOutput(c1, c2 *VPCConfig,
 		lines := []string{mdTitle, mdHeader}
 		connLines := m.getGroupedDiffOutput(cfgsDiff)
 		out += linesToOutput(connLines, lines)
-	case AllSubnets:
-		return nil, errors.New("SubnetLevel use case not supported for md format currently ")
 	case SingleSubnet:
 		return nil, errors.New("DebugSubnet use case not supported for md format currently ")
 	}
@@ -73,9 +75,9 @@ func linesToOutput(connLines, lines []string) string {
 	return out
 }
 
-func (m *MDoutputFormatter) getGroupedOutput(conn *VPCConnectivity) []string {
-	lines := make([]string, len(conn.GroupedConnectivity.GroupedLines))
-	for i, line := range conn.GroupedConnectivity.GroupedLines {
+func (m *MDoutputFormatter) getGroupedOutput(connLines *GroupConnLines) []string {
+	lines := make([]string, len(connLines.GroupedLines))
+	for i, line := range connLines.GroupedLines {
 		lines[i] = getGroupedMDLine(line)
 	}
 	return lines