fix: actually call incremental analysis, if ide flow is used

Author: bastiandoetsch

internal/analysis/analysis.go

@@ -107,7 +107,7 @@ func NewAnalysisOrchestrator(
 ) AnalysisOrchestrator {
 	nopLogger := zerolog.Nop()
 	flow := scans.Flow{}
-	_ = flow.UnmarshalJSON([]byte(`{"name": "ide_test"}`))
+	_ = flow.UnmarshalJSON([]byte(fmt.Sprintf(`{"name": "%s"}`, scans.IdeTest)))
 
 	a := &analysisOrchestrator{
 		httpClient:       httpClient,

internal/orchestration/2024-02-16/client_pact_test.go

@@ -277,7 +277,7 @@ func getBodyMatcher() matchers.Matcher {
 		"data": matchers.Like(map[string]interface{}{
 			"attributes": matchers.Like(map[string]interface{}{
 				"flow": matchers.MapMatcher{
-					"name": matchers.String("ide_test"),
+					"name": matchers.String(scans.IdeTest),
 				},
 				"workspace_id":  getWorkspaceUUIDMatcher(),
 				"workspace_url": getWorkspaceIDMatcher(),
@@ -292,7 +292,7 @@ func getBodyMatcherForIncrementalScan() matchers.Matcher {
 		"data": matchers.Like(map[string]interface{}{
 			"attributes": matchers.Like(map[string]interface{}{
 				"flow": matchers.MapMatcher{
-					"name": matchers.String("ide_test"),
+					"name": matchers.String(scans.IdeTest),
 				},
 				"scan_options": matchers.MapMatcher{
 					"limit_scan_to_files": getIncrementalScanOptionsMatcher(),

scan.go

@@ -28,6 +28,7 @@ import (
 	"github.com/snyk/code-client-go/internal/analysis"
 	"github.com/snyk/code-client-go/internal/bundle"
 	"github.com/snyk/code-client-go/internal/deepcode"
+	scans "github.com/snyk/code-client-go/internal/orchestration/2024-02-16/scans"
 	"github.com/snyk/code-client-go/observability"
 	"github.com/snyk/code-client-go/sarif"
 	"github.com/snyk/code-client-go/scan"
@@ -107,10 +108,9 @@ func NewCodeScanner(
 		logger:         &nopLogger,
 		instrumentor:   instrumentor,
 		trackerFactory: trackerFactory,
+		flow:           string(scans.IdeTest),
 	}
 
-	scanner.flow = "ide_test"
-
 	for _, option := range options {
 		option(scanner)
 	}
@@ -214,8 +214,12 @@ func (c *codeScanner) UploadAndAnalyze(
 			return nil, bundleHash, nil
 		}
 	}
+	var limitToFiles []string
+	for file := range changedFiles {
+		limitToFiles = append(limitToFiles, file)
+	}
+	response, err := c.analysisOrchestrator.RunIncrementalAnalysis(ctx, c.config.Organization(), b.GetRootPath(), workspaceId, limitToFiles)
 
-	response, err := c.analysisOrchestrator.RunAnalysis(ctx, c.config.Organization(), b.GetRootPath(), workspaceId)
 	if ctx.Err() != nil {
 		c.logger.Info().Msg("Canceling Code scan - Code scanner received cancellation signal")
 		return nil, bundleHash, nil

scan_smoke_test.go

@@ -34,6 +34,7 @@ import (
 
 	codeClient "github.com/snyk/code-client-go"
 	codeClientHTTP "github.com/snyk/code-client-go/http"
+	scans "github.com/snyk/code-client-go/internal/orchestration/2024-02-16/scans"
 	"github.com/snyk/code-client-go/internal/util/testutil"
 	"github.com/snyk/code-client-go/scan"
 )
@@ -134,7 +135,7 @@ func Test_SmokeScan_HTTPS_CLI(t *testing.T) {
 		codeClient.WithLogger(&logger),
 		codeClient.WithInstrumentor(instrumentor),
 		codeClient.WithErrorReporter(errorReporter),
-		codeClient.WithFlow("cli_test"),
+		codeClient.WithFlow(string(scans.CliTest)),
 	)
 
 	// let's have a requestID that does not change

scan_test.go

@@ -100,7 +100,13 @@ func Test_UploadAndAnalyze(t *testing.T) {
 
 			mockAnalysisOrchestrator := mockAnalysis.NewMockAnalysisOrchestrator(ctrl)
 			mockAnalysisOrchestrator.EXPECT().CreateWorkspace(gomock.Any(), "4a72d1db-b465-4764-99e1-ecedad03b06a", "b372d1db-b465-4764-99e1-ecedad03b06a", target, "testBundleHash").Return("c172d1db-b465-4764-99e1-ecedad03b06a", nil)
-			mockAnalysisOrchestrator.EXPECT().RunAnalysis(gomock.Any(), "4a72d1db-b465-4764-99e1-ecedad03b06a", "testRootPath", "c172d1db-b465-4764-99e1-ecedad03b06a").Return(&sarif.SarifResponse{Status: "COMPLETE"}, nil)
+			mockAnalysisOrchestrator.EXPECT().RunIncrementalAnalysis(
+				gomock.Any(),
+				"4a72d1db-b465-4764-99e1-ecedad03b06a",
+				"testRootPath",
+				"c172d1db-b465-4764-99e1-ecedad03b06a",
+				gomock.Any(),
+			).Return(&sarif.SarifResponse{Status: "COMPLETE"}, nil)
 
 			codeScanner := codeclient.NewCodeScanner(
 				mockConfig,