Skip to content

Commit bdf23ba

Browse files
committed
refactor - avoid dup code
1 parent 586af89 commit bdf23ba

File tree

2 files changed

+19
-797
lines changed

2 files changed

+19
-797
lines changed

pkg/awsvpc/analysis_output_test.go

Lines changed: 19 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -16,48 +16,36 @@ import (
1616

1717
const analysisOut = "analysis_out"
1818

19-
var tests = []*commonvpc.VpcAnalysisTest{
19+
var tests = []*commonvpc.VpcTestCommon{
2020
{
21-
VpcTestCommon: commonvpc.VpcTestCommon{
22-
InputConfig: "basic_config_with_sg",
23-
UseCases: []vpcmodel.OutputUseCase{vpcmodel.AllEndpoints, vpcmodel.AllSubnets},
24-
Format: vpcmodel.Text,
25-
},
21+
InputConfig: "basic_config_with_sg",
22+
UseCases: []vpcmodel.OutputUseCase{vpcmodel.AllEndpoints, vpcmodel.AllSubnets},
23+
Format: vpcmodel.Text,
2624
},
2725
{
28-
VpcTestCommon: commonvpc.VpcTestCommon{
29-
InputConfig: "aws_sg_1",
30-
UseCases: []vpcmodel.OutputUseCase{vpcmodel.AllEndpoints, vpcmodel.AllSubnets},
31-
Format: vpcmodel.Text,
32-
},
26+
InputConfig: "aws_sg_1",
27+
UseCases: []vpcmodel.OutputUseCase{vpcmodel.AllEndpoints, vpcmodel.AllSubnets},
28+
Format: vpcmodel.Text,
3329
},
3430
{
35-
VpcTestCommon: commonvpc.VpcTestCommon{
36-
InputConfig: "aws_sg_1",
37-
UseCases: []vpcmodel.OutputUseCase{vpcmodel.AllEndpoints},
38-
Format: vpcmodel.HTML,
39-
},
31+
InputConfig: "aws_sg_1",
32+
UseCases: []vpcmodel.OutputUseCase{vpcmodel.AllEndpoints},
33+
Format: vpcmodel.HTML,
4034
},
4135
{
42-
VpcTestCommon: commonvpc.VpcTestCommon{
43-
InputConfig: "aws_acl_1",
44-
UseCases: []vpcmodel.OutputUseCase{vpcmodel.AllEndpoints, vpcmodel.AllSubnets},
45-
Format: vpcmodel.Text,
46-
},
36+
InputConfig: "aws_acl_1",
37+
UseCases: []vpcmodel.OutputUseCase{vpcmodel.AllEndpoints, vpcmodel.AllSubnets},
38+
Format: vpcmodel.Text,
4739
},
4840
{
49-
VpcTestCommon: commonvpc.VpcTestCommon{
50-
InputConfig: "aws_mixed",
51-
UseCases: []vpcmodel.OutputUseCase{vpcmodel.AllEndpoints, vpcmodel.AllSubnets},
52-
Format: vpcmodel.Text,
53-
},
41+
InputConfig: "aws_mixed",
42+
UseCases: []vpcmodel.OutputUseCase{vpcmodel.AllEndpoints, vpcmodel.AllSubnets},
43+
Format: vpcmodel.Text,
5444
},
5545
{
56-
VpcTestCommon: commonvpc.VpcTestCommon{
57-
InputConfig: "aws_mixed",
58-
UseCases: []vpcmodel.OutputUseCase{vpcmodel.AllEndpoints},
59-
Format: vpcmodel.HTML,
60-
},
46+
InputConfig: "aws_mixed",
47+
UseCases: []vpcmodel.OutputUseCase{vpcmodel.AllEndpoints},
48+
Format: vpcmodel.HTML,
6149
},
6250
}
6351

0 commit comments

Comments
 (0)