feat: add more scan context for gitlab

Bearer · Jan 12, 2024 · 973a7ae · 973a7ae
1 parent 49c6944
commit 973a7ae
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/internal/flag/repository_flags.go b/internal/flag/repository_flags.go
@@ -118,8 +118,8 @@ var (
 		Value:      "",
 		Usage:      "Used when fetching branch level ignores for a PR/MR",
 		EnvironmentVariables: []string{
-			"PR_NUMBER",           // github
-			"CI_MERGE_REQUEST_ID", //gitlab
+			"PR_NUMBER",            // github
+			"CI_MERGE_REQUEST_IID", //gitlab
 		},
 		DisableInConfig: true,
 		Hide:            true,

diff --git a/internal/flag/repository_flags_test.go b/internal/flag/repository_flags_test.go
@@ -306,10 +306,10 @@ func Test_getPullRequestNumberFlag(t *testing.T) {
 			},
 		},
 		{
-			name: "Repository PullRequestNumber. CI_MERGE_REQUEST_ID env",
+			name: "Repository PullRequestNumber. CI_MERGE_REQUEST_IID env",
 			flag: PullRequestNumberFlag,
 			env: Env{
-				key:   "CI_MERGE_REQUEST_ID",
+				key:   "CI_MERGE_REQUEST_IID",
 				value: "24",
 			},
 			want: []string{

diff --git a/internal/report/output/saas/saas.go b/internal/report/output/saas/saas.go
@@ -213,5 +213,6 @@ func getMeta(
 		BearerVersion:      build.Version,
 		FoundLanguages:     reportData.FoundLanguages,
 		GitlabPipelineId:   os.Getenv("CI_PIPELINE_ID"),
+		GitlabJobId:        os.Getenv("CI_JOB_ID"),
 	}, nil
 }
diff --git a/internal/report/output/saas/types/types.go b/internal/report/output/saas/types/types.go
@@ -23,6 +23,7 @@ type Meta struct {
 	BearerVersion      string           `json:"bearer_version,omitempty" yaml:"bearer_version,omitempty"`
 	FoundLanguages     map[string]int32 `json:"found_languages" yaml:"found_languages"`
 	GitlabPipelineId   string           `json:"gitlab_pipeline_id,omitempty" yaml:"gitlab_pipeline_id,omitempty"`
+	GitlabJobId        string           `json:"gitlab_job_id,omitempty" yaml:"gitlab_job_id,omitempty"`
 }
 
 type BearerReport struct {