feat: show target directory and file as "Testing <target dir> (<target file>) ...", and simplify the JSON output's "org" code

  - the "Testing ..." line now shows as "Testing <target dir> (target file) ...", which helps distinguish
    the project in cases like --all-projects.
  - "path" in both human-readable and JSON output is now the Target Directory instead of cwd
  - org and target directory are both obtainable from Configuration, so orgSlug is no longer passed around

Author: bsalomon-snyk

internal/commands/ostest/depgraph_flow.go

@@ -28,7 +28,6 @@ func RunUnifiedTestFlow(
 	riskScoreThreshold *uint16,
 	severityThreshold *testapi.Severity,
 	orgID string,
-	orgSlugOrID string,
 	errFactory *errors.ErrorFactory,
 	logger *zerolog.Logger,
 ) ([]workflow.Data, error) {
@@ -47,7 +46,6 @@ func RunUnifiedTestFlow(
 		ictx,
 		testClient,
 		orgID,
-		orgSlugOrID,
 		errFactory,
 		logger,
 		localPolicy,
@@ -67,7 +65,6 @@ func testAllDepGraphs(
 	ictx workflow.InvocationContext,
 	testClient testapi.TestClient,
 	orgID string,
-	orgSlugOrID string,
 	errFactory *errors.ErrorFactory,
 	logger *zerolog.Logger,
 	localPolicy *testapi.LocalPolicy,
@@ -95,7 +92,7 @@ func testAllDepGraphs(
 		// Run the test with the depgraph subject
 		legacyFinding, outputData, err := RunTest(
 			ctx, ictx, testClient, subject, projectName, packageManager, depCount,
-			displayTargetFile, orgID, orgSlugOrID, errFactory, logger, localPolicy)
+			displayTargetFile, orgID, errFactory, logger, localPolicy)
 		if err != nil {
 			return nil, nil, err
 		}

internal/commands/ostest/sbom_reachability_flow.go

@@ -25,7 +25,6 @@ func RunSbomReachabilityFlow(
 	sourceCodePath string,
 	bsClient bundlestore.Client,
 	orgID string,
-	orgSlugOrID string,
 ) ([]workflow.Data, error) {
 	if sourceCodePath == "" {
 		sourceCodePath = "."
@@ -68,7 +67,7 @@ func RunSbomReachabilityFlow(
 		return nil, fmt.Errorf("failed to create sbom test reachability subject: %w", err)
 	}
 
-	findings, summary, err := RunTest(ctx, ictx, testClient, subject, "", "", int(0), sbomPath, orgID, orgSlugOrID, errFactory, logger, nil)
+	findings, summary, err := RunTest(ctx, ictx, testClient, subject, "", "", int(0), sbomPath, orgID, errFactory, logger, nil)
 	if err != nil {
 		return nil, err
 	}

internal/commands/ostest/sbom_reachability_flow_test.go

@@ -39,10 +39,10 @@ func Test_RunSbomReachabilityFlow_JSON(t *testing.T) {
 
 	ctx := context.Background()
 	ef := errors.NewErrorFactory(&nopLogger)
-	mockIctx, mockTestClient, mockBsClient, orgID, orgSlug, sbomPath, sourceCodePath := setupTest(ctx, t, ctrl, true)
+	mockIctx, mockTestClient, mockBsClient, orgID, sbomPath, sourceCodePath := setupTest(ctx, t, ctrl, true)
 
 	// This should now succeed with proper finding data
-	result, err := ostest.RunSbomReachabilityFlow(ctx, mockIctx, mockTestClient, ef, &nopLogger, sbomPath, sourceCodePath, mockBsClient, orgID, orgSlug)
+	result, err := ostest.RunSbomReachabilityFlow(ctx, mockIctx, mockTestClient, ef, &nopLogger, sbomPath, sourceCodePath, mockBsClient, orgID)
 
 	require.NoError(t, err)
 	require.NotNil(t, result)
@@ -64,10 +64,10 @@ func Test_RunSbomReachabilityFlow_HumanReadable(t *testing.T) {
 
 	ctx := context.Background()
 	ef := errors.NewErrorFactory(&nopLogger)
-	mockIctx, mockTestClient, mockBsClient, orgID, orgSlug, sbomPath, sourceCodePath := setupTest(ctx, t, ctrl, false)
+	mockIctx, mockTestClient, mockBsClient, orgID, sbomPath, sourceCodePath := setupTest(ctx, t, ctrl, false)
 
 	// This should now succeed with proper finding data
-	result, err := ostest.RunSbomReachabilityFlow(ctx, mockIctx, mockTestClient, ef, &nopLogger, sbomPath, sourceCodePath, mockBsClient, orgID, orgSlug)
+	result, err := ostest.RunSbomReachabilityFlow(ctx, mockIctx, mockTestClient, ef, &nopLogger, sbomPath, sourceCodePath, mockBsClient, orgID)
 
 	require.NoError(t, err)
 	require.NotNil(t, result)
@@ -87,7 +87,6 @@ func setupTest(ctx context.Context, t *testing.T, ctrl *gomock.Controller, jsonO
 	string,
 	string,
 	string,
-	string,
 ) {
 	t.Helper()
 	sbomPath := "./testdata/bom.json"
@@ -222,5 +221,5 @@ func setupTest(ctx context.Context, t *testing.T, ctrl *gomock.Controller, jsonO
 	mockIctx.EXPECT().GetEnhancedLogger().Return(&nopLogger).AnyTimes()
 	mockIctx.EXPECT().GetRuntimeInfo().Return(runtimeinfo.New()).AnyTimes()
 
-	return mockIctx, mockTestClient, mockBsClient, orgID, orgSlug, sbomPath, sourceCodePath
+	return mockIctx, mockTestClient, mockBsClient, orgID, sbomPath, sourceCodePath
 }

internal/commands/ostest/test_execution.go

@@ -6,12 +6,12 @@ import (
 	std_errors "errors"
 	"fmt"
 	"math"
-	"os"
 	"sort"
 	"strings"
 
 	"github.com/rs/zerolog"
 	"github.com/snyk/go-application-framework/pkg/apiclients/testapi"
+	"github.com/snyk/go-application-framework/pkg/configuration"
 	"github.com/snyk/go-application-framework/pkg/local_workflows/content_type"
 	"github.com/snyk/go-application-framework/pkg/local_workflows/json_schemas"
 	"github.com/snyk/go-application-framework/pkg/workflow"
@@ -43,7 +43,6 @@ func RunTest(
 	depCount int,
 	displayTargetFile string,
 	orgID string,
-	orgSlugOrID string,
 	errFactory *errors.ErrorFactory,
 	logger *zerolog.Logger,
 	localPolicy *testapi.LocalPolicy,
@@ -53,17 +52,19 @@ func RunTest(
 		return nil, nil, err
 	}
 
-	// path should be the current working directory
-	currentDir, wdErr := os.Getwd()
-	if wdErr != nil {
-		logger.Error().Err(wdErr).Msg("Failed to get current working directory")
-		return nil, nil, fmt.Errorf("failed to get current working directory: %w", wdErr)
+	config := ictx.GetConfiguration()
+	targetDir := config.GetString(configuration.INPUT_DIRECTORY)
+
+	orgSlugOrID := config.GetString(configuration.ORGANIZATION_SLUG)
+	if orgSlugOrID == "" {
+		logger.Info().Msg("No organization slug provided; using organization ID.")
+		orgSlugOrID = orgID
 	}
 
 	uniqueCount := calculateUniqueIssueCount(findingsData)
 
 	// The summary is always needed for the exit code calculation.
-	standardSummary, summaryData, summaryErr := NewSummaryData(finalResult, logger, currentDir)
+	standardSummary, summaryData, summaryErr := NewSummaryData(finalResult, logger, targetDir)
 	if summaryErr != nil && !std_errors.Is(summaryErr, ErrNoSummaryData) {
 		// Log the error but continue, as this is not fatal.
 		logger.Warn().Err(summaryErr).Msg("Failed to create test summary for exit code handling")
@@ -75,7 +76,7 @@ func RunTest(
 		OrgSlugOrID:       orgSlugOrID,
 		ProjectName:       projectName,
 		PackageManager:    packageManager,
-		CurrentDir:        currentDir,
+		TargetDir:         targetDir,
 		UniqueCount:       uniqueCount,
 		DepCount:          depCount,
 		DisplayTargetFile: displayTargetFile,

internal/commands/ostest/workflow.go

@@ -78,7 +78,6 @@ func setupSBOMReachabilityFlow(
 	ictx workflow.InvocationContext,
 	testClient testapi.TestClient,
 	orgID string,
-	orgSlugOrID string,
 	errFactory *errors.ErrorFactory,
 	logger *zerolog.Logger,
 	sbom, sourceDir string,
@@ -105,7 +104,7 @@ func setupSBOMReachabilityFlow(
 	)
 
 	bsClient := bundlestore.NewClient(ictx.GetNetworkAccess().GetHttpClient(), codeScannerConfig, cScanner, logger)
-	return RunSbomReachabilityFlow(ctx, ictx, testClient, errFactory, logger, sbom, sourceDir, bsClient, orgID, orgSlugOrID)
+	return RunSbomReachabilityFlow(ctx, ictx, testClient, errFactory, logger, sbom, sourceDir, bsClient, orgID)
 }
 
 // setupDefaultTestFlow sets up and runs the default test flow with risk score and severity thresholds.
@@ -114,7 +113,6 @@ func setupDefaultTestFlow(
 	ictx workflow.InvocationContext,
 	testClient testapi.TestClient,
 	orgID string,
-	orgSlugOrID string,
 	errFactory *errors.ErrorFactory,
 	logger *zerolog.Logger,
 	riskScoreThreshold int,
@@ -153,7 +151,7 @@ func setupDefaultTestFlow(
 		severityThresholdPtr = &st
 	}
 
-	return RunUnifiedTestFlow(ctx, ictx, testClient, riskScorePtr, severityThresholdPtr, orgID, orgSlugOrID, errFactory, logger)
+	return RunUnifiedTestFlow(ctx, ictx, testClient, riskScorePtr, severityThresholdPtr, orgID, errFactory, logger)
 }
 
 // OSWorkflow is the entry point for the Open Source Test workflow.
@@ -197,12 +195,6 @@ func OSWorkflow(
 		return nil, errFactory.NewEmptyOrgError()
 	}
 
-	orgSlugOrID := config.GetString(configuration.ORGANIZATION_SLUG)
-	if orgSlugOrID == "" {
-		logger.Info().Msg("No organization slug provided; using organization ID.")
-		orgSlugOrID = orgID
-	}
-
 	// Create Snyk client
 	httpClient := ictx.GetNetworkAccess().GetHttpClient()
 	snykClient := snykclient.NewSnykClient(httpClient, ictx.GetConfiguration().GetString(configuration.API_URL), orgID)
@@ -220,8 +212,8 @@ func OSWorkflow(
 	// Route to the appropriate flow based on flags
 	switch {
 	case sbomReachabilityTest:
-		return setupSBOMReachabilityFlow(ctx, ictx, testClient, orgID, orgSlugOrID, errFactory, logger, sbom, sourceDir)
+		return setupSBOMReachabilityFlow(ctx, ictx, testClient, orgID, errFactory, logger, sbom, sourceDir)
 	default:
-		return setupDefaultTestFlow(ctx, ictx, testClient, orgID, orgSlugOrID, errFactory, logger, riskScoreThreshold)
+		return setupDefaultTestFlow(ctx, ictx, testClient, orgID, errFactory, logger, riskScoreThreshold)
 	}
 }

internal/legacy/transform/transform.go

@@ -28,7 +28,7 @@ type SnykSchemaToLegacyParams struct {
 	OrgSlugOrID       string
 	ProjectName       string
 	PackageManager    string
-	CurrentDir        string
+	TargetDir         string
 	UniqueCount       int32
 	DepCount          int
 	DisplayTargetFile string
@@ -398,7 +398,7 @@ func ConvertSnykSchemaFindingsToLegacy(params *SnykSchemaToLegacyParams) (*defin
 	res := definitions.LegacyVulnerabilityResponse{
 		Org:               params.OrgSlugOrID,
 		ProjectName:       params.ProjectName,
-		Path:              params.CurrentDir,
+		Path:              params.TargetDir,
 		PackageManager:    params.PackageManager,
 		DisplayTargetFile: params.DisplayTargetFile,
 		UniqueCount:       params.UniqueCount,

internal/presenters/funcs.go

@@ -361,6 +361,7 @@ func getDefaultTemplateFuncMap(config configuration.Configuration, ri runtimeinf
 	defaultMap["getFindingId"] = getFindingID
 	defaultMap["hasPrefix"] = strings.HasPrefix
 	defaultMap["isLicenseFinding"] = isLicenseFinding
+	defaultMap["constructDisplayPath"] = constructDisplayPath(config)
 
 	return defaultMap
 }
@@ -433,3 +434,14 @@ func formatDatetime(input, inputFormat, outputFormat string) string {
 
 	return datetime.Format(outputFormat)
 }
+
+// constructDisplayPath constructs the display path from the summary path and display target file.
+func constructDisplayPath(config configuration.Configuration) func(displayTargetFile string) string {
+	return func(displayTargetFile string) string {
+		summaryPath := config.GetString(configuration.INPUT_DIRECTORY)
+		if displayTargetFile == "" {
+			return summaryPath
+		}
+		return fmt.Sprintf("%s (%s)", summaryPath, displayTargetFile)
+	}
+}

internal/presenters/templates/unified_finding.tmpl

@@ -66,15 +66,16 @@
 {{- end}}{{/* end "details" */}}
 
 {{define "header" }}
-{{ print "Testing " .Summary.Path  " ..." | bold }}
+{{ $displayPath := constructDisplayPath .DisplayTargetFile -}}
+{{ print "Testing " $displayPath " ..." | bold }}
 {{end }}
 
 {{- define "summary"}}{{ "Test Summary" | bold }}
 
   Organization:      {{ getValueFromConfig "internal_org_slug" }}
   Test type:         {{ if eq .Summary.Type "sast" }}Static code analysis{{else}}{{ .Summary.Type }}{{ end}}
-  Project path:      {{ .Summary.Path }}
-
+  Project path:      {{ getValueFromConfig "targetDirectory" }}
+  
   {{- $total := 0 }}{{- $open := 0 }}{{- $ignored := 0 }}
   {{- range $res := .Summary.Results }}
       {{- $total = add $total $res.Total }}