Skip to content

Commit 34cdf3f

Browse files
olasaadi99olasaadi99
authored
Merge branch 'main' into 348_vpcconfig
2 parents 0e751a0 + 3691ffc commit 34cdf3f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1057
-902
lines changed

‎cmd/analyzer/main_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ func TestMainWithExpectedOut(t *testing.T) {
231231

232232
// comparison should be insensitive to line comparators; cleaning strings from line comparators
233233
func cleanStr(str string) string {
234-
return strings.ReplaceAll(strings.ReplaceAll(str, "/n", ""), "\r", "")
234+
return strings.ReplaceAll(str, "\r", "")
235235
}
236236

237237
func removeGeneratedFiles() {

‎cmd/analyzer/subcmds/explain.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111

1212
"github.com/spf13/cobra"
1313

14-
"github.com/np-guard/models/pkg/connection"
1514
"github.com/np-guard/models/pkg/netp"
1615

1716
"github.com/np-guard/vpc-network-config-analyzer/pkg/vpcmodel"
@@ -64,7 +63,7 @@ func NewExplainCommand(args *inArgs) *cobra.Command {
6463
}
6564

6665
func portInRange(port int64) bool {
67-
if port > connection.MaxPort || port < connection.MinPort {
66+
if port > netp.MaxPort || port < netp.MinPort {
6867
return false
6968
}
7069

@@ -112,7 +111,7 @@ func validateExplainFlags(cmd *cobra.Command, args *inArgs) error {
112111
if !portInRange(args.eSrcMinPort) || !portInRange(args.eSrcMaxPort) ||
113112
!portInRange(args.eDstMinPort) || !portInRange(args.eDstMaxPort) {
114113
return fmt.Errorf("port number must be in between %d, %d, inclusive",
115-
connection.MinPort, connection.MaxPort)
114+
netp.MinPort, netp.MaxPort)
116115
}
117116

118117
return nil

‎go.mod

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,32 @@ go 1.23.1
44

55
require (
66
github.com/IBM/networking-go-sdk v0.49.0
7-
github.com/IBM/vpc-go-sdk v0.58.0
7+
github.com/IBM/vpc-go-sdk v0.60.0
88
github.com/aws/aws-sdk-go-v2/service/ec2 v1.163.0
9-
github.com/np-guard/cloud-resource-collector v0.15.0
10-
github.com/np-guard/models v0.4.0
9+
github.com/np-guard/cloud-resource-collector v0.16.0
10+
github.com/np-guard/models v0.5.2
1111
github.com/spf13/cobra v1.8.1
1212
github.com/stretchr/testify v1.9.0
1313
)
1414

1515
require (
1616
github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20240510130133-9f76aa34af27 // indirect
17-
github.com/IBM/go-sdk-core/v5 v5.17.4 // indirect
18-
github.com/IBM/platform-services-go-sdk v0.65.0 // indirect
17+
github.com/IBM/go-sdk-core/v5 v5.17.5 // indirect
18+
github.com/IBM/platform-services-go-sdk v0.69.1 // indirect
1919
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
20-
github.com/aws/aws-sdk-go-v2 v1.30.3 // indirect
21-
github.com/aws/aws-sdk-go-v2/config v1.27.27 // indirect
22-
github.com/aws/aws-sdk-go-v2/credentials v1.17.27 // indirect
23-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11 // indirect
24-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15 // indirect
25-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15 // indirect
26-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
27-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3 // indirect
28-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17 // indirect
29-
github.com/aws/aws-sdk-go-v2/service/sso v1.22.4 // indirect
30-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4 // indirect
31-
github.com/aws/aws-sdk-go-v2/service/sts v1.30.3 // indirect
32-
github.com/aws/smithy-go v1.20.3 // indirect
20+
github.com/aws/aws-sdk-go-v2 v1.32.0 // indirect
21+
github.com/aws/aws-sdk-go-v2/config v1.27.41 // indirect
22+
github.com/aws/aws-sdk-go-v2/credentials v1.17.39 // indirect
23+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.15 // indirect
24+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.19 // indirect
25+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.19 // indirect
26+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
27+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 // indirect
28+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.0 // indirect
29+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.0 // indirect
30+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.0 // indirect
31+
github.com/aws/aws-sdk-go-v2/service/sts v1.32.0 // indirect
32+
github.com/aws/smithy-go v1.22.0 // indirect
3333
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
3434
github.com/davecgh/go-spew v1.1.1 // indirect
3535
github.com/gabriel-vasile/mimetype v1.4.4 // indirect

‎go.sum

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,46 +2,46 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
22
github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20240510130133-9f76aa34af27 h1:WJ7RTGvACcoV5wgwfQ/BEiYn45V7ewzqtaNOuNapqec=
33
github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20240510130133-9f76aa34af27/go.mod h1:xUQL9SGAjoZFd4GNjrjjtEpjpkgU7RFXRyHesbKTjiY=
44
github.com/IBM/go-sdk-core/v5 v5.5.1/go.mod h1:Sn+z+qTDREQvCr+UFa22TqqfXNxx3o723y8GsfLV8e0=
5-
github.com/IBM/go-sdk-core/v5 v5.17.4 h1:VGb9+mRrnS2HpHZFM5hy4J6ppIWnwNrw0G+tLSgcJLc=
6-
github.com/IBM/go-sdk-core/v5 v5.17.4/go.mod h1:KsAAI7eStAWwQa4F96MLy+whYSh39JzNjklZRbN/8ns=
5+
github.com/IBM/go-sdk-core/v5 v5.17.5 h1:AjGC7xNee5tgDIjndekBDW5AbypdERHSgib3EZ1KNsA=
6+
github.com/IBM/go-sdk-core/v5 v5.17.5/go.mod h1:KsAAI7eStAWwQa4F96MLy+whYSh39JzNjklZRbN/8ns=
77
github.com/IBM/networking-go-sdk v0.49.0 h1:lPS34u3C0JVrbxH+Ulua76Nwl6Frv8BEfq6LRkyvOv0=
88
github.com/IBM/networking-go-sdk v0.49.0/go.mod h1:G9CKbmPE8gSLjN+ABh4hIZ1bMx076enl5Eekvj6zQnA=
9-
github.com/IBM/platform-services-go-sdk v0.65.0 h1:SAk/Rsn2BLRmeU3z6YJm54TK23/9QJaOPjrjYNGBiPU=
10-
github.com/IBM/platform-services-go-sdk v0.65.0/go.mod h1:6rYd3stLSnotYmZlxclw45EJPaQuLmh5f7c+Mg7rOg4=
11-
github.com/IBM/vpc-go-sdk v0.58.0 h1:Slk1jkcV7tPnf0iECQV2Oja7W8Bom0z7k9M4fMBY4bI=
12-
github.com/IBM/vpc-go-sdk v0.58.0/go.mod h1:swmxiYLT+OfBsBYqJWGeRd6NPmBk4u/het2PZdtzIaw=
9+
github.com/IBM/platform-services-go-sdk v0.69.1 h1:Wb8BYVpsPIppWbOQCgF7ytm+BbSOXdWWCf9zcZ6xGA4=
10+
github.com/IBM/platform-services-go-sdk v0.69.1/go.mod h1:ZP3zUDxR1qRdUqzFdnJOlQN0QpVYol2eOUCv4uk03Jc=
11+
github.com/IBM/vpc-go-sdk v0.60.0 h1:4MD9dTmg+alJivsAEPmKE4qx59nv0Gsweju/XF+Z2jo=
12+
github.com/IBM/vpc-go-sdk v0.60.0/go.mod h1:swmxiYLT+OfBsBYqJWGeRd6NPmBk4u/het2PZdtzIaw=
1313
github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
1414
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
1515
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
1616
github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48=
17-
github.com/aws/aws-sdk-go-v2 v1.30.3 h1:jUeBtG0Ih+ZIFH0F4UkmL9w3cSpaMv9tYYDbzILP8dY=
18-
github.com/aws/aws-sdk-go-v2 v1.30.3/go.mod h1:nIQjQVp5sfpQcTc9mPSr1B0PaWK5ByX9MOoDadSN4lc=
19-
github.com/aws/aws-sdk-go-v2/config v1.27.27 h1:HdqgGt1OAP0HkEDDShEl0oSYa9ZZBSOmKpdpsDMdO90=
20-
github.com/aws/aws-sdk-go-v2/config v1.27.27/go.mod h1:MVYamCg76dFNINkZFu4n4RjDixhVr51HLj4ErWzrVwg=
21-
github.com/aws/aws-sdk-go-v2/credentials v1.17.27 h1:2raNba6gr2IfA0eqqiP2XiQ0UVOpGPgDSi0I9iAP+UI=
22-
github.com/aws/aws-sdk-go-v2/credentials v1.17.27/go.mod h1:gniiwbGahQByxan6YjQUMcW4Aov6bLC3m+evgcoN4r4=
23-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11 h1:KreluoV8FZDEtI6Co2xuNk/UqI9iwMrOx/87PBNIKqw=
24-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11/go.mod h1:SeSUYBLsMYFoRvHE0Tjvn7kbxaUhl75CJi1sbfhMxkU=
25-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15 h1:SoNJ4RlFEQEbtDcCEt+QG56MY4fm4W8rYirAmq+/DdU=
26-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15/go.mod h1:U9ke74k1n2bf+RIgoX1SXFed1HLs51OgUSs+Ph0KJP8=
27-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15 h1:C6WHdGnTDIYETAm5iErQUiVNsclNx9qbJVPIt03B6bI=
28-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15/go.mod h1:ZQLZqhcu+JhSrA9/NXRm8SkDvsycE+JkV3WGY41e+IM=
29-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU=
30-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY=
17+
github.com/aws/aws-sdk-go-v2 v1.32.0 h1:GuHp7GvMN74PXD5C97KT5D87UhIy4bQPkflQKbfkndg=
18+
github.com/aws/aws-sdk-go-v2 v1.32.0/go.mod h1:2SK5n0a2karNTv5tbP1SjsX0uhttou00v/HpXKM1ZUo=
19+
github.com/aws/aws-sdk-go-v2/config v1.27.41 h1:esG3WpmEuNJ6F4kVFLumN8nCfA5VBav1KKb3JPx83O4=
20+
github.com/aws/aws-sdk-go-v2/config v1.27.41/go.mod h1:haUg09ebP+ClvPjU3EB/xe0HF9PguO19PD2fdjM2X14=
21+
github.com/aws/aws-sdk-go-v2/credentials v1.17.39 h1:tmVexAhoGqJxNE2oc4/SJqL+Jz1x1iCPt5ts9XcqZCU=
22+
github.com/aws/aws-sdk-go-v2/credentials v1.17.39/go.mod h1:zgOdbDI9epE608PdboJ87CYvPIejAgFevazeJW6iauQ=
23+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.15 h1:kGjlNc2IXXcxPDcfMyCshNCjVgxUhC/vTJv7NvC9wKk=
24+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.15/go.mod h1:rk/HmqPo+dX0Uv0Q1+4w3QKFdICEGSsTYz1hRWvH8UI=
25+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.19 h1:Q/k5wCeJkSWs+62kDfOillkNIJ5NqmE3iOfm48g/W8c=
26+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.19/go.mod h1:Wns1C66VvtA2Bv/cUBuKZKQKdjo7EVMhp90aAa+8oTI=
27+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.19 h1:AYLE0lUfKvN6icFTR/p+NmD1amYKTbqHQ1Nm+jwE6BM=
28+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.19/go.mod h1:1giLakj64GjuH1NBzF/DXqly5DWHtMTaOzRZ53nFX0I=
29+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ=
30+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc=
3131
github.com/aws/aws-sdk-go-v2/service/ec2 v1.163.0 h1:gwthjSMr5tW2fYBJNt3LQGgtkREvv5IcuaWRjeo1fh0=
3232
github.com/aws/aws-sdk-go-v2/service/ec2 v1.163.0/go.mod h1:eu3DWRK5GBq4hjCr7nAbnQiHSan5RJ6ue3qQVp5PJs0=
33-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3 h1:dT3MqvGhSoaIhRseqw2I0yH81l7wiR2vjs57O51EAm8=
34-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3/go.mod h1:GlAeCkHwugxdHaueRr4nhPuY+WW+gR8UjlcqzPr1SPI=
35-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17 h1:HGErhhrxZlQ044RiM+WdoZxp0p+EGM62y3L6pwA4olE=
36-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17/go.mod h1:RkZEx4l0EHYDJpWppMJ3nD9wZJAa8/0lq9aVC+r2UII=
37-
github.com/aws/aws-sdk-go-v2/service/sso v1.22.4 h1:BXx0ZIxvrJdSgSvKTZ+yRBeSqqgPM89VPlulEcl37tM=
38-
github.com/aws/aws-sdk-go-v2/service/sso v1.22.4/go.mod h1:ooyCOXjvJEsUw7x+ZDHeISPMhtwI3ZCB7ggFMcFfWLU=
39-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4 h1:yiwVzJW2ZxZTurVbYWA7QOrAaCYQR72t0wrSBfoesUE=
40-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4/go.mod h1:0oxfLkpz3rQ/CHlx5hB7H69YUpFiI1tql6Q6Ne+1bCw=
41-
github.com/aws/aws-sdk-go-v2/service/sts v1.30.3 h1:ZsDKRLXGWHk8WdtyYMoGNO7bTudrvuKpDKgMVRlepGE=
42-
github.com/aws/aws-sdk-go-v2/service/sts v1.30.3/go.mod h1:zwySh8fpFyXp9yOr/KVzxOl8SRqgf/IDw5aUt9UKFcQ=
43-
github.com/aws/smithy-go v1.20.3 h1:ryHwveWzPV5BIof6fyDvor6V3iUL7nTfiTKXHiW05nE=
44-
github.com/aws/smithy-go v1.20.3/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E=
33+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 h1:TToQNkvGguu209puTojY/ozlqy2d/SFNcoLIqTFi42g=
34+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0/go.mod h1:0jp+ltwkf+SwG2fm/PKo8t4y8pJSgOCO4D8Lz3k0aHQ=
35+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.0 h1:AdbiDUgQZmM28rDIZbiSwFxz8+3B94aOXxzs6oH+EA0=
36+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.0/go.mod h1:uV476Bd80tiDTX4X2redMtagQUg65aU/gzPojSJ4kSI=
37+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.0 h1:71FvP6XFj53NK+YiAEGVzeiccLVeFnHOCvMig0zOHsE=
38+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.0/go.mod h1:UVJqtKXSd9YppRKgdBIkyv7qgbSGv5DchM3yX0BN2mU=
39+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.0 h1:Uco4o19bi3AmBapImNzuMk+rfzlui52BDyVK1UfJeRA=
40+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.0/go.mod h1:+HLFhCpnG08hBee8bUdfd1mBK+rFKPt4O5igR9lXDfk=
41+
github.com/aws/aws-sdk-go-v2/service/sts v1.32.0 h1:GiQUjZM2KUZX68o/LpZ1xqxYMuvoxpRrOwYARYog3vc=
42+
github.com/aws/aws-sdk-go-v2/service/sts v1.32.0/go.mod h1:dKnu7M4MAS2SDlng1ytxd03H+y0LoUfEQ5E2VaaSw/4=
43+
github.com/aws/smithy-go v1.22.0 h1:uunKnWlcoL3zO7q+gG2Pk53joueEOsnNB28QdMsmiMM=
44+
github.com/aws/smithy-go v1.22.0/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
4545
github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
4646
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
4747
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -165,10 +165,10 @@ github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR
165165
github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
166166
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
167167
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
168-
github.com/np-guard/cloud-resource-collector v0.15.0 h1:jkmxql6D1uBr/qmSOsBzUgeDxlUXSCe7dBKfqfK+QZ4=
169-
github.com/np-guard/cloud-resource-collector v0.15.0/go.mod h1:klCHnNnuuVcCtGQHA7R1a8fqnvfMCk/5Jdld6V7sN2A=
170-
github.com/np-guard/models v0.4.0 h1:lU9XymcjwOJ5RQdVpziurqBmcLtlKVIQxVUwm+qMczk=
171-
github.com/np-guard/models v0.4.0/go.mod h1:mqE2Irf8r+7HWh8fII0fWbWyQRMHGEo2SgSLN/6VKs8=
168+
github.com/np-guard/cloud-resource-collector v0.16.0 h1:KxFLcH19ZIvfGU63jJuMNN5sxW1uSdOrhCDwKHOyy0M=
169+
github.com/np-guard/cloud-resource-collector v0.16.0/go.mod h1:93qwf/IT1L2Bv+6C6kund2GmKrSupTPujT0Nh6qB+mg=
170+
github.com/np-guard/models v0.5.2 h1:lty+shExffJpMQyu36a/NBYEky/rjEddQid4GOVHnhs=
171+
github.com/np-guard/models v0.5.2/go.mod h1:dqRdt5EQID1GmHuYsMOJzg4sS104om6NwEZ6sVO55z8=
172172
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
173173
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
174174
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=

‎pkg/awsvpc/nacl_analysis.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ import (
1212

1313
"github.com/aws/aws-sdk-go-v2/service/ec2/types"
1414

15-
"github.com/np-guard/models/pkg/connection"
16-
"github.com/np-guard/models/pkg/ipblock"
15+
"github.com/np-guard/models/pkg/netp"
16+
"github.com/np-guard/models/pkg/netset"
1717

1818
"github.com/np-guard/vpc-network-config-analyzer/pkg/commonvpc"
1919
)
2020

2121
// AWSNACLAnalyzer implements commonvpc.SpecificNACLAnalyzer
2222
type AWSNACLAnalyzer struct {
2323
naclResource *types.NetworkAcl
24-
referencedIPblocks []*ipblock.IPBlock
24+
referencedIPblocks []*netset.IPBlock
2525
// all over the analyzer code, we assume that the acl rules are ordered by their priority.
2626
// however, in aws, the priority is being config by the rule number, and the order has no meaning.
2727
// so prioritiesEntries are the entries as in naclResource.Entries, sorted by the rule number:
@@ -43,32 +43,32 @@ func (na *AWSNACLAnalyzer) Name() *string {
4343
return getResourceName(na.naclResource.Tags, na.naclResource.NetworkAclId)
4444
}
4545

46-
func (na *AWSNACLAnalyzer) ReferencedIPblocks() []*ipblock.IPBlock {
46+
func (na *AWSNACLAnalyzer) ReferencedIPblocks() []*netset.IPBlock {
4747
return na.referencedIPblocks
4848
}
4949

5050
// SetReferencedIPblocks updates referenced ip blocks
51-
func (na *AWSNACLAnalyzer) SetReferencedIPblocks(referencedIPblocks []*ipblock.IPBlock) {
51+
func (na *AWSNACLAnalyzer) SetReferencedIPblocks(referencedIPblocks []*netset.IPBlock) {
5252
na.referencedIPblocks = referencedIPblocks
5353
}
5454

5555
// GetNACLRule gets index of the rule and returns the rule results line and obj
5656
func (na *AWSNACLAnalyzer) GetNACLRule(index int) (ruleStr string, ruleRes *commonvpc.NACLRule, isIngress bool, err error) {
57-
var conns *connection.Set
57+
var conns *netset.TransportSet
5858
var connStr string
5959
ruleObj := na.prioritiesEntries[index]
6060
protocol := convertProtocol(*ruleObj.Protocol)
6161
ruleNumber := *ruleObj.RuleNumber
6262
portsStr := ""
6363
switch protocol {
6464
case allProtocols:
65-
conns = connection.All()
65+
conns = netset.AllTransports()
6666
case protocolTCP, protocolUDP:
6767
minPort := int64(*ruleObj.PortRange.From)
6868
maxPort := int64(*ruleObj.PortRange.To)
6969
conns = commonvpc.GetTCPUDPConns(protocol,
70-
connection.MinPort,
71-
connection.MaxPort,
70+
netp.MinPort,
71+
netp.MaxPort,
7272
minPort,
7373
maxPort,
7474
)
@@ -86,19 +86,19 @@ func (na *AWSNACLAnalyzer) GetNACLRule(index int) (ruleStr string, ruleRes *comm
8686
if ruleObj.IcmpTypeCode.Code != nil && *ruleObj.IcmpTypeCode.Code != -1 {
8787
portsStr += fmt.Sprintf(", code: %d", *ruleObj.IcmpTypeCode.Code)
8888
}
89-
conns = connection.ICMPConnection(icmpTypeMin, icmpTypeMax, icmpCodeMin, icmpCodeMax)
89+
conns = netset.NewICMPTransport(icmpTypeMin, icmpTypeMax, icmpCodeMin, icmpCodeMax)
9090
default:
9191
err = fmt.Errorf("GetNACLRule unsupported protocol type: %s ", *ruleObj.Protocol)
9292
return "", nil, false, err
9393
}
9494
connStr = "protocol: " + protocol + portsStr
9595
action := string(ruleObj.RuleAction)
96-
ip, err := ipblock.FromCidr(*ruleObj.CidrBlock)
96+
ip, err := netset.IPBlockFromCidr(*ruleObj.CidrBlock)
9797
if err != nil {
9898
return "", nil, false, err
9999
}
100100
isIngress = !*ruleObj.Egress
101-
src, dst := ipblock.GetCidrAll(), ip
101+
src, dst := netset.GetCidrAll(), ip
102102
direction := commonvpc.Outbound
103103
if isIngress {
104104
src, dst = dst, src

‎pkg/awsvpc/parser.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818

1919
"github.com/np-guard/cloud-resource-collector/pkg/aws"
2020
"github.com/np-guard/cloud-resource-collector/pkg/common"
21-
"github.com/np-guard/models/pkg/ipblock"
21+
"github.com/np-guard/models/pkg/netset"
2222
"github.com/np-guard/vpc-network-config-analyzer/pkg/commonvpc"
2323
"github.com/np-guard/vpc-network-config-analyzer/pkg/logging"
2424
"github.com/np-guard/vpc-network-config-analyzer/pkg/vpcmodel"
@@ -125,7 +125,7 @@ func (rc *AWSresourcesContainer) VPCConfigsFromResources(resourceGroup string, v
125125
return nil, err
126126
}
127127

128-
var vpcInternalAddressRange map[string]*ipblock.IPBlock // map from vpc name to its internal address range
128+
var vpcInternalAddressRange map[string]*netset.IPBlock // map from vpc name to its internal address range
129129

130130
subnetIDToNetIntf := map[string][]*commonvpc.NetworkInterface{}
131131
netIntfToSGs := map[string][]types.GroupIdentifier{}
@@ -248,8 +248,8 @@ func (rc *AWSresourcesContainer) getSubnetsConfig(
248248
res *vpcmodel.MultipleVPCConfigs,
249249
subnetNameToNetIntf map[string][]*commonvpc.NetworkInterface,
250250
skipByVPC map[string]bool,
251-
) (vpcInternalAddressRange map[string]*ipblock.IPBlock, err error) {
252-
vpcInternalAddressRange = map[string]*ipblock.IPBlock{}
251+
) (vpcInternalAddressRange map[string]*netset.IPBlock, err error) {
252+
vpcInternalAddressRange = map[string]*netset.IPBlock{}
253253
for vpcUID := range res.Configs() {
254254
vpcInternalAddressRange[vpcUID] = nil
255255
}

0 commit comments

Comments
 (0)