Initial forced regeneration flag implementation

internal/cmd/resolve/resolve.go

@@ -12,10 +12,12 @@ import (
 
 var exclusions = file.Exclusions()
 var verbose bool
+var regenerate int
 
 const (
-	ExclusionFlag = "exclusion"
-	VerboseFlag   = "verbose"
+	ExclusionFlag  = "exclusion"
+	VerboseFlag    = "verbose"
+	RegenerateFlag = "regenerate"
 )
 
 func NewResolveCmd(resolver resolution.IResolver) *cobra.Command {
@@ -48,6 +50,13 @@ Exclude flags could alternatively be set using DEBRICKED_EXCLUSIONS="path1,path2
 Example: 
 $ debricked resolve . `+exampleFlags)
 	cmd.Flags().BoolVar(&verbose, VerboseFlag, true, "set to false to disable extensive resolution error messages")
+	cmd.Flags().IntVar(&regenerate, RegenerateFlag, 0, `Toggles regeneration of lock files between 3 modes:
+0: Default = Only generate new lock files for manifest files without matching lock files.
+1: Regenerate Non-Native: Only generate new lock files for manifest files without matching lock files or matching debricked lock file.
+2: Regenerate: Regenerate all existing lock files and generate new lock files for all manifest files.
+
+Example:
+$ debricked resolve . --regenerate=1`)
 
 	viper.MustBindEnv(ExclusionFlag)
 
@@ -59,7 +68,7 @@ func RunE(resolver resolution.IResolver) func(_ *cobra.Command, args []string) e
 		if len(args) == 0 {
 			args = append(args, ".")
 		}
-		_, err := resolver.Resolve(args, viper.GetStringSlice(ExclusionFlag), viper.GetBool(VerboseFlag))
+		_, err := resolver.Resolve(args, viper.GetStringSlice(ExclusionFlag), viper.GetBool(VerboseFlag), viper.GetInt(RegenerateFlag))
 
 		return err
 	}

internal/cmd/scan/scan.go

@@ -20,6 +20,7 @@ var repositoryUrl string
 var integrationName string
 var exclusions = file.Exclusions()
 var verbose bool
+var regenerate int
 var noResolve bool
 var noFingerprint bool
 var passOnDowntime bool
@@ -36,6 +37,7 @@ const (
 	IntegrationFlag              = "integration"
 	ExclusionFlag                = "exclusion"
 	VerboseFlag                  = "verbose"
+	RegenerateFlag               = "regenerate"
 	NoResolveFlag                = "no-resolve"
 	FingerprintFlag              = "fingerprint"
 	PassOnTimeOut                = "pass-on-timeout"
@@ -92,6 +94,7 @@ Exclude flags could alternatively be set using DEBRICKED_EXCLUSIONS="path1,path2
 Examples: 
 $ debricked scan . `+exampleFlags)
 	cmd.Flags().BoolVar(&verbose, VerboseFlag, true, "set to false to disable extensive resolution error messages")
+	cmd.Flags().IntVar(&regenerate, RegenerateFlag, 0, "")
 	cmd.Flags().BoolVarP(&passOnDowntime, PassOnTimeOut, "p", false, "pass scan if there is a service access timeout")
 	cmd.Flags().BoolVar(&noResolve, NoResolveFlag, false, `disables resolution of manifest files that lack lock files. Resolving manifest files enables more accurate dependency scanning since the whole dependency tree will be analysed.
 For example, if there is a "go.mod" in the target path, its dependencies are going to get resolved onto a lock file, and latter scanned.`)
@@ -124,6 +127,7 @@ func RunE(s *scan.IScanner) func(_ *cobra.Command, args []string) error {
 			Fingerprint:              viper.GetBool(FingerprintFlag),
 			Exclusions:               viper.GetStringSlice(ExclusionFlag),
 			Verbose:                  viper.GetBool(VerboseFlag),
+			Regenerate:               viper.GetInt(RegenerateFlag),
 			RepositoryName:           viper.GetString(RepositoryFlag),
 			CommitName:               viper.GetString(CommitFlag),
 			BranchName:               viper.GetString(BranchFlag),

internal/resolution/resolver.go

@@ -1,8 +1,10 @@
 package resolution
 
 import (
+	"fmt"
 	"os"
 	"path"
+	"regexp"
 
 	"github.com/debricked/cli/internal/file"
 	resolutionFile "github.com/debricked/cli/internal/resolution/file"
@@ -12,7 +14,7 @@ import (
 )
 
 type IResolver interface {
-	Resolve(paths []string, exclusions []string, verbose bool) (IResolution, error)
+	Resolve(paths []string, exclusions []string, verbose bool, regenerate int) (IResolution, error)
 }
 
 type Resolver struct {
@@ -36,12 +38,11 @@ func NewResolver(
 	}
 }
 
-func (r Resolver) Resolve(paths []string, exclusions []string, verbose bool) (IResolution, error) {
-	files, err := r.refinePaths(paths, exclusions)
+func (r Resolver) Resolve(paths []string, exclusions []string, verbose bool, regenerate int) (IResolution, error) {
+	files, err := r.refinePaths(paths, exclusions, regenerate)
 	if err != nil {
 		return nil, err
 	}
-
 	pmBatches := r.batchFactory.Make(files)
 
 	var jobs []job.IJob
@@ -66,7 +67,7 @@ func (r Resolver) Resolve(paths []string, exclusions []string, verbose bool) (IR
 	return resolution, err
 }
 
-func (r Resolver) refinePaths(paths []string, exclusions []string) ([]string, error) {
+func (r Resolver) refinePaths(paths []string, exclusions []string, regenerate int) ([]string, error) {
 	var fileSet = map[string]bool{}
 	var dirs []string
 	for _, arg := range paths {
@@ -89,7 +90,7 @@ func (r Resolver) refinePaths(paths []string, exclusions []string) ([]string, er
 		}
 	}
 
-	err := r.searchDirs(fileSet, dirs, exclusions)
+	err := r.searchDirs(fileSet, dirs, exclusions, regenerate)
 	if err != nil {
 		return nil, err
 	}
@@ -102,7 +103,7 @@ func (r Resolver) refinePaths(paths []string, exclusions []string) ([]string, er
 	return files, nil
 }
 
-func (r Resolver) searchDirs(fileSet map[string]bool, dirs []string, exclusions []string) error {
+func (r Resolver) searchDirs(fileSet map[string]bool, dirs []string, exclusions []string, regenerate int) error {
 	for _, dir := range dirs {
 		fileGroups, err := r.finder.GetGroups(
 			dir,
@@ -114,11 +115,40 @@ func (r Resolver) searchDirs(fileSet map[string]bool, dirs []string, exclusions
 			return err
 		}
 		for _, fileGroup := range fileGroups.ToSlice() {
-			if fileGroup.HasFile() && !fileGroup.HasLockFiles() {
+			shouldGenerate, err := shouldGenerateLock(fileGroup, regenerate)
+			if err != nil {
+				continue
+			}
+			if shouldGenerate {
 				fileSet[fileGroup.ManifestFile] = true
 			}
 		}
 	}
 
 	return nil
 }
+
+func shouldGenerateLock(fileGroup file.Group, regenerate int) (bool, error) {
+	switch regenerate {
+	case 0:
+		return fileGroup.HasFile() && !fileGroup.HasLockFiles(), nil
+	case 1:
+		return fileGroup.HasFile() && onlyNonNativeLockFiles(fileGroup.LockFiles), nil
+	case 2:
+		return fileGroup.HasFile(), nil
+	default:
+		return false, fmt.Errorf("Incorrect use of regenerateLockFlag, should be one of [0, 1, 2]")
+	}
+}
+
+func onlyNonNativeLockFiles(lockFiles []string) bool {
+	debrickedLockFilePattern := regexp.MustCompile(`.*\.debricked\.lock`)
+	for _, lockFile := range lockFiles {
+		if !debrickedLockFilePattern.MatchString(lockFile) {
+			return false
+		}
+	}
+
+	return true
+
+}

internal/resolution/resolver_test.go

@@ -40,7 +40,7 @@ func TestResolve(t *testing.T) {
 		NewScheduler(workers),
 	)
 
-	res, err := r.Resolve([]string{"../../go.mod"}, nil, true)
+	res, err := r.Resolve([]string{"../../go.mod"}, nil, true, 0)
 	assert.NotEmpty(t, res.Jobs())
 	assert.NoError(t, err)
 }
@@ -53,7 +53,7 @@ func TestResolveInvokeError(t *testing.T) {
 		NewScheduler(workers),
 	)
 
-	_, err := r.Resolve([]string{"../../go.mod"}, nil, true)
+	_, err := r.Resolve([]string{"../../go.mod"}, nil, true, 0)
 	assert.NotNil(t, err)
 }
 
@@ -65,7 +65,7 @@ func TestResolveStrategyError(t *testing.T) {
 		NewScheduler(workers),
 	)
 
-	res, err := r.Resolve([]string{"../../go.mod"}, nil, true)
+	res, err := r.Resolve([]string{"../../go.mod"}, nil, true, 0)
 	assert.Empty(t, res.Jobs())
 	assert.NoError(t, err)
 }
@@ -79,7 +79,7 @@ func TestResolveScheduleError(t *testing.T) {
 		SchedulerMock{Err: errAssertion},
 	)
 
-	res, err := r.Resolve([]string{"../../go.mod"}, nil, true)
+	res, err := r.Resolve([]string{"../../go.mod"}, nil, true, 0)
 	assert.NotEmpty(t, res.Jobs())
 	assert.ErrorIs(t, err, errAssertion)
 }
@@ -92,7 +92,7 @@ func TestResolveDirWithoutManifestFiles(t *testing.T) {
 		SchedulerMock{},
 	)
 
-	res, err := r.Resolve([]string{"."}, nil, true)
+	res, err := r.Resolve([]string{"."}, nil, true, 0)
 	assert.Empty(t, res.Jobs())
 	assert.NoError(t, err)
 }
@@ -105,7 +105,7 @@ func TestResolveInvalidDir(t *testing.T) {
 		SchedulerMock{},
 	)
 
-	_, err := r.Resolve([]string{"invalid-dir"}, nil, true)
+	_, err := r.Resolve([]string{"invalid-dir"}, nil, true, 0)
 	assert.Error(t, err)
 }
 
@@ -121,7 +121,7 @@ func TestResolveGetGroupsErr(t *testing.T) {
 		SchedulerMock{},
 	)
 
-	_, err := r.Resolve([]string{"."}, nil, true)
+	_, err := r.Resolve([]string{"."}, nil, true, 0)
 	assert.ErrorIs(t, testErr, err)
 }
 
@@ -149,7 +149,7 @@ func TestResolveDirWithManifestFiles(t *testing.T) {
 
 	for _, dir := range cases {
 		t.Run(fmt.Sprintf("Case: %s", dir), func(t *testing.T) {
-			res, err := r.Resolve([]string{dir}, nil, true)
+			res, err := r.Resolve([]string{dir}, nil, true, 0)
 			assert.Len(t, res.Jobs(), 1)
 			j := res.Jobs()[0]
 			assert.False(t, j.Errors().HasError())
@@ -172,7 +172,7 @@ func TestResolveDirWithExclusions(t *testing.T) {
 		SchedulerMock{},
 	)
 
-	res, err := r.Resolve([]string{"."}, []string{"dir"}, true)
+	res, err := r.Resolve([]string{"."}, []string{"dir"}, true, 0)
 
 	assert.Len(t, res.Jobs(), 1)
 	j := res.Jobs()[0]
@@ -199,7 +199,7 @@ func TestResolveHasResolutionErrs(t *testing.T) {
 		schedulerMock,
 	)
 
-	res, err := r.Resolve([]string{""}, []string{""}, true)
+	res, err := r.Resolve([]string{""}, []string{""}, true, 0)
 
 	assert.NoError(t, err)
 	assert.Len(t, res.Jobs(), 1)

internal/resolution/testdata/resolver_mock.go

@@ -12,7 +12,7 @@ type ResolverMock struct {
 	files []string
 }
 
-func (r *ResolverMock) Resolve(_ []string, _ []string, _ bool) (resolution.IResolution, error) {
+func (r *ResolverMock) Resolve(_ []string, _ []string, _ bool, _ int) (resolution.IResolution, error) {
 	for _, f := range r.files {
 		createdFile, err := os.Create(f)
 		if err != nil {

internal/scan/scanner.go

@@ -48,6 +48,7 @@ type DebrickedOptions struct {
 	CallGraph                bool
 	Exclusions               []string
 	Verbose                  bool
+	Regenerate               int
 	RepositoryName           string
 	CommitName               string
 	BranchName               string
@@ -133,7 +134,7 @@ func (dScanner *DebrickedScanner) Scan(o IOptions) error {
 
 func (dScanner *DebrickedScanner) scanResolve(options DebrickedOptions) error {
 	if options.Resolve {
-		_, resErr := dScanner.resolver.Resolve([]string{options.Path}, options.Exclusions, options.Verbose)
+		_, resErr := dScanner.resolver.Resolve([]string{options.Path}, options.Exclusions, options.Verbose, options.Regenerate)
 		if resErr != nil {
 			return resErr
 		}