Skip to content

Commit 0060e92

Browse files
committed
remove files, add sg members to print
1 parent 7b2ec8a commit 0060e92

File tree

4 files changed

+17
-31
lines changed

4 files changed

+17
-31
lines changed

pkg/commonvpc/parser.go

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ package commonvpc
88

99
import (
1010
"fmt"
11+
"strings"
1112

1213
"github.com/np-guard/models/pkg/ipblock"
14+
"github.com/np-guard/vpc-network-config-analyzer/pkg/logging"
1315
"github.com/np-guard/vpc-network-config-analyzer/pkg/vpcmodel"
1416
)
1517

@@ -277,23 +279,30 @@ func NewSubnet(name, uid, zone, cidr string, vpc vpcmodel.VPCResourceIntf) (*Sub
277279
}
278280

279281
func PrintLineSection() {
280-
fmt.Println("-----------------------------------------")
282+
logging.Debugf("-----------------------------------------")
281283
}
282284

283285
func PrintSGRules(sg *SecurityGroup) {
284286
numRules := sg.Analyzer.SgAnalyzer.GetNumberOfRules()
285-
286-
fmt.Printf("num rules: %d\n", numRules)
287+
logging.Debugf("num rules: %d\n", numRules)
287288
for i := 0; i < numRules; i++ {
288289
strRule, _, _, err := sg.Analyzer.SgAnalyzer.GetSGRule(i)
289-
PrintRule(strRule, i, err)
290+
PrintRule(strRule, sg.Members, i, err)
290291
}
291292
}
292293

293-
func PrintRule(ruleStr string, index int, err error) {
294+
func PrintRule(ruleStr string, members map[string]vpcmodel.Node, index int, err error) {
294295
if err == nil {
295-
fmt.Println(ruleStr)
296+
logging.Debugf(ruleStr)
297+
if members != nil {
298+
logging.Debugf("members:\n")
299+
keys := make([]string, 0, len(members))
300+
for k := range members {
301+
keys = append(keys, k)
302+
}
303+
logging.Debugf(strings.Join(keys, " "))
304+
}
296305
} else {
297-
fmt.Printf("err for rule %d: %s\n", index, err.Error())
306+
logging.Debugf("err for rule %d: %s\n", index, err.Error())
298307
}
299308
}

pkg/ibmvpc/examples/out/analysis_out/actual.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.

pkg/ibmvpc/examples/out/analysis_out/expected.txt

Lines changed: 0 additions & 18 deletions
This file was deleted.

pkg/ibmvpc/parser.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1636,6 +1636,6 @@ func printNACLRules(nacl *NACL) {
16361636
numRules := len(nacl.analyzer.naclResource.Rules)
16371637
for i := 0; i < numRules; i++ {
16381638
strRule, _, _, err := nacl.analyzer.getNACLRule(i)
1639-
commonvpc.PrintRule(strRule, i, err)
1639+
commonvpc.PrintRule(strRule, nil, i, err)
16401640
}
16411641
}

0 commit comments

Comments
 (0)