Skip to content

Commit ed9c733

Browse files
authored
fix: make some Azure pipeline env vars optional (#1896)
Signed-off-by: Jose I. Paris <jiparis@chainloop.dev>
1 parent 42ac721 commit ed9c733

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

pkg/attestation/crafter/runners/azurepipeline.go

+5-6
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,15 @@ func (r *AzurePipeline) CheckEnv() bool {
4646

4747
func (r *AzurePipeline) ListEnvVars() []*EnvVarDefinition {
4848
return []*EnvVarDefinition{
49-
{"BUILD_REQUESTEDFOREMAIL", false},
49+
{"BUILD_REQUESTEDFOREMAIL", true},
5050
{"BUILD_REQUESTEDFOR", false},
51-
{"BUILD_REPOSITORY_URI", false},
52-
{"BUILD_REPOSITORY_NAME", false},
51+
{"BUILD_REPOSITORY_URI", true},
52+
{"BUILD_REPOSITORY_NAME", true},
5353
{"BUILD_BUILDID", false},
5454
{"BUILD_BUILDNUMBER", false},
5555
{"BUILD_BUILDURI", false},
56-
{"BUILD_REASON", false},
57-
{"AGENT_VERSION", false},
58-
{"TF_BUILD", false},
56+
{"BUILD_REASON", true},
57+
{"TF_BUILD", true},
5958
}
6059
}
6160

pkg/attestation/crafter/runners/azurepipeline_test.go

+5-7
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,15 @@ func (s *azurePipelineSuite) TestCheckEnv() {
7979

8080
func (s *azurePipelineSuite) TestListEnvVars() {
8181
assert.Equal(s.T(), []*EnvVarDefinition{
82-
{"BUILD_REQUESTEDFOREMAIL", false},
82+
{"BUILD_REQUESTEDFOREMAIL", true},
8383
{"BUILD_REQUESTEDFOR", false},
84-
{"BUILD_REPOSITORY_URI", false},
85-
{"BUILD_REPOSITORY_NAME", false},
84+
{"BUILD_REPOSITORY_URI", true},
85+
{"BUILD_REPOSITORY_NAME", true},
8686
{"BUILD_BUILDID", false},
8787
{"BUILD_BUILDNUMBER", false},
8888
{"BUILD_BUILDURI", false},
89-
{"BUILD_REASON", false},
90-
{"AGENT_VERSION", false},
91-
{"TF_BUILD", false},
89+
{"BUILD_REASON", true},
90+
{"TF_BUILD", true},
9291
}, s.runner.ListEnvVars())
9392
}
9493

@@ -97,7 +96,6 @@ func (s *azurePipelineSuite) TestResolveEnvVars() {
9796
s.Empty(errors)
9897

9998
s.Equal(map[string]string{
100-
"AGENT_VERSION": "3.220.5",
10199
"BUILD_BUILDID": "6",
102100
"BUILD_BUILDNUMBER": "20230726.5",
103101
"BUILD_BUILDURI": "vstfs:///Build/Build/6",

0 commit comments

Comments
 (0)