File tree Expand file tree Collapse file tree 2 files changed +15
-5
lines changed Expand file tree Collapse file tree 2 files changed +15
-5
lines changed Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ type Channel struct {
31
31
32
32
type PackageRequired struct {
33
33
property.PackageRequired
34
- SemverRange * bsemver.Range `json:"-"`
34
+ SemverRange bsemver.Range `json:"-"`
35
35
}
36
36
37
37
type Bundle struct {
@@ -98,17 +98,17 @@ func (b *Bundle) loadRequiredPackages() error {
98
98
if err != nil {
99
99
return fmt .Errorf ("error determining bundle required packages for bundle %q: %s" , b .Name , err )
100
100
}
101
- for _ , requiredPackage := range requiredPackages {
102
- semverRange , err := bsemver .ParseRange (requiredPackage .VersionRange )
101
+ for i := range requiredPackages {
102
+ semverRange , err := bsemver .ParseRange (requiredPackages [ i ] .VersionRange )
103
103
if err != nil {
104
104
return fmt .Errorf (
105
105
"error parsing bundle required package semver range for bundle %q (required package %q): %s" ,
106
106
b .Name ,
107
- requiredPackage .PackageName ,
107
+ requiredPackages [ i ] .PackageName ,
108
108
err ,
109
109
)
110
110
}
111
- requiredPackage .SemverRange = & semverRange
111
+ requiredPackages [ i ] .SemverRange = semverRange
112
112
}
113
113
b .requiredPackages = requiredPackages
114
114
}
Original file line number Diff line number Diff line change @@ -123,6 +123,16 @@ func TestBundleRequiredPackages(t *testing.T) {
123
123
} {
124
124
t .Run (tt .name , func (t * testing.T ) {
125
125
packages , err := tt .bundle .RequiredPackages ()
126
+ assert .Len (t , packages , len (tt .wantRequiredPackages ))
127
+ for i := range packages {
128
+ // SemverRange is a function which is not comparable
129
+ // so we just make sure that it is set.
130
+ assert .NotNil (t , packages [i ].SemverRange )
131
+
132
+ // And then we set it to nil for ease of further comparisons
133
+ packages [i ].SemverRange = nil
134
+ }
135
+
126
136
assert .Equal (t , tt .wantRequiredPackages , packages )
127
137
if tt .wantErr != "" {
128
138
assert .EqualError (t , err , tt .wantErr )
You can’t perform that action at this time.
0 commit comments