Skip to content

Commit fe6f91d

Browse files
authored
Merge pull request #122 from rajansandeep/updatemockmgr
Update mock manager for golden tests to pass
2 parents c794783 + 7384b09 commit fe6f91d

File tree

2 files changed

+12
-15
lines changed

2 files changed

+12
-15
lines changed

pkg/patterns/declarative/reconciler.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,7 @@ func (r *Reconciler) Init(mgr manager.Manager, prototype DeclarativeObject, opts
9595
}
9696
r.dynamicClient = d
9797

98-
restMapper, err := apiutil.NewDiscoveryRESTMapper(r.config)
99-
if err != nil {
100-
return err
101-
}
102-
r.restMapper = restMapper
98+
r.restMapper = mgr.GetRESTMapper()
10399

104100
if err = r.applyOptions(opts...); err != nil {
105101
return err

pkg/test/mocks/manager.go

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,24 @@ import (
2323
"github.com/go-logr/logr"
2424
"k8s.io/apimachinery/pkg/api/meta"
2525
"k8s.io/apimachinery/pkg/runtime"
26+
"k8s.io/client-go/kubernetes/scheme"
2627
"k8s.io/client-go/rest"
2728
"k8s.io/client-go/tools/record"
2829
"sigs.k8s.io/controller-runtime/pkg/cache"
2930
"sigs.k8s.io/controller-runtime/pkg/client"
3031
"sigs.k8s.io/controller-runtime/pkg/healthz"
3132
"sigs.k8s.io/controller-runtime/pkg/manager"
3233
"sigs.k8s.io/controller-runtime/pkg/webhook"
33-
34-
"k8s.io/client-go/kubernetes/scheme"
3534
)
3635

3736
// Mock Types for Reconciler tests:
3837
type Manager struct {
39-
client client.Client
40-
cache cache.Cache
41-
config rest.Config
42-
Scheme *runtime.Scheme
38+
client client.Client
39+
cache cache.Cache
40+
config rest.Config
41+
Scheme *runtime.Scheme
42+
eventRecorder record.EventRecorder
43+
mapper meta.RESTMapper
4344
}
4445

4546
var _ manager.Manager = &Manager{}
@@ -93,16 +94,16 @@ func (Manager) GetRecorder(name string) record.EventRecorder {
9394
panic("implement me")
9495
}
9596

96-
func (Manager) GetRESTMapper() meta.RESTMapper {
97-
panic("implement me")
97+
func (m Manager) GetRESTMapper() meta.RESTMapper {
98+
return m.mapper
9899
}
99100

100101
func (Manager) GetAPIReader() client.Reader {
101102
panic("implement me")
102103
}
103104

104-
func (Manager) GetEventRecorderFor(name string) record.EventRecorder {
105-
panic("implement me")
105+
func (m Manager) GetEventRecorderFor(name string) record.EventRecorder {
106+
return m.eventRecorder
106107
}
107108

108109
func (Manager) GetWebhookServer() *webhook.Server {

0 commit comments

Comments
 (0)