Skip to content

Commit a8bd12b

Browse files
committed
feat: introduced testlogger, changed some tests to use testlogger; pass log by APIBindingReconciler
1 parent c2b1f07 commit a8bd12b

File tree

3 files changed

+8
-15
lines changed

3 files changed

+8
-15
lines changed

listener/controller/apibinding_controller_test.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
ctrl "sigs.k8s.io/controller-runtime"
1313
"sigs.k8s.io/controller-runtime/pkg/client"
1414

15-
"github.com/openmfp/golang-commons/logger"
15+
"github.com/openmfp/golang-commons/logger/testlogger"
1616
controllerRuntimeMocks "github.com/openmfp/kubernetes-graphql-gateway/gateway/resolver/mocks"
1717
apischemaMocks "github.com/openmfp/kubernetes-graphql-gateway/listener/apischema/mocks"
1818
clusterpathMocks "github.com/openmfp/kubernetes-graphql-gateway/listener/clusterpath/mocks"
@@ -59,6 +59,7 @@ func TestAPIBindingReconciler_Reconcile(t *testing.T) {
5959
},
6060
}
6161

62+
log := testlogger.New().HideLogOutput().Logger
6263
for _, tt := range tests {
6364
t.Run(tt.name, func(t *testing.T) {
6465
ioHandler := workspacefileMocks.NewMockIOHandler(t)
@@ -70,12 +71,8 @@ func TestAPIBindingReconciler_Reconcile(t *testing.T) {
7071
tt.mockSetup(ioHandler, discoveryFactory, apiSchemaResolver, clusterPathResolver)
7172
}
7273

73-
loggerCfg := logger.DefaultConfig()
74-
loggerCfg.Name = "test-apibinding-reconciler"
75-
log, err := logger.New(loggerCfg)
76-
assert.NoError(t, err)
7774
r := controller.NewAPIBindingReconciler(ioHandler, discoveryFactory, apiSchemaResolver, clusterPathResolver, log)
78-
_, err = r.Reconcile(context.Background(), ctrl.Request{ClusterName: tt.clusterName})
75+
_, err := r.Reconcile(context.Background(), ctrl.Request{ClusterName: tt.clusterName})
7976
assert.Equal(t, tt.err, err)
8077
})
8178
}

listener/kcp/reconciler_factory.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func NewReconciler(appCfg config.Config, opts ReconcilerOpts, restcfg *rest.Conf
5959
return newStandardReconciler(opts, discoveryInterface, preReconcileFunc, log)
6060
}
6161

62-
return newKcpReconciler(opts, restcfg, discoverFactory)
62+
return newKcpReconciler(opts, restcfg, discoverFactory, log)
6363
}
6464

6565
func newStandardReconciler(
@@ -118,7 +118,7 @@ func PreReconcile(
118118
return nil
119119
}
120120

121-
func newKcpReconciler(opts ReconcilerOpts, restcfg *rest.Config, newDiscoveryFactoryFunc func(cfg *rest.Config) (*discoveryclient.FactoryProvider, error)) (CustomReconciler, error) {
121+
func newKcpReconciler(opts ReconcilerOpts, restcfg *rest.Config, newDiscoveryFactoryFunc func(cfg *rest.Config) (*discoveryclient.FactoryProvider, error), log *logger.Logger) (CustomReconciler, error) {
122122
ioHandler, err := workspacefile.NewIOHandler(opts.OpenAPIDefinitionsPath)
123123
if err != nil {
124124
return nil, errors.Join(ErrCreateIOHandler, err)
@@ -134,8 +134,7 @@ func newKcpReconciler(opts ReconcilerOpts, restcfg *rest.Config, newDiscoveryFac
134134
return nil, errors.Join(ErrCreateDiscoveryClient, err)
135135
}
136136

137-
// TODO: pass logger here as well if needed by APIBindingReconciler?
138137
return controller.NewAPIBindingReconciler(
139-
ioHandler, df, apischema.NewResolver(), pr /* log */, nil,
138+
ioHandler, df, apischema.NewResolver(), pr, log,
140139
), nil
141140
}

listener/kcp/reconciler_factory_test.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"k8s.io/client-go/rest"
1616
"sigs.k8s.io/controller-runtime/pkg/client/fake"
1717

18-
"github.com/openmfp/golang-commons/logger"
18+
"github.com/openmfp/golang-commons/logger/testlogger"
1919
"github.com/openmfp/kubernetes-graphql-gateway/listener/apischema"
2020
"github.com/openmfp/kubernetes-graphql-gateway/listener/discoveryclient"
2121
"github.com/openmfp/kubernetes-graphql-gateway/listener/workspacefile"
@@ -81,10 +81,7 @@ func TestNewReconciler(t *testing.T) {
8181

8282
fakeClient := fake.NewClientBuilder().WithScheme(scheme).Build()
8383

84-
loggerCfg := logger.DefaultConfig()
85-
loggerCfg.Name = "test-reconciler"
86-
log, err := logger.New(loggerCfg)
87-
assert.NoError(t, err)
84+
log := testlogger.New().HideLogOutput().Logger
8885

8986
reconciler, err := NewReconciler(appCfg, ReconcilerOpts{
9087
Config: tc.cfg,

0 commit comments

Comments
 (0)