Skip to content

Commit db6661f

Browse files
committed
feat: Azure Devops Pipeline support - use AZURE_PIPELINE instead of AZURE_DEVOPS_PIPELINE
Signed-off-by: Daniel Liszka <daniel@chainloop.dev>
1 parent 856e8ab commit db6661f

File tree

7 files changed

+77
-77
lines changed

7 files changed

+77
-77
lines changed

app/cli/internal/action/workflow_run_list.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ func humanizedRunnerType(in v1.CraftingSchema_Runner_RunnerType) string {
115115
return "GitHub"
116116
case *v1.CraftingSchema_Runner_GITLAB_PIPELINE.Enum():
117117
return "GitLab"
118-
case *v1.CraftingSchema_Runner_AZURE_DEVOPS_PIPELINE.Enum():
119-
return "Azure DevOps Pipeline"
118+
case *v1.CraftingSchema_Runner_AZURE_PIPELINE.Enum():
119+
return "Azure Pipeline"
120120
default:
121121
return "Unspecified"
122122
}

app/controlplane/api/gen/frontend/workflowcontract/v1/crafting_schema.ts

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/controlplane/api/workflowcontract/v1/crafting_schema.pb.go

Lines changed: 44 additions & 44 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/controlplane/api/workflowcontract/v1/crafting_schema.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ message CraftingSchema {
3737
RUNNER_TYPE_UNSPECIFIED = 0;
3838
GITHUB_ACTION = 1;
3939
GITLAB_PIPELINE = 2;
40-
AZURE_DEVOPS_PIPELINE = 3;
40+
AZURE_PIPELINE = 3;
4141
}
4242
}
4343

internal/attestation/crafter/runner.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ func NewRunner(t schemaapi.CraftingSchema_Runner_RunnerType) supportedRunner {
4242
return &runners.GitHubAction{}
4343
case schemaapi.CraftingSchema_Runner_GITLAB_PIPELINE:
4444
return &runners.GitlabPipeline{}
45-
case schemaapi.CraftingSchema_Runner_AZURE_DEVOPS_PIPELINE:
46-
return &runners.AzureDevopsPipeline{}
45+
case schemaapi.CraftingSchema_Runner_AZURE_PIPELINE:
46+
return &runners.AzurePipeline{}
4747
default:
4848
return &runners.Generic{}
4949
}

internal/attestation/crafter/runners/azuredevopspipeline.go renamed to internal/attestation/crafter/runners/azurepipeline.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ import (
2121
"path"
2222
)
2323

24-
type AzureDevopsPipeline struct{}
24+
type AzurePipeline struct{}
2525

26-
const AzureDevopsPipelineID = "azure-devops-pipeline"
26+
const AzurePipelineID = "azure-pipeline"
2727

28-
func NewAzureDevopsPipeline() *AzureDevopsPipeline {
29-
return &AzureDevopsPipeline{}
28+
func NewAzurePipeline() *AzurePipeline {
29+
return &AzurePipeline{}
3030
}
3131

32-
// Figure out if we are in a AzureDevops Pipeline job or not
33-
func (r *AzureDevopsPipeline) CheckEnv() bool {
32+
// Figure out if we are in a Azure Pipeline job or not
33+
func (r *AzurePipeline) CheckEnv() bool {
3434
for _, varName := range []string{"TF_BUILD", "BUILD_BUILDURI"} {
3535
if os.Getenv(varName) == "" {
3636
return false
@@ -40,7 +40,7 @@ func (r *AzureDevopsPipeline) CheckEnv() bool {
4040
return true
4141
}
4242

43-
func (r *AzureDevopsPipeline) ListEnvVars() []string {
43+
func (r *AzurePipeline) ListEnvVars() []string {
4444
return []string{
4545
"BUILD_REQUESTEDFOREMAIL",
4646
"BUILD_REQUESTEDFOR",
@@ -55,15 +55,15 @@ func (r *AzureDevopsPipeline) ListEnvVars() []string {
5555
}
5656
}
5757

58-
func (r *AzureDevopsPipeline) ResolveEnvVars() map[string]string {
58+
func (r *AzurePipeline) ResolveEnvVars() map[string]string {
5959
return resolveEnvVars(r.ListEnvVars())
6060
}
6161

62-
func (r *AzureDevopsPipeline) String() string {
63-
return AzureDevopsPipelineID
62+
func (r *AzurePipeline) String() string {
63+
return AzurePipelineID
6464
}
6565

66-
func (r *AzureDevopsPipeline) RunURI() (url string) {
66+
func (r *AzurePipeline) RunURI() (url string) {
6767
teamFoundationServerURI := os.Getenv("SYSTEM_TEAMFOUNDATIONSERVERURI")
6868
definitionName := os.Getenv("SYSTEM_DEFINITIONNAME")
6969
buildID := os.Getenv("BUILD_BUILDID")

internal/attestation/crafter/runners/azuredevopspipeline_test.go renamed to internal/attestation/crafter/runners/azurepipeline_test.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ import (
2323
"github.com/stretchr/testify/suite"
2424
)
2525

26-
type azureDevopsPipelineSuite struct {
26+
type azurePipelineSuite struct {
2727
suite.Suite
28-
runner *AzureDevopsPipeline
28+
runner *AzurePipeline
2929
}
3030

31-
func (s *azureDevopsPipelineSuite) TestCheckEnv() {
31+
func (s *azurePipelineSuite) TestCheckEnv() {
3232
testCases := []struct {
3333
name string
3434
env map[string]string
@@ -77,7 +77,7 @@ func (s *azureDevopsPipelineSuite) TestCheckEnv() {
7777
}
7878
}
7979

80-
func (s *azureDevopsPipelineSuite) TestListEnvVars() {
80+
func (s *azurePipelineSuite) TestListEnvVars() {
8181
assert.Equal(s.T(), []string{
8282
"BUILD_REQUESTEDFOREMAIL",
8383
"BUILD_REQUESTEDFOR",
@@ -92,7 +92,7 @@ func (s *azureDevopsPipelineSuite) TestListEnvVars() {
9292
}, s.runner.ListEnvVars())
9393
}
9494

95-
func (s *azureDevopsPipelineSuite) TestResolveEnvVars() {
95+
func (s *azurePipelineSuite) TestResolveEnvVars() {
9696
s.Equal(map[string]string{
9797
"AGENT_VERSION": "3.220.5",
9898
"BUILD_BUILDID": "6",
@@ -107,17 +107,17 @@ func (s *azureDevopsPipelineSuite) TestResolveEnvVars() {
107107
}, s.runner.ResolveEnvVars())
108108
}
109109

110-
func (s *azureDevopsPipelineSuite) TestRunURI() {
110+
func (s *azurePipelineSuite) TestRunURI() {
111111
s.Equal("https://dev.azure.com/chainloop-test/chainloop-tests/_build/results?buildId=6&j=12f1170f-0000-0000-20dd-22fc7dff55f9&view=logs", s.runner.RunURI())
112112
}
113113

114-
func (s *azureDevopsPipelineSuite) TestRunnerName() {
115-
s.Equal("azure-devops-pipeline", s.runner.String())
114+
func (s *azurePipelineSuite) TestRunnerName() {
115+
s.Equal("azure-pipeline", s.runner.String())
116116
}
117117

118118
// Run before each test
119-
func (s *azureDevopsPipelineSuite) SetupTest() {
120-
s.runner = NewAzureDevopsPipeline()
119+
func (s *azurePipelineSuite) SetupTest() {
120+
s.runner = NewAzurePipeline()
121121
t := s.T()
122122
t.Setenv("TF_BUILD", "True")
123123
t.Setenv("BUILD_REPOSITORY_ID", "5e5bf8eb-0000-0000-801b-0a5bc4b4011a")
@@ -147,6 +147,6 @@ func (s *azureDevopsPipelineSuite) SetupTest() {
147147
}
148148

149149
// Run the tests
150-
func TestAzureDevopsPipelineRunner(t *testing.T) {
151-
suite.Run(t, new(azureDevopsPipelineSuite))
150+
func TestAzurePipelineRunner(t *testing.T) {
151+
suite.Run(t, new(azurePipelineSuite))
152152
}

0 commit comments

Comments
 (0)