fix(repo-info): preserve full CI-detected repo path in repo_info.name (#1017)

FayeSGW · claude · web-flow · commit 6de291f2075d · 2026-07-14T09:42:28.000+01:00
* fix(repo-info): preserve full CI-detected repo path in repo_info.name

The --repository flag defaults to a short repo name in some CIs
(GitLab's CI_PROJECT_NAME, Bitbucket's slug) while getGitRepoInfoFrom*
detects the full path (GitLab's CI_PROJECT_PATH). Because
mergeGitRepoInfo always applied the flag value, the short default
clobbered the full CI-detected name, so repo_info.name lost its
namespace (e.g. "creator" instead of "cyber-dojo/creator").

Only override the CI-detected name when --repository is set explicitly
(or when no CI name was detected), threading repoNameExplicit through
the attest/begin-trail commands. The GitLab API ProjectID path is
untouched. Also fixes the same latent issue for Bitbucket.

Co-Authored-By: Claude Opus 4.8 (1M context) &lt;noreply@anthropic.com&gt;

* test(repo-info): add wiring regression test and clarify GitLab PR comment

Add RepoInfoWiringTestSuite covering the three run() paths that build
repo_info (attest generic, begin trail, attest artifact): the CI-detected
full-path name is used by default and an explicit --repository overrides
it. A mutation (removing a repoNameExplicit assignment) fails the
explicit cases, so the suite guards the command wiring.

Also add a mergeGitRepoInfo unit case for a fully-populated base with no
flags, and a comment on attestPRGitlab clarifying that GitlabConfig.
Repository (short, for the API ProjectID) is separate from repo_info.name
(full CI_PROJECT_PATH).

Co-Authored-By: Claude Opus 4.8 (1M context) &lt;noreply@anthropic.com&gt;

* Remove stray committed file

---------

Co-authored-by: Claude Opus 4.8 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/cmd/kosli/attestArtifact.go b/cmd/kosli/attestArtifact.go
@@ -27,6 +27,7 @@ type attestArtifactOptions struct {
 	repoName             string
 	repoURL              string
 	repoProvider         string
+	repoNameExplicit     bool
 }
 
 type AttestArtifactPayload struct {
@@ -133,6 +134,7 @@ func newAttestArtifactCmd(out io.Writer) *cobra.Command {
 			return ValidateRegistryFlags(cmd, o.fingerprintOptions)
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
+			o.repoNameExplicit = cmd.Flags().Changed("repository")
 			return o.run(args)
 		},
 	}
@@ -210,7 +212,7 @@ func (o *attestArtifactOptions) run(args []string) error {
 	if err != nil {
 		logger.Warn("failed to get git repo info. %s", err.Error())
 	}
-	o.payload.GitRepoInfo = mergeGitRepoInfo(o.payload.GitRepoInfo, o.repoID, o.repoName, o.repoURL, o.repoProvider)
+	o.payload.GitRepoInfo = mergeGitRepoInfo(o.payload.GitRepoInfo, o.repoID, o.repoName, o.repoURL, o.repoProvider, o.repoNameExplicit)
 	o.payload.GitCommit = commitInfo.Sha1
 	o.payload.GitCommitInfo = &commitInfo.BasicCommitInfo
 
diff --git a/cmd/kosli/attestCustom.go b/cmd/kosli/attestCustom.go
@@ -136,6 +136,7 @@ func newAttestCustomCmd(out io.Writer) *cobra.Command {
 
 		RunE: func(cmd *cobra.Command, args []string) error {
 			o.repoURLExplicit = cmd.Flags().Changed("repo-url")
+			o.repoNameExplicit = cmd.Flags().Changed("repository")
 			return o.run(args)
 		},
 	}
diff --git a/cmd/kosli/attestDecision.go b/cmd/kosli/attestDecision.go
@@ -132,6 +132,7 @@ func newAttestDecisionCmd(out io.Writer) *cobra.Command {
 
 		RunE: func(cmd *cobra.Command, args []string) error {
 			o.repoURLExplicit = cmd.Flags().Changed("repo-url")
+			o.repoNameExplicit = cmd.Flags().Changed("repository")
 			return o.run(args)
 		},
 	}
diff --git a/cmd/kosli/attestGeneric.go b/cmd/kosli/attestGeneric.go
@@ -130,6 +130,7 @@ func newAttestGenericCmd(out io.Writer) *cobra.Command {
 
 		RunE: func(cmd *cobra.Command, args []string) error {
 			o.repoURLExplicit = cmd.Flags().Changed("repo-url")
+			o.repoNameExplicit = cmd.Flags().Changed("repository")
 			return o.run(args)
 		},
 	}
diff --git a/cmd/kosli/attestJira.go b/cmd/kosli/attestJira.go
@@ -246,6 +246,7 @@ func newAttestJiraCmd(out io.Writer) *cobra.Command {
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			o.repoURLExplicit = cmd.Flags().Changed("repo-url")
+			o.repoNameExplicit = cmd.Flags().Changed("repository")
 			return o.run(args)
 		},
 	}
diff --git a/cmd/kosli/attestJunit.go b/cmd/kosli/attestJunit.go
@@ -134,6 +134,7 @@ func newAttestJunitCmd(out io.Writer) *cobra.Command {
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			o.repoURLExplicit = cmd.Flags().Changed("repo-url")
+			o.repoNameExplicit = cmd.Flags().Changed("repository")
 			return o.run(args)
 		},
 	}
diff --git a/cmd/kosli/attestOverride.go b/cmd/kosli/attestOverride.go
@@ -104,6 +104,7 @@ func newAttestOverrideCmd(out io.Writer) *cobra.Command {
 
 		RunE: func(cmd *cobra.Command, args []string) error {
 			o.repoURLExplicit = cmd.Flags().Changed("repo-url")
+			o.repoNameExplicit = cmd.Flags().Changed("repository")
 			return o.run(args)
 		},
 	}
diff --git a/cmd/kosli/attestPRAzure.go b/cmd/kosli/attestPRAzure.go
@@ -147,6 +147,7 @@ func newAttestAzurePRCmd(out io.Writer) *cobra.Command {
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			o.repoURLExplicit = cmd.Flags().Changed("repo-url")
+			o.repoNameExplicit = cmd.Flags().Changed("repository")
 			o.retriever = azUtils.NewAzureConfig(azureFlagsValues.Token,
 				azureFlagsValues.OrgUrl, azureFlagsValues.Project, o.repoName)
 			return o.run(args)
diff --git a/cmd/kosli/attestPRBitbucket.go b/cmd/kosli/attestPRBitbucket.go
@@ -167,6 +167,7 @@ func newAttestBitbucketPRCmd(out io.Writer) *cobra.Command {
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			o.repoURLExplicit = cmd.Flags().Changed("repo-url")
+			o.repoNameExplicit = cmd.Flags().Changed("repository")
 			o.getRetriever().(*bbUtils.Config).Repository = o.repoName
 			return o.run(args)
 		},
diff --git a/cmd/kosli/attestPRGithub.go b/cmd/kosli/attestPRGithub.go
@@ -142,6 +142,7 @@ func newAttestGithubPRCmd(out io.Writer) *cobra.Command {
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			o.repoURLExplicit = cmd.Flags().Changed("repo-url")
+			o.repoNameExplicit = cmd.Flags().Changed("repository")
 			o.retriever = ghUtils.NewGithubRetrieverFunc(githubFlagsValues.Token, githubFlagsValues.BaseURL,
 				githubFlagsValues.Org, o.repoName, global.Debug)
 			return o.run(args)
diff --git a/cmd/kosli/attestPRGitlab.go b/cmd/kosli/attestPRGitlab.go
@@ -142,6 +142,10 @@ func newAttestGitlabPRCmd(out io.Writer) *cobra.Command {
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			o.repoURLExplicit = cmd.Flags().Changed("repo-url")
+			o.repoNameExplicit = cmd.Flags().Changed("repository")
+			// GitlabConfig.Repository is the short project name (CI_PROJECT_NAME);
+			// combined with Org (CI_PROJECT_NAMESPACE) it forms the API ProjectID.
+			// This is separate from repo_info.name, which uses the full CI_PROJECT_PATH.
 			o.getRetriever().(*gitlabUtils.GitlabConfig).Repository = o.repoName
 			return o.run(args)
 		},
diff --git a/cmd/kosli/attestSnyk.go b/cmd/kosli/attestSnyk.go
@@ -146,6 +146,7 @@ func newAttestSnykCmd(out io.Writer) *cobra.Command {
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			o.repoURLExplicit = cmd.Flags().Changed("repo-url")
+			o.repoNameExplicit = cmd.Flags().Changed("repository")
 			return o.run(args)
 		},
 	}
diff --git a/cmd/kosli/attestSonar.go b/cmd/kosli/attestSonar.go
@@ -186,6 +186,7 @@ func newAttestSonarCmd(out io.Writer) *cobra.Command {
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			o.repoURLExplicit = cmd.Flags().Changed("repo-url")
+			o.repoNameExplicit = cmd.Flags().Changed("repository")
 			return o.run(args)
 		},
 	}
diff --git a/cmd/kosli/attestation.go b/cmd/kosli/attestation.go
@@ -55,6 +55,7 @@ type CommonAttestationOptions struct {
 	repoURL                 string
 	repoProvider            string
 	repoURLExplicit         bool
+	repoNameExplicit        bool
 }
 
 func (o *CommonAttestationOptions) run(args []string, payload *CommonAttestationPayload) error {
@@ -98,7 +99,7 @@ func (o *CommonAttestationOptions) run(args []string, payload *CommonAttestation
 	if err := validateRepoFlags(o.repoURL, o.repoProvider, o.repoURLExplicit); err != nil {
 		return err
 	}
-	payload.GitRepoInfo = mergeGitRepoInfo(payload.GitRepoInfo, o.repoID, o.repoName, o.repoURL, o.repoProvider)
+	payload.GitRepoInfo = mergeGitRepoInfo(payload.GitRepoInfo, o.repoID, o.repoName, o.repoURL, o.repoProvider, o.repoNameExplicit)
 
 	payload.UserData, err = LoadJsonData(o.userDataFilePath)
 	if err != nil {
@@ -119,14 +120,18 @@ func (o *CommonAttestationOptions) run(args []string, payload *CommonAttestation
 // mergeGitRepoInfo applies flag overrides onto base (which may be nil) and
 // returns nil if ID, Name, or URL is still empty after merging, so that the
 // field is omitted from the JSON payload.
-func mergeGitRepoInfo(base *gitview.GitRepoInfo, repoID, repoName, repoURL, repoProvider string) *gitview.GitRepoInfo {
+//
+// --repository only overrides the CI-detected name when set explicitly (or when
+// base has none), so its short default doesn't clobber the fuller CI value
+// (e.g. GitLab's CI_PROJECT_PATH).
+func mergeGitRepoInfo(base *gitview.GitRepoInfo, repoID, repoName, repoURL, repoProvider string, repoNameExplicit bool) *gitview.GitRepoInfo {
 	if base == nil {
 		base = &gitview.GitRepoInfo{}
 	}
 	if repoID != "" {
 		base.ID = repoID
 	}
-	if repoName != "" {
+	if repoName != "" && (repoNameExplicit || base.Name == "") {
 		base.Name = repoName
 	}
 	if repoURL != "" {
diff --git a/cmd/kosli/attestation_test.go b/cmd/kosli/attestation_test.go
@@ -9,17 +9,18 @@ import (
 
 func TestMergeGitRepoInfo(t *testing.T) {
 	tests := []struct {
-		name         string
-		base         *gitview.GitRepoInfo
-		repoID       string
-		repoName     string
-		repoURL      string
-		repoProvider string
-		wantNil      bool
-		wantID       string
-		wantName     string
-		wantURL      string
-		wantProvider string
+		name             string
+		base             *gitview.GitRepoInfo
+		repoID           string
+		repoName         string
+		repoURL          string
+		repoProvider     string
+		repoNameExplicit bool
+		wantNil          bool
+		wantID           string
+		wantName         string
+		wantURL          string
+		wantProvider     string
 	}{
 		{
 			name:    "nil when both ID and Name are empty",
@@ -64,14 +65,59 @@ func TestMergeGitRepoInfo(t *testing.T) {
 			wantProvider: "github",
 		},
 		{
-			name:     "flag values override base values",
-			base:     &gitview.GitRepoInfo{ID: "base-id", Name: "base-name", URL: "https://base.example.com"},
-			repoID:   "override-id",
-			repoName: "override-name",
-			wantNil:  false,
-			wantID:   "override-id",
-			wantName: "override-name",
-			wantURL:  "https://base.example.com",
+			name:             "explicit flag values override base values",
+			base:             &gitview.GitRepoInfo{ID: "base-id", Name: "base-name", URL: "https://base.example.com"},
+			repoID:           "override-id",
+			repoName:         "override-name",
+			repoNameExplicit: true,
+			wantNil:          false,
+			wantID:           "override-id",
+			wantName:         "override-name",
+			wantURL:          "https://base.example.com",
+		},
+		{
+			name:         "fully-populated base is returned unchanged when no flags are passed",
+			base:         &gitview.GitRepoInfo{ID: "53419335", Name: "cyber-dojo/creator", URL: "https://gitlab.com/cyber-dojo/creator", Provider: "gitlab"},
+			wantNil:      false,
+			wantID:       "53419335",
+			wantName:     "cyber-dojo/creator",
+			wantURL:      "https://gitlab.com/cyber-dojo/creator",
+			wantProvider: "gitlab",
+		},
+		{
+			name:             "CI-detected full-path name is preserved when --repository is not set explicitly",
+			base:             &gitview.GitRepoInfo{ID: "53419335", Name: "cyber-dojo/creator", URL: "https://gitlab.com/cyber-dojo/creator"},
+			repoID:           "53419335",
+			repoName:         "creator", // short CI default from --repository (e.g. GitLab's CI_PROJECT_NAME)
+			repoURL:          "https://gitlab.com/cyber-dojo/creator",
+			repoNameExplicit: false,
+			wantNil:          false,
+			wantID:           "53419335",
+			wantName:         "cyber-dojo/creator", // full CI_PROJECT_PATH preserved
+			wantURL:          "https://gitlab.com/cyber-dojo/creator",
+		},
+		{
+			name:             "explicit --repository overrides CI-detected full-path name",
+			base:             &gitview.GitRepoInfo{ID: "53419335", Name: "cyber-dojo/creator", URL: "https://gitlab.com/cyber-dojo/creator"},
+			repoID:           "53419335",
+			repoName:         "my/custom-name",
+			repoURL:          "https://gitlab.com/cyber-dojo/creator",
+			repoNameExplicit: true,
+			wantNil:          false,
+			wantID:           "53419335",
+			wantName:         "my/custom-name",
+			wantURL:          "https://gitlab.com/cyber-dojo/creator",
+		},
+		{
+			name:             "flag name applied when base has no name even if not explicit",
+			repoID:           "flag-id",
+			repoName:         "flag-name",
+			repoURL:          "https://github.com/org/repo",
+			repoNameExplicit: false,
+			wantNil:          false,
+			wantID:           "flag-id",
+			wantName:         "flag-name",
+			wantURL:          "https://github.com/org/repo",
 		},
 		{
 			name:    "nil when base has ID but no Name and no flags",
@@ -103,7 +149,7 @@ func TestMergeGitRepoInfo(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			result := mergeGitRepoInfo(tt.base, tt.repoID, tt.repoName, tt.repoURL, tt.repoProvider)
+			result := mergeGitRepoInfo(tt.base, tt.repoID, tt.repoName, tt.repoURL, tt.repoProvider, tt.repoNameExplicit)
 			if tt.wantNil {
 				assert.Nil(t, result)
 				return
diff --git a/cmd/kosli/beginTrail.go b/cmd/kosli/beginTrail.go
@@ -49,6 +49,7 @@ type beginTrailOptions struct {
 	repoName             string
 	repoURL              string
 	repoProvider         string
+	repoNameExplicit     bool
 }
 
 type TrailPayload struct {
@@ -83,6 +84,7 @@ func newBeginTrailCmd(out io.Writer) *cobra.Command {
 			return validateRepoFlags(o.repoURL, o.repoProvider, cmd.Flags().Changed("repo-url"))
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
+			o.repoNameExplicit = cmd.Flags().Changed("repository")
 			return o.run(args)
 		},
 	}
@@ -141,7 +143,7 @@ func (o *beginTrailOptions) run(args []string) error {
 	if err != nil {
 		logger.Warn("failed to get git repo info. %s", err.Error())
 	}
-	o.payload.GitRepoInfo = mergeGitRepoInfo(base, o.repoID, o.repoName, o.repoURL, o.repoProvider)
+	o.payload.GitRepoInfo = mergeGitRepoInfo(base, o.repoID, o.repoName, o.repoURL, o.repoProvider, o.repoNameExplicit)
 
 	// process external urls
 	o.payload.ExternalURLs, err = processExternalURLs(o.externalURLs, o.externalFingerprints)
diff --git a/cmd/kosli/repoInfoWiring_test.go b/cmd/kosli/repoInfoWiring_test.go

Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,7 @@ func newAttestCustomCmd(out io.Writer) *cobra.Command {`
`136`	`136`
`137`	`137`	`RunE: func(cmd *cobra.Command, args []string) error {`
`138`	`138`	`o.repoURLExplicit = cmd.Flags().Changed("repo-url")`
	`139`	`+ o.repoNameExplicit = cmd.Flags().Changed("repository")`
`139`	`140`	`return o.run(args)`
`140`	`141`	`},`
`141`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,7 @@ func newAttestDecisionCmd(out io.Writer) *cobra.Command {`
`132`	`132`
`133`	`133`	`RunE: func(cmd *cobra.Command, args []string) error {`
`134`	`134`	`o.repoURLExplicit = cmd.Flags().Changed("repo-url")`
	`135`	`+ o.repoNameExplicit = cmd.Flags().Changed("repository")`
`135`	`136`	`return o.run(args)`
`136`	`137`	`},`
`137`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,7 @@ func newAttestGenericCmd(out io.Writer) *cobra.Command {`
`130`	`130`
`131`	`131`	`RunE: func(cmd *cobra.Command, args []string) error {`
`132`	`132`	`o.repoURLExplicit = cmd.Flags().Changed("repo-url")`
	`133`	`+ o.repoNameExplicit = cmd.Flags().Changed("repository")`
`133`	`134`	`return o.run(args)`
`134`	`135`	`},`
`135`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -246,6 +246,7 @@ func newAttestJiraCmd(out io.Writer) *cobra.Command {`
`246`	`246`	`},`
`247`	`247`	`RunE: func(cmd *cobra.Command, args []string) error {`
`248`	`248`	`o.repoURLExplicit = cmd.Flags().Changed("repo-url")`
	`249`	`+ o.repoNameExplicit = cmd.Flags().Changed("repository")`
`249`	`250`	`return o.run(args)`
`250`	`251`	`},`
`251`	`252`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,7 @@ func newAttestJunitCmd(out io.Writer) *cobra.Command {`
`134`	`134`	`},`
`135`	`135`	`RunE: func(cmd *cobra.Command, args []string) error {`
`136`	`136`	`o.repoURLExplicit = cmd.Flags().Changed("repo-url")`
	`137`	`+ o.repoNameExplicit = cmd.Flags().Changed("repository")`
`137`	`138`	`return o.run(args)`
`138`	`139`	`},`
`139`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,7 @@ func newAttestOverrideCmd(out io.Writer) *cobra.Command {`
`104`	`104`
`105`	`105`	`RunE: func(cmd *cobra.Command, args []string) error {`
`106`	`106`	`o.repoURLExplicit = cmd.Flags().Changed("repo-url")`
	`107`	`+ o.repoNameExplicit = cmd.Flags().Changed("repository")`
`107`	`108`	`return o.run(args)`
`108`	`109`	`},`
`109`	`110`	`}`