Skip to content

Commit

Permalink
⚠️ Remove deprecated NewFakeClient function, replace with scheme
Browse files Browse the repository at this point in the history
Signed-off-by: Vince Prignano <vincepri@vmware.com>
  • Loading branch information
vincepri committed Aug 4, 2020
1 parent 1abbd13 commit b9449f4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 19 deletions.
13 changes: 3 additions & 10 deletions pkg/client/fake/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,11 @@ const (
maxGeneratedNameLength = maxNameLength - randomLength
)

// NewFakeClient creates a new fake client for testing.
// You can choose to initialize it with a slice of runtime.Object.
// Deprecated: use NewFakeClientWithScheme. You should always be
// passing an explicit Scheme.
func NewFakeClient(initObjs ...runtime.Object) client.Client {
return NewFakeClientWithScheme(scheme.Scheme, initObjs...)
}

// NewFakeClientWithScheme creates a new fake client with the given scheme
// NewFakeClient creates a new fake client with the given scheme
// for testing.
//
// You can choose to initialize it with a slice of runtime.Object.
func NewFakeClientWithScheme(clientScheme *runtime.Scheme, initObjs ...runtime.Object) client.Client {
func NewFakeClient(clientScheme *runtime.Scheme, initObjs ...runtime.Object) client.Client {
tracker := testing.NewObjectTracker(clientScheme, scheme.Codecs.UniversalDecoder())
for _, obj := range initObjs {
err := tracker.Add(obj)
Expand Down
10 changes: 1 addition & 9 deletions pkg/client/fake/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -414,20 +414,12 @@ var _ = Describe("Fake client", func() {
})
}

Context("with default scheme.Scheme", func() {
BeforeEach(func(done Done) {
cl = NewFakeClient(dep, dep2, cm)
close(done)
})
AssertClientBehavior()
})

Context("with given scheme", func() {
BeforeEach(func(done Done) {
scheme := runtime.NewScheme()
Expect(corev1.AddToScheme(scheme)).To(Succeed())
Expect(appsv1.AddToScheme(scheme)).To(Succeed())
cl = NewFakeClientWithScheme(scheme, dep, dep2, cm)
cl = NewFakeClient(scheme, dep, dep2, cm)
close(done)
})
AssertClientBehavior()
Expand Down

0 comments on commit b9449f4

Please sign in to comment.