towards full support in multiVPC

Author: ShiriMoran

cmd/analyzer/subcmds/lint.go

@@ -29,14 +29,10 @@ func lintVPCConfigs(cmd *cobra.Command, inArgs *inArgs) error {
 	cmd.SilenceUsage = true  // if we got this far, flags are syntactically correct, so no need to print usage
 	cmd.SilenceErrors = true // also, error will be printed to logger in main(), so no need for cobra to also print it
 
-	vpcConfigs, err := buildConfigs(inArgs)
+	multiConfigs, err := buildConfigs(inArgs)
 	if err != nil {
 		return err
 	}
-	// takes the first vpcConfig, for now
-	for _, vpcConfig := range vpcConfigs.Configs() {
-		linter.LinterExecute(vpcConfig)
-		return nil
-	}
+	linter.LinterExecute(multiConfigs.Configs())
 	return nil
 }

pkg/ibmvpc/lint_test.go

@@ -69,7 +69,7 @@ func (tt *vpcGeneralTest) runLintTest(t *testing.T) {
 	vpcConfigs := getVPCConfigs(t, tt, true)
 
 	// generate actual output for all use cases specified for this test
-	err := runLintTestPerUseCase(t, tt, vpcConfigs, lintOut)
+	err := runLintTestPerUseCase(t, tt, vpcConfigs.Configs(), lintOut)
 	require.Equal(t, tt.errPerUseCase[vpcmodel.AllEndpoints], err, "comparing actual err to expected err")
 	for uc, outFile := range tt.actualOutput {
 		fmt.Printf("test %s use-case %d - generated output file: %s\n", tt.name, uc, outFile)
@@ -79,19 +79,13 @@ func (tt *vpcGeneralTest) runLintTest(t *testing.T) {
 // runExplainTestPerUseCase executes lint for the required use case and compares/generates the output
 func runLintTestPerUseCase(t *testing.T,
 	tt *vpcGeneralTest,
-	cConfigs *vpcmodel.MultipleVPCConfigs,
+	cConfigs map[string]*vpcmodel.VPCConfig,
 	outDir string) error {
 	// output use case is not significant here, but being used so that lint test can rely on existing mechanism
 	if err := initLintTestFileNames(tt, outDir); err != nil {
 		return err
 	}
-	// todo: support multiCPV config
-	var myConfig *vpcmodel.VPCConfig
-	for _, config := range cConfigs.Configs() {
-		myConfig = config
-		continue // todo: tmp
-	}
-	_, actualOutput := linter.LinterExecute(myConfig)
+	_, actualOutput := linter.LinterExecute(cConfigs)
 	if err := compareOrRegenerateOutputPerTest(t, tt.mode, actualOutput, tt, vpcmodel.AllEndpoints); err != nil {
 		return err
 	}

pkg/linter/linterExecute.go

@@ -17,34 +17,39 @@ const issues = " issues:"
 
 // LinterExecute executes linters one by one
 // todo: mechanism for disabling/enabling lint checks
-// todo: handle multiConfig
-func LinterExecute(config *vpcmodel.VPCConfig) (issueFound bool, resString string) {
-	blinter := basicLinter{
-		config: config,
-	}
-	linters := []linter{
-		&filterRuleSplitSubnet{basicLinter: blinter},
-	}
-	issueFound = false
-	resString = "linting results for " + config.VPC.Name()
-	underline := strings.Repeat("~", len(resString))
-	resString += "\n" + underline + "\n\n"
-	for _, thisLinter := range linters {
-		lintIssues, err := thisLinter.check()
-		if err != nil {
-			fmt.Printf("Lint %s got an error %s. Skipping this lint\n", thisLinter.getName(), err.Error())
-			continue
+func LinterExecute(configsMap map[string]*vpcmodel.VPCConfig) (issueFound bool, resString string) {
+	for _, config := range configsMap {
+		if config.IsMultipleVPCsConfig {
+			continue // no use in executing lint on dummy vpcs
+		}
+		blinter := basicLinter{
+			config: config,
+		}
+		linters := []linter{
+			&filterRuleSplitSubnet{basicLinter: blinter},
 		}
-		if len(lintIssues) == 0 {
-			fmt.Printf("no lint %s issues\n", thisLinter.getName())
-			continue
-		} else {
-			issueFound = true
+		issueFound = false
+		resString = "linting results for " + config.VPC.Name()
+		underline := strings.Repeat("~", len(resString))
+		resString += "\n" + underline + "\n\n"
+		for _, thisLinter := range linters {
+			lintIssues, err := thisLinter.check()
+			if err != nil {
+				fmt.Printf("Lint %s got an error %s. Skipping this lint\n", thisLinter.getName(), err.Error())
+				continue
+			}
+			if len(lintIssues) == 0 {
+				fmt.Printf("no lint %s issues\n", thisLinter.getName())
+				continue
+			} else {
+				issueFound = true
+			}
+			resString += fmt.Sprintf("%s%s\n", thisLinter.getName(), issues) +
+				strings.Repeat("-", len(thisLinter.getName())+len(issues)) + "\n" +
+				strings.Join(lintIssues, "")
 		}
-		resString += fmt.Sprintf("%s%s\n", thisLinter.getName(), issues) +
-			strings.Repeat("-", len(thisLinter.getName())+len(issues)) + "\n" +
-			strings.Join(lintIssues, "")
+		fmt.Printf("%v", resString)
+		return issueFound, resString
 	}
-	fmt.Printf("%v", resString)
-	return issueFound, resString
+	return false, ""
 }