Skip to content

Commit

Permalink
gitlab: remove build config URI.
Browse files Browse the repository at this point in the history
This was erroneously set to match the build signer URI.
This will eventually be pipeline_ref when it is populated (dependent on
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121597)

Signed-off-by: Billy Lynch <[email protected]>
  • Loading branch information
wlynch committed May 24, 2023
1 parent 7b4bef4 commit 59f1836
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion pkg/identity/gitlabcom/principal.go
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ func (p jobPrincipal) Embed(_ context.Context, cert *x509.Certificate) error {
SourceRepositoryIdentifier: p.repositoryID,
SourceRepositoryOwnerURI: baseURL.JoinPath(p.repositoryOwner).String(),
SourceRepositoryOwnerIdentifier: p.repositoryOwnerID,
BuildConfigURI: baseURL.JoinPath(p.repository, "/-/jobs/", p.jobID).String(),
BuildTrigger: p.eventName,
RunInvocationURI: baseURL.JoinPath(p.repository, "/-/pipelines/", p.pipelineID).String(),
}.Render()
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/grpc_server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1061,14 +1061,14 @@ func TestAPIWithGitLab(t *testing.T) {
}
url := "https://gitlab.com/"
expectedExts := map[int]string{
9: url + claims.ProjectPath + "/-/jobs/" + claims.JobID,
11: claims.RunnerEnvironment,
12: url + claims.ProjectPath,
13: claims.Sha,
14: fmt.Sprintf("refs/heads/%s", claims.Ref),
15: claims.ProjectID,
16: url + claims.NamespacePath,
17: claims.NamespaceID,
18: url + claims.ProjectPath + "/-/jobs/" + claims.JobID,
20: claims.PipelineSource,
21: url + claims.ProjectPath + "/-/pipelines/" + claims.PipelineID,
}
Expand Down

0 comments on commit 59f1836

Please sign in to comment.