CR

Author: ShiriMoran

pkg/awsvpc/explainability_test.go

@@ -11,7 +11,6 @@ import (
 	"testing"
 
 	"github.com/np-guard/vpc-network-config-analyzer/pkg/commonvpc"
-	"github.com/np-guard/vpc-network-config-analyzer/pkg/vpcmodel"
 )
 
 var explainTests = []*commonvpc.VpcExplainTest{
@@ -20,7 +19,6 @@ var explainTests = []*commonvpc.VpcExplainTest{
 		VpcTestCommon: commonvpc.VpcTestCommon{
 			Name:        "ip_to_ip",
 			InputConfig: "aws_sg_1",
-			Format:      vpcmodel.Text,
 		},
 		ESrc:          "10.240.40.217",
 		EDst:          "10.240.20.43",
@@ -31,7 +29,6 @@ var explainTests = []*commonvpc.VpcExplainTest{
 		VpcTestCommon: commonvpc.VpcTestCommon{
 			Name:        "nacl_blocking",
 			InputConfig: "aws_mixed",
-			Format:      vpcmodel.Text,
 		},
 		ESrc:          "10.240.2.28",
 		EDst:          "10.240.32.122",
@@ -43,7 +40,6 @@ var explainTests = []*commonvpc.VpcExplainTest{
 		VpcTestCommon: commonvpc.VpcTestCommon{
 			Name:        "same_subnet_partial_connection",
 			InputConfig: "aws_mixed",
-			Format:      vpcmodel.Text,
 		},
 		ESrc:          "10.240.32.122",
 		EDst:          "10.240.32.91",
@@ -54,7 +50,6 @@ var explainTests = []*commonvpc.VpcExplainTest{
 		VpcTestCommon: commonvpc.VpcTestCommon{
 			Name:        "subnet_to_subnet",
 			InputConfig: "aws_mixed",
-			Format:      vpcmodel.Text,
 		},
 		ESrc:          "private2",
 		EDst:          "private1",
@@ -65,7 +60,6 @@ var explainTests = []*commonvpc.VpcExplainTest{
 		VpcTestCommon: commonvpc.VpcTestCommon{
 			Name:        "to_external_private_subnet",
 			InputConfig: "aws_sg_1",
-			Format:      vpcmodel.Text,
 		},
 		ESrc:          "10.240.20.245",
 		EDst:          "161.26.0.0",
@@ -76,7 +70,6 @@ var explainTests = []*commonvpc.VpcExplainTest{
 		VpcTestCommon: commonvpc.VpcTestCommon{
 			Name:        "to_external_public_subnet",
 			InputConfig: "aws_sg_1",
-			Format:      vpcmodel.Text,
 		},
 		ESrc:          "10.240.10.42",
 		EDst:          "161.26.0.0",
@@ -87,7 +80,6 @@ var explainTests = []*commonvpc.VpcExplainTest{
 		VpcTestCommon: commonvpc.VpcTestCommon{
 			Name:        "from_external_public_subnet",
 			InputConfig: "aws_mixed",
-			Format:      vpcmodel.Text,
 		},
 		ESrc:          "147.235.0.0/16",
 		EDst:          "10.240.0.96",
@@ -98,7 +90,6 @@ var explainTests = []*commonvpc.VpcExplainTest{
 		VpcTestCommon: commonvpc.VpcTestCommon{
 			Name:        "to_external_blocked_only_private_subnet",
 			InputConfig: "aws_sg_1_allow_sg_private",
-			Format:      vpcmodel.Text,
 		},
 		ESrc:          "10.240.20.245",
 		EDst:          "161.26.0.0",

pkg/commonvpc/explain_test_functionality.go

@@ -37,6 +37,7 @@ func (tt *VpcExplainTest) TestSingleExplain(t *testing.T, mode testMode, rc Reso
 	explanationArgs := vpcmodel.NewExplanationArgs(tt.ESrc, tt.EDst, string(tt.EProtocol),
 		tt.ESrcMinPort, tt.ESrcMaxPort, tt.EDstMinPort, tt.EDstMaxPort, tt.DetailExplain)
 	tt.UseCases = []vpcmodel.OutputUseCase{vpcmodel.Explain}
+	tt.Format = vpcmodel.Text
 	t.Run(tt.Name, func(t *testing.T) {
 		t.Parallel()
 		tt.runSingleCommonTest(t, explainOut, rc, explanationArgs)