From 5bba17853798f5ed1967d1f73c306bea9578b373 Mon Sep 17 00:00:00 2001 From: Bhanu Reddy Date: Mon, 24 Feb 2025 16:42:44 +0530 Subject: [PATCH 1/2] Fix release-bundle-create is not working with projects --- common/spec/specfiles.go | 5 +++-- common/spec/specfiles_test.go | 16 ++++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/common/spec/specfiles.go b/common/spec/specfiles.go index c1e88880b..f656d073f 100644 --- a/common/spec/specfiles.go +++ b/common/spec/specfiles.go @@ -38,7 +38,7 @@ func CreateSpecFromFile(specFilePath string, specVars map[string]string) (spec * return } -func CreateSpecFromBuildNameAndNumber(buildName, buildNumber string) (*SpecFiles, error) { +func CreateSpecFromBuildNameAndNumber(buildName, buildNumber, projectKey string) (*SpecFiles, error) { if buildName == "" || buildNumber == "" { return nil, errorutils.CheckErrorf("build name and build number must be provided") } @@ -47,7 +47,8 @@ func CreateSpecFromBuildNameAndNumber(buildName, buildNumber string) (*SpecFiles specFile := &SpecFiles{ Files: []File{ { - Build: buildString, + Build: buildString, + Project: projectKey, }, }, } diff --git a/common/spec/specfiles_test.go b/common/spec/specfiles_test.go index d3f704611..a3db91570 100644 --- a/common/spec/specfiles_test.go +++ b/common/spec/specfiles_test.go @@ -7,23 +7,31 @@ import ( func TestCreateSpecFromBuildNameAndNumber(t *testing.T) { t.Run("Valid Inputs", func(t *testing.T) { - spec, err := CreateSpecFromBuildNameAndNumber("Common-builds", "1.2.0") + spec, err := CreateSpecFromBuildNameAndNumber("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 := CreateSpecFromBuildNameAndNumber("", "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 := CreateSpecFromBuildNameAndNumber("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 := CreateSpecFromBuildNameAndNumber("Common-builds", "", "") assert.Error(t, err) assert.Nil(t, spec) @@ -31,7 +39,7 @@ func TestCreateSpecFromBuildNameAndNumber(t *testing.T) { }) t.Run("Empty Build Name and Build Number", func(t *testing.T) { - spec, err := CreateSpecFromBuildNameAndNumber("", "") + spec, err := CreateSpecFromBuildNameAndNumber("", "", "") assert.Error(t, err) assert.Nil(t, spec) From 58d67821e48e81c33ec855dfba44676a81d67b96 Mon Sep 17 00:00:00 2001 From: Bhanu Reddy Date: Wed, 26 Feb 2025 11:11:29 +0530 Subject: [PATCH 2/2] Refactored code to more appropriate function name --- common/spec/specfiles.go | 2 +- common/spec/specfiles_test.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/spec/specfiles.go b/common/spec/specfiles.go index f656d073f..096010a45 100644 --- a/common/spec/specfiles.go +++ b/common/spec/specfiles.go @@ -38,7 +38,7 @@ func CreateSpecFromFile(specFilePath string, specVars map[string]string) (spec * return } -func CreateSpecFromBuildNameAndNumber(buildName, buildNumber, projectKey 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") } diff --git a/common/spec/specfiles_test.go b/common/spec/specfiles_test.go index a3db91570..9580df674 100644 --- a/common/spec/specfiles_test.go +++ b/common/spec/specfiles_test.go @@ -7,7 +7,7 @@ import ( func TestCreateSpecFromBuildNameAndNumber(t *testing.T) { t.Run("Valid Inputs", func(t *testing.T) { - spec, err := CreateSpecFromBuildNameAndNumber("Common-builds", "1.2.0", "test") + spec, err := CreateSpecFromBuildNameNumberAndProject("Common-builds", "1.2.0", "test") assert.NoError(t, err) assert.NotNil(t, spec) @@ -16,7 +16,7 @@ func TestCreateSpecFromBuildNameAndNumber(t *testing.T) { }) 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) @@ -24,14 +24,14 @@ func TestCreateSpecFromBuildNameAndNumber(t *testing.T) { }) t.Run("Missing Project Name", func(t *testing.T) { - spec, err := CreateSpecFromBuildNameAndNumber("Common-builds", "1.2.0", "") + 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) @@ -39,7 +39,7 @@ func TestCreateSpecFromBuildNameAndNumber(t *testing.T) { }) 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)