Skip to content

Commit 8c6a779

Browse files
committed
use pmd6 for init without token
1 parent 9bfafd2 commit 8c6a779

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

cmd/init.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ func configFileTemplate(tools []domain.Tool) string {
123123
toolsMap := make(map[string]bool)
124124
toolVersions := make(map[string]string)
125125

126-
dedupedTools, _, _ := DeduplicateTools(tools)
126+
toolsWithLatestVersion, _, _ := KeepToolsWithLatestVersion(tools)
127127

128128
// Track needed runtimes
129129
needsNode := false
@@ -143,7 +143,7 @@ func configFileTemplate(tools []domain.Tool) string {
143143
}
144144

145145
// Build map of enabled tools with their versions
146-
for _, tool := range dedupedTools {
146+
for _, tool := range toolsWithLatestVersion {
147147
toolsMap[tool.Uuid] = true
148148
if tool.Version != "" {
149149
toolVersions[tool.Uuid] = tool.Version
@@ -246,7 +246,7 @@ func buildRepositoryConfigurationFiles(token string) error {
246246
return err
247247
}
248248

249-
dedupedTools, uuidToName, familyToVersions := DeduplicateTools(apiTools)
249+
dedupedTools, uuidToName, familyToVersions := KeepToolsWithLatestVersion(apiTools)
250250

251251
for family, versions := range familyToVersions {
252252
if len(versions) > 1 {
@@ -451,11 +451,11 @@ func buildDefaultConfigurationFiles(toolsConfigDir string) error {
451451
return fmt.Errorf("failed to create default Trivy configuration: %w", err)
452452
}
453453
case domain.PMD:
454-
continue // only use pmd6 for default configuration
455-
case domain.PMD7:
456-
if err := createPMD7ConfigFile(patternsConfig, toolsConfigDir); err != nil {
457-
return fmt.Errorf("failed to create default PMD7 configuration: %w", err)
454+
if err := createPMDConfigFile(patternsConfig, toolsConfigDir); err != nil {
455+
return fmt.Errorf("failed to create default PMD configuration: %w", err)
458456
}
457+
case domain.PMD7:
458+
continue // only use pmd6 for default configuration
459459
case domain.PyLint:
460460
if err := createPylintConfigFile(patternsConfig, toolsConfigDir); err != nil {
461461
return fmt.Errorf("failed to create default Pylint configuration: %w", err)
@@ -477,8 +477,8 @@ func buildDefaultConfigurationFiles(toolsConfigDir string) error {
477477
return nil
478478
}
479479

480-
func DeduplicateTools(tools []domain.Tool) (
481-
deduped []domain.Tool,
480+
func KeepToolsWithLatestVersion(tools []domain.Tool) (
481+
toolsWithLatestVersion []domain.Tool,
482482
uuidToName map[string]string,
483483
familyToVersions map[string][]string,
484484
) {
@@ -518,7 +518,7 @@ func DeduplicateTools(tools []domain.Tool) (
518518
}
519519

520520
for _, tool := range dedupedMap {
521-
deduped = append(deduped, tool)
521+
toolsWithLatestVersion = append(toolsWithLatestVersion, tool)
522522
}
523523

524524
return

0 commit comments

Comments
 (0)