Skip to content

Commit

Permalink
Fixes semver range parsing for required packages
Browse files Browse the repository at this point in the history
Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
  • Loading branch information
m1kola committed Sep 20, 2023
1 parent affceb7 commit 60c02a1
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
10 changes: 5 additions & 5 deletions internal/catalogmetadata/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ type Channel struct {

type PackageRequired struct {
property.PackageRequired
SemverRange *bsemver.Range `json:"-"`
SemverRange bsemver.Range `json:"-"`
}

type Bundle struct {
Expand Down Expand Up @@ -98,17 +98,17 @@ func (b *Bundle) loadRequiredPackages() error {
if err != nil {
return fmt.Errorf("error determining bundle required packages for bundle %q: %s", b.Name, err)
}
for _, requiredPackage := range requiredPackages {
semverRange, err := bsemver.ParseRange(requiredPackage.VersionRange)
for i := range requiredPackages {
semverRange, err := bsemver.ParseRange(requiredPackages[i].VersionRange)
if err != nil {
return fmt.Errorf(
"error parsing bundle required package semver range for bundle %q (required package %q): %s",
b.Name,
requiredPackage.PackageName,
requiredPackages[i].PackageName,
err,
)
}
requiredPackage.SemverRange = &semverRange
requiredPackages[i].SemverRange = semverRange
}
b.requiredPackages = requiredPackages
}
Expand Down
10 changes: 10 additions & 0 deletions internal/catalogmetadata/types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,16 @@ func TestBundleRequiredPackages(t *testing.T) {
} {
t.Run(tt.name, func(t *testing.T) {
packages, err := tt.bundle.RequiredPackages()
assert.Len(t, packages, len(tt.wantRequiredPackages))
for i := range packages {
// SemverRange is a function which is not comparable
// so we just make sure that it is set.
assert.NotNil(t, packages[i].SemverRange)

// And then we set it to nil for ease of further comparisons
packages[i].SemverRange = nil
}

assert.Equal(t, tt.wantRequiredPackages, packages)
if tt.wantErr != "" {
assert.EqualError(t, err, tt.wantErr)
Expand Down

0 comments on commit 60c02a1

Please sign in to comment.