Skip to content

Fix rbc command to accept project argument #1356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bhanurp merged 4 commits into from
Feb 26, 2025
Merged

Fix rbc command to accept project argument #1356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5bba178
Fix release-bundle-create is not working with projects
bhanurp Feb 24, 2025
2925400
Merge branch 'dev' into rbc-with-project
bhanurp Feb 24, 2025
58d6782
Refactored code to more appropriate function name
bhanurp Feb 26, 2025
e1484c0
Merge branch 'dev' into rbc-with-project
bhanurp Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions common/spec/specfiles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func CreateSpecFromFile(specFilePath string, specVars map[string]string) (spec *
return
}

func CreateSpecFromBuildNameAndNumber(buildName, buildNumber string) (*SpecFiles, error) {
func CreateSpecFromBuildNameNumberAndProject(buildName, buildNumber, projectKey string) (*SpecFiles, error) {
if buildName == "" || buildNumber == "" {
return nil, errorutils.CheckErrorf("build name and build number must be provided")
}
Expand All @@ -47,7 +47,8 @@ func CreateSpecFromBuildNameAndNumber(buildName, buildNumber string) (*SpecFiles
specFile := &SpecFiles{
Files: []File{
{
Build: buildString,
Build: buildString,
Project: projectKey,
},
},
}
Expand Down
16 changes: 12 additions & 4 deletions common/spec/specfiles_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,39 @@ import (

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

assert.NoError(t, err)
assert.NotNil(t, spec)
assert.Equal(t, "Common-builds/1.2.0", spec.Files[0].Build)
assert.Equal(t, "test", spec.Files[0].Project)
})

t.Run("Missing Build Name", func(t *testing.T) {
spec, err := CreateSpecFromBuildNameAndNumber("", "1.2.0")
spec, err := CreateSpecFromBuildNameNumberAndProject("", "1.2.0", "")

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

t.Run("Missing Project Name", func(t *testing.T) {
spec, err := CreateSpecFromBuildNameNumberAndProject("Common-builds", "1.2.0", "")

assert.NoError(t, err)
assert.Empty(t, spec.Files[0].Project)
})

t.Run("Missing Build Number", func(t *testing.T) {
spec, err := CreateSpecFromBuildNameAndNumber("Common-builds", "")
spec, err := CreateSpecFromBuildNameNumberAndProject("Common-builds", "", "")

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

t.Run("Empty Build Name and Build Number", func(t *testing.T) {
spec, err := CreateSpecFromBuildNameAndNumber("", "")
spec, err := CreateSpecFromBuildNameNumberAndProject("", "", "")

assert.Error(t, err)
assert.Nil(t, spec)
Expand Down