From 59f1836bbd5dd6b7c257bacbc97a103ed5f94c51 Mon Sep 17 00:00:00 2001 From: Billy Lynch Date: Wed, 24 May 2023 14:32:04 -0400 Subject: [PATCH] gitlab: remove build config URI. 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 --- pkg/identity/gitlabcom/principal.go | 1 - pkg/server/grpc_server_test.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/identity/gitlabcom/principal.go b/pkg/identity/gitlabcom/principal.go index 9455f9b21..dbb8eb999 100644 --- a/pkg/identity/gitlabcom/principal.go +++ b/pkg/identity/gitlabcom/principal.go @@ -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() diff --git a/pkg/server/grpc_server_test.go b/pkg/server/grpc_server_test.go index 820172a54..854d87a4c 100644 --- a/pkg/server/grpc_server_test.go +++ b/pkg/server/grpc_server_test.go @@ -1061,6 +1061,7 @@ 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, @@ -1068,7 +1069,6 @@ func TestAPIWithGitLab(t *testing.T) { 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, }