diff --git a/pkg/attestation/crafter/runners/gitlabpipeline.go b/pkg/attestation/crafter/runners/gitlabpipeline.go index aecc23334..6ceaecaa8 100644 --- a/pkg/attestation/crafter/runners/gitlabpipeline.go +++ b/pkg/attestation/crafter/runners/gitlabpipeline.go @@ -68,7 +68,7 @@ func (r *GitlabPipeline) ListEnvVars() []*EnvVarDefinition { {"CI_JOB_URL", false}, {"CI_PIPELINE_URL", false}, {"CI_RUNNER_VERSION", false}, - {"CI_RUNNER_DESCRIPTION", false}, + {"CI_RUNNER_DESCRIPTION", true}, {"CI_COMMIT_REF_NAME", false}, } } diff --git a/pkg/attestation/crafter/runners/gitlabpipeline_test.go b/pkg/attestation/crafter/runners/gitlabpipeline_test.go index fc0c612cf..07e73e9d0 100644 --- a/pkg/attestation/crafter/runners/gitlabpipeline_test.go +++ b/pkg/attestation/crafter/runners/gitlabpipeline_test.go @@ -89,7 +89,7 @@ func (s *gitlabPipelineSuite) TestListEnvVars() { {"CI_JOB_URL", false}, {"CI_PIPELINE_URL", false}, {"CI_RUNNER_VERSION", false}, - {"CI_RUNNER_DESCRIPTION", false}, + {"CI_RUNNER_DESCRIPTION", true}, {"CI_COMMIT_REF_NAME", false}, }, s.runner.ListEnvVars()) } @@ -111,6 +111,26 @@ func (s *gitlabPipelineSuite) TestResolveEnvVars() { }, resolvedEnvVars) } +func (s *gitlabPipelineSuite) TestResolveEnvVarsWithoutRunnerDescription() { + s.T().Setenv("CI_RUNNER_DESCRIPTION", "") + + resolvedEnvVars, errors := s.runner.ResolveEnvVars() + s.Empty(errors, "Should not error when CI_RUNNER_DESCRIPTION is missing") + + expected := map[string]string{ + "GITLAB_USER_EMAIL": "foo@foo.com", + "GITLAB_USER_LOGIN": "foo", + "CI_PROJECT_URL": "https://gitlab.com/chainloop/chainloop", + "CI_COMMIT_SHA": "1234567890", + "CI_JOB_URL": "https://gitlab.com/chainloop/chainloop/-/jobs/123", + "CI_PIPELINE_URL": "https://gitlab.com/chainloop/chainloop/-/pipelines/123", + "CI_RUNNER_VERSION": "13.10.0", + "CI_COMMIT_REF_NAME": "main", + "CI_SERVER_URL": "https://gitlab.com", + } + s.Equal(expected, resolvedEnvVars) +} + func (s *gitlabPipelineSuite) TestRunURI() { s.Equal("https://gitlab.com/chainloop/chainloop/-/jobs/123", s.runner.RunURI()) }