Skip to content

Commit 9317a4b

Browse files
authored
Fix rbc command to accept project argument (#1356)
1 parent 131ae15 commit 9317a4b

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

common/spec/specfiles.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func CreateSpecFromFile(specFilePath string, specVars map[string]string) (spec *
3838
return
3939
}
4040

41-
func CreateSpecFromBuildNameAndNumber(buildName, buildNumber string) (*SpecFiles, error) {
41+
func CreateSpecFromBuildNameNumberAndProject(buildName, buildNumber, projectKey string) (*SpecFiles, error) {
4242
if buildName == "" || buildNumber == "" {
4343
return nil, errorutils.CheckErrorf("build name and build number must be provided")
4444
}
@@ -47,7 +47,8 @@ func CreateSpecFromBuildNameAndNumber(buildName, buildNumber string) (*SpecFiles
4747
specFile := &SpecFiles{
4848
Files: []File{
4949
{
50-
Build: buildString,
50+
Build: buildString,
51+
Project: projectKey,
5152
},
5253
},
5354
}

common/spec/specfiles_test.go

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,39 @@ import (
77

88
func TestCreateSpecFromBuildNameAndNumber(t *testing.T) {
99
t.Run("Valid Inputs", func(t *testing.T) {
10-
spec, err := CreateSpecFromBuildNameAndNumber("Common-builds", "1.2.0")
10+
spec, err := CreateSpecFromBuildNameNumberAndProject("Common-builds", "1.2.0", "test")
1111

1212
assert.NoError(t, err)
1313
assert.NotNil(t, spec)
1414
assert.Equal(t, "Common-builds/1.2.0", spec.Files[0].Build)
15+
assert.Equal(t, "test", spec.Files[0].Project)
1516
})
1617

1718
t.Run("Missing Build Name", func(t *testing.T) {
18-
spec, err := CreateSpecFromBuildNameAndNumber("", "1.2.0")
19+
spec, err := CreateSpecFromBuildNameNumberAndProject("", "1.2.0", "")
1920

2021
assert.Error(t, err)
2122
assert.Nil(t, spec)
2223
assert.EqualError(t, err, "build name and build number must be provided")
2324
})
2425

26+
t.Run("Missing Project Name", func(t *testing.T) {
27+
spec, err := CreateSpecFromBuildNameNumberAndProject("Common-builds", "1.2.0", "")
28+
29+
assert.NoError(t, err)
30+
assert.Empty(t, spec.Files[0].Project)
31+
})
32+
2533
t.Run("Missing Build Number", func(t *testing.T) {
26-
spec, err := CreateSpecFromBuildNameAndNumber("Common-builds", "")
34+
spec, err := CreateSpecFromBuildNameNumberAndProject("Common-builds", "", "")
2735

2836
assert.Error(t, err)
2937
assert.Nil(t, spec)
3038
assert.EqualError(t, err, "build name and build number must be provided")
3139
})
3240

3341
t.Run("Empty Build Name and Build Number", func(t *testing.T) {
34-
spec, err := CreateSpecFromBuildNameAndNumber("", "")
42+
spec, err := CreateSpecFromBuildNameNumberAndProject("", "", "")
3543

3644
assert.Error(t, err)
3745
assert.Nil(t, spec)

0 commit comments

Comments
 (0)