From b7483c6a2febd27b0e0f96e9b0d34bd793015a55 Mon Sep 17 00:00:00 2001 From: Jeroen Knoops Date: Mon, 5 Dec 2022 10:06:55 +0100 Subject: [PATCH] Remove job part in entrypoint. Only keep action_path, which is unique Signed-off-by: Jeroen Knoops --- pkg/github/provenance.go | 2 +- pkg/github/provenance_test.go | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/github/provenance.go b/pkg/github/provenance.go index cc5384bb..4357864c 100644 --- a/pkg/github/provenance.go +++ b/pkg/github/provenance.go @@ -37,7 +37,7 @@ func (e *Environment) GenerateProvenanceStatement(ctx context.Context, subjecter // See https://github.com/github/feedback/discussions/4188 intoto.WithInvocation( BuildType, - fmt.Sprintf("%s:%s", e.Context.ActionPath, e.Context.Job), + e.Context.ActionPath, nil, event.Inputs, []intoto.Item{ diff --git a/pkg/github/provenance_test.go b/pkg/github/provenance_test.go index 5e370358..cc355d09 100644 --- a/pkg/github/provenance_test.go +++ b/pkg/github/provenance_test.go @@ -242,7 +242,6 @@ func TestGenerateProvenance(t *testing.T) { Event: []byte(pushGitHubEvent), EventName: "push", ActionPath: ".github/workflows/build.yml", - Job: "job-context", SHA: "849fb987efc0c0fc72e26a38f63f0c00225132be", } materials := []intoto.Item{ @@ -302,7 +301,6 @@ func TestGenerateProvenanceFromGitHubRelease(t *testing.T) { Event: []byte(pushGitHubEvent), EventName: "push", ActionPath: ".github/workflows/build.yml", - Job: "job-context", SHA: "849fb987efc0c0fc72e26a38f63f0c00225132be", } materials := []intoto.Item{ @@ -406,7 +404,7 @@ func TestGenerateProvenanceFromGitHubReleaseErrors(t *testing.T) { } func assertInvocation(assert *assert.Assertions, recipe intoto.Invocation) { - assert.Equal(".github/workflows/build.yml:job-context", recipe.ConfigSource.EntryPoint) + assert.Equal(".github/workflows/build.yml", recipe.ConfigSource.EntryPoint) assert.Nil(recipe.Environment) assert.Nil(recipe.Parameters) }