Skip to content

Commit d9ff241

Browse files
awgreeneawgreene
committed
Update semver import and update SSA
1 parent 4e0b45e commit d9ff241

20 files changed

+60
-70
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/operator-framework/operator-lifecycle-manager
33
go 1.13
44

55
require (
6-
github.com/blang/semver v3.5.1+incompatible
6+
github.com/blang/semver/v4 v4.0.0
77
github.com/bshuster-repo/logrus-logstash-hook v1.0.0 // indirect
88
github.com/coreos/go-semver v0.3.0
99
github.com/davecgh/go-spew v1.1.1

‎pkg/controller/registry/resolver/cache.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"sync"
99
"time"
1010

11-
"github.com/blang/semver"
11+
"github.com/blang/semver/v4"
1212
"github.com/sirupsen/logrus"
1313

1414
"github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/listers/operators/v1alpha1"

‎pkg/controller/registry/resolver/operators.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"sort"
88
"strings"
99

10-
"github.com/blang/semver"
10+
"github.com/blang/semver/v4"
1111
"k8s.io/apimachinery/pkg/runtime/schema"
1212

1313
"github.com/operator-framework/api/pkg/operators/v1alpha1"

‎pkg/controller/registry/resolver/operators_test.go

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry"
88

9-
"github.com/blang/semver"
9+
"github.com/blang/semver/v4"
1010
"github.com/stretchr/testify/require"
1111
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
1212
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -1029,23 +1029,23 @@ func TestNewOperatorFromBundle(t *testing.T) {
10291029
ChannelName: "testChannel",
10301030
Version: version.String(),
10311031
BundlePath: "image",
1032-
Properties: []*api.Property{
1032+
Properties: []*api.Property{
10331033
{
1034-
Type: "olm.gvk",
1034+
Type: "olm.gvk",
10351035
Value: "{\"group\":\"crd.group.com\",\"kind\":\"OwnedCRD\",\"version\":\"v1\"}",
10361036
},
10371037
{
1038-
Type: "olm.gvk",
1038+
Type: "olm.gvk",
10391039
Value: "{\"group\":\"apis.group.com\",\"kind\":\"OwnedAPI\",\"version\":\"v1\"}",
10401040
},
10411041
},
10421042
Dependencies: []*api.Dependency{
10431043
{
1044-
Type: "olm.gvk",
1044+
Type: "olm.gvk",
10451045
Value: "{\"group\":\"crd.group.com\",\"kind\":\"RequiredCRD\",\"version\":\"v1\"}",
10461046
},
10471047
{
1048-
Type: "olm.gvk",
1048+
Type: "olm.gvk",
10491049
Value: "{\"group\":\"apis.group.com\",\"kind\":\"RequiredAPI\",\"version\":\"v1\"}",
10501050
},
10511051
},
@@ -1128,23 +1128,23 @@ func TestNewOperatorFromBundle(t *testing.T) {
11281128
Plural: "requiredapis",
11291129
}: struct{}{},
11301130
},
1131-
properties: []*api.Property{
1131+
properties: []*api.Property{
11321132
{
1133-
Type: "olm.gvk",
1133+
Type: "olm.gvk",
11341134
Value: "{\"group\":\"crd.group.com\",\"kind\":\"OwnedCRD\",\"version\":\"v1\"}",
11351135
},
11361136
{
1137-
Type: "olm.gvk",
1137+
Type: "olm.gvk",
11381138
Value: "{\"group\":\"apis.group.com\",\"kind\":\"OwnedAPI\",\"version\":\"v1\"}",
11391139
},
11401140
},
11411141
dependencies: []*api.Dependency{
11421142
{
1143-
Type: "olm.gvk",
1143+
Type: "olm.gvk",
11441144
Value: "{\"group\":\"crd.group.com\",\"kind\":\"RequiredCRD\",\"version\":\"v1\"}",
11451145
},
11461146
{
1147-
Type: "olm.gvk",
1147+
Type: "olm.gvk",
11481148
Value: "{\"group\":\"apis.group.com\",\"kind\":\"RequiredAPI\",\"version\":\"v1\"}",
11491149
},
11501150
},
@@ -1212,23 +1212,23 @@ func TestNewOperatorFromBundle(t *testing.T) {
12121212
Plural: "requiredapis",
12131213
}: struct{}{},
12141214
},
1215-
properties: []*api.Property{
1215+
properties: []*api.Property{
12161216
{
1217-
Type: "olm.gvk",
1217+
Type: "olm.gvk",
12181218
Value: "{\"group\":\"crd.group.com\",\"kind\":\"OwnedCRD\",\"version\":\"v1\"}",
12191219
},
12201220
{
1221-
Type: "olm.gvk",
1221+
Type: "olm.gvk",
12221222
Value: "{\"group\":\"apis.group.com\",\"kind\":\"OwnedAPI\",\"version\":\"v1\"}",
12231223
},
12241224
},
12251225
dependencies: []*api.Dependency{
12261226
{
1227-
Type: "olm.gvk",
1227+
Type: "olm.gvk",
12281228
Value: "{\"group\":\"apis.group.com\",\"kind\":\"RequiredAPI\",\"version\":\"v1\"}",
12291229
},
12301230
{
1231-
Type: "olm.gvk",
1231+
Type: "olm.gvk",
12321232
Value: "{\"group\":\"crd.group.com\",\"kind\":\"RequiredCRD\",\"version\":\"v1\"}",
12331233
},
12341234
},
@@ -1289,27 +1289,27 @@ func TestNewOperatorFromBundle(t *testing.T) {
12891289
sourceKey: registry.CatalogKey{Name: "source", Namespace: "testNamespace"},
12901290
},
12911291
want: &Operator{
1292-
name: "testBundle",
1293-
version: &version.Version,
1292+
name: "testBundle",
1293+
version: &version.Version,
12941294
providedAPIs: EmptyAPISet(),
12951295
requiredAPIs: EmptyAPISet(),
1296-
properties: []*api.Property{
1296+
properties: []*api.Property{
12971297
{
1298-
Type: "olm.gvk",
1298+
Type: "olm.gvk",
12991299
Value: "{\"group\":\"crd.group.com\",\"kind\":\"OwnedCRD\",\"version\":\"v1\"}",
13001300
},
13011301
{
1302-
Type: "olm.gvk",
1302+
Type: "olm.gvk",
13031303
Value: "{\"group\":\"apis.group.com\",\"kind\":\"OwnedAPI\",\"version\":\"v1\"}",
13041304
},
13051305
},
13061306
dependencies: []*api.Dependency{
13071307
{
1308-
Type: "olm.gvk",
1308+
Type: "olm.gvk",
13091309
Value: "{\"group\":\"crd.group.com\",\"kind\":\"RequiredCRD\",\"version\":\"v1\"}",
13101310
},
13111311
{
1312-
Type: "olm.gvk",
1312+
Type: "olm.gvk",
13131313
Value: "{\"group\":\"apis.group.com\",\"kind\":\"RequiredAPI\",\"version\":\"v1\"}",
13141314
},
13151315
},
@@ -1328,7 +1328,7 @@ func TestNewOperatorFromBundle(t *testing.T) {
13281328
require.Equal(t, tt.wantErr, err)
13291329
require.ElementsMatch(t, tt.want.dependencies, got.dependencies)
13301330
require.ElementsMatch(t, tt.want.properties, got.properties)
1331-
tt.want.properties, tt.want.dependencies, got.dependencies, got.properties = nil,nil,nil,nil
1331+
tt.want.properties, tt.want.dependencies, got.dependencies, got.properties = nil, nil, nil, nil
13321332
require.Equal(t, tt.want, got)
13331333
})
13341334
}
@@ -1404,11 +1404,11 @@ func TestNewOperatorFromCSV(t *testing.T) {
14041404
},
14051405
properties: []*api.Property{
14061406
{
1407-
Type: "olm.gvk",
1407+
Type: "olm.gvk",
14081408
Value: "{\"group\":\"g\",\"kind\":\"APIKind\",\"version\":\"v1\"}",
14091409
},
14101410
{
1411-
Type: "olm.gvk",
1411+
Type: "olm.gvk",
14121412
Value: "{\"group\":\"g\",\"kind\":\"CRDKind\",\"version\":\"v1\"}",
14131413
},
14141414
},
@@ -1457,11 +1457,11 @@ func TestNewOperatorFromCSV(t *testing.T) {
14571457
},
14581458
dependencies: []*api.Dependency{
14591459
{
1460-
Type: "olm.gvk",
1460+
Type: "olm.gvk",
14611461
Value: "{\"group\":\"g\",\"kind\":\"APIKind\",\"version\":\"v1\"}",
14621462
},
14631463
{
1464-
Type: "olm.gvk",
1464+
Type: "olm.gvk",
14651465
Value: "{\"group\":\"g\",\"kind\":\"CRDKind\",\"version\":\"v1\"}",
14661466
},
14671467
},
@@ -1527,21 +1527,21 @@ func TestNewOperatorFromCSV(t *testing.T) {
15271527
},
15281528
properties: []*api.Property{
15291529
{
1530-
Type: "olm.gvk",
1530+
Type: "olm.gvk",
15311531
Value: "{\"group\":\"g\",\"kind\":\"APIOwnedKind\",\"version\":\"v1\"}",
15321532
},
15331533
{
1534-
Type: "olm.gvk",
1534+
Type: "olm.gvk",
15351535
Value: "{\"group\":\"g\",\"kind\":\"CRDOwnedKind\",\"version\":\"v1\"}",
15361536
},
15371537
},
15381538
dependencies: []*api.Dependency{
15391539
{
1540-
Type: "olm.gvk",
1540+
Type: "olm.gvk",
15411541
Value: "{\"group\":\"g2\",\"kind\":\"APIReqKind\",\"version\":\"v1\"}",
15421542
},
15431543
{
1544-
Type: "olm.gvk",
1544+
Type: "olm.gvk",
15451545
Value: "{\"group\":\"g2\",\"kind\":\"CRDReqKind\",\"version\":\"v1\"}",
15461546
},
15471547
},
@@ -1556,7 +1556,7 @@ func TestNewOperatorFromCSV(t *testing.T) {
15561556
require.Equal(t, tt.wantErr, err)
15571557
require.ElementsMatch(t, tt.want.dependencies, got.dependencies)
15581558
require.ElementsMatch(t, tt.want.properties, got.properties)
1559-
tt.want.properties, tt.want.dependencies, got.dependencies, got.properties = nil,nil,nil,nil
1559+
tt.want.properties, tt.want.dependencies, got.dependencies, got.properties = nil, nil, nil, nil
15601560
require.Equal(t, tt.want, got)
15611561
})
15621562
}

‎pkg/controller/registry/resolver/querier.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"context"
77
"fmt"
88

9-
"github.com/blang/semver"
9+
"github.com/blang/semver/v4"
1010
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1111
"k8s.io/apimachinery/pkg/util/errors"
1212

‎pkg/controller/registry/resolver/querier_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"fmt"
77
"testing"
88

9-
"github.com/blang/semver"
9+
"github.com/blang/semver/v4"
1010
"github.com/operator-framework/operator-registry/pkg/api"
1111
"github.com/operator-framework/operator-registry/pkg/client"
1212
opregistry "github.com/operator-framework/operator-registry/pkg/registry"

‎pkg/controller/registry/resolver/resolver_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package resolver
33
import (
44
"testing"
55

6-
"github.com/blang/semver"
6+
"github.com/blang/semver/v4"
77
"github.com/sirupsen/logrus"
88
"github.com/stretchr/testify/assert"
99
"github.com/stretchr/testify/require"

‎pkg/lib/controller-runtime/client/fake_ssa.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package client
22

33
import (
44
"context"
5+
56
"k8s.io/apimachinery/pkg/runtime"
67
"k8s.io/apimachinery/pkg/types"
78
k8scontrollerclient "sigs.k8s.io/controller-runtime/pkg/client"
@@ -21,7 +22,7 @@ type fakeApplier struct {
2122
k8scontrollerclient.Client
2223
}
2324

24-
func (c *fakeApplier) Patch(ctx context.Context, obj runtime.Object, patch k8scontrollerclient.Patch, opts ...k8scontrollerclient.PatchOption) error {
25+
func (c *fakeApplier) Patch(ctx context.Context, obj k8scontrollerclient.Object, patch k8scontrollerclient.Patch, opts ...k8scontrollerclient.PatchOption) error {
2526
patch, opts = convertApplyToMergePatch(patch, opts...)
2627
return c.Client.Patch(ctx, obj, patch, opts...)
2728
}
@@ -34,7 +35,7 @@ type fakeStatusWriter struct {
3435
k8scontrollerclient.StatusWriter
3536
}
3637

37-
func (c fakeStatusWriter) Patch(ctx context.Context, obj runtime.Object, patch k8scontrollerclient.Patch, opts ...k8scontrollerclient.PatchOption) error {
38+
func (c fakeStatusWriter) Patch(ctx context.Context, obj k8scontrollerclient.Object, patch k8scontrollerclient.Patch, opts ...k8scontrollerclient.PatchOption) error {
3839
patch, opts = convertApplyToMergePatch(patch, opts...)
3940
return c.StatusWriter.Patch(ctx, obj, patch, opts...)
4041
}

‎pkg/lib/controller-runtime/client/ssa.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ package client
33
import (
44
"context"
55
"fmt"
6+
"reflect"
7+
68
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
79
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
810
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
911
"k8s.io/apimachinery/pkg/runtime"
1012
kscheme "k8s.io/client-go/kubernetes/scheme"
1113
"k8s.io/client-go/rest"
1214
apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
13-
"reflect"
1415
k8scontrollerclient "sigs.k8s.io/controller-runtime/pkg/client"
1516
)
1617

@@ -130,10 +131,7 @@ func (c *ServerSideApplier) Apply(ctx context.Context, obj Object, changeFunc in
130131
_, applyStatus = unstructuredObj.Object["status"]
131132
}
132133

133-
key, err := k8scontrollerclient.ObjectKeyFromObject(obj)
134-
if err != nil {
135-
panic(fmt.Sprintf("unable to extract key from resource: %s", err))
136-
}
134+
key := k8scontrollerclient.ObjectKeyFromObject(obj)
137135

138136
// Ensure the GVK is set before patching
139137
SetDefaultGroupVersionKind(obj, c.Scheme)

‎pkg/lib/operatorstatus/csv_reporter_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
"testing"
55
"time"
66

7-
"github.com/blang/semver"
7+
"github.com/blang/semver/v4"
88
configv1 "github.com/openshift/api/config/v1"
9+
"github.com/operator-framework/api/pkg/lib/version"
910
"github.com/operator-framework/api/pkg/operators/v1alpha1"
1011
"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/ownerutil"
11-
"github.com/operator-framework/api/pkg/lib/version"
1212
"github.com/stretchr/testify/assert"
1313
"github.com/stretchr/testify/require"
1414
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

0 commit comments

Comments
 (0)