Skip to content

Commit fa14740

Browse files
tolgaozentolgaozen
committed
refactor: remove logger instantiation
1 parent 7ac181c commit fa14740

File tree

13 files changed

+215
-266
lines changed

13 files changed

+215
-266
lines changed

‎internal/engines/check_test.go‎

Lines changed: 64 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"github.com/Permify/permify/internal/invoke"
1414
"github.com/Permify/permify/pkg/attribute"
1515
"github.com/Permify/permify/pkg/database"
16-
"github.com/Permify/permify/pkg/logger"
1716
base "github.com/Permify/permify/pkg/pb/base/v1"
1817
"github.com/Permify/permify/pkg/telemetry"
1918
"github.com/Permify/permify/pkg/token"
@@ -64,7 +63,7 @@ var _ = Describe("check-engine", func() {
6463
conf, err := newSchema(driveSchema)
6564
Expect(err).ShouldNot(HaveOccurred())
6665

67-
schemaWriter := factories.SchemaWriterFactory(db, logger.New("debug"))
66+
schemaWriter := factories.SchemaWriterFactory(db)
6867
err = schemaWriter.WriteSchema(context.Background(), conf)
6968

7069
Expect(err).ShouldNot(HaveOccurred())
@@ -98,9 +97,9 @@ var _ = Describe("check-engine", func() {
9897
},
9998
}
10099

101-
schemaReader := factories.SchemaReaderFactory(db, logger.New("debug"))
102-
dataReader := factories.DataReaderFactory(db, logger.New("debug"))
103-
dataWriter := factories.DataWriterFactory(db, logger.New("debug"))
100+
schemaReader := factories.SchemaReaderFactory(db)
101+
dataReader := factories.DataReaderFactory(db)
102+
dataWriter := factories.DataWriterFactory(db)
104103

105104
checkEngine := NewCheckEngine(schemaReader, dataReader)
106105

@@ -171,7 +170,7 @@ var _ = Describe("check-engine", func() {
171170
conf, err := newSchema(driveSchema)
172171
Expect(err).ShouldNot(HaveOccurred())
173172

174-
schemaWriter := factories.SchemaWriterFactory(db, logger.New("debug"))
173+
schemaWriter := factories.SchemaWriterFactory(db)
175174
err = schemaWriter.WriteSchema(context.Background(), conf)
176175

177176
Expect(err).ShouldNot(HaveOccurred())
@@ -202,9 +201,9 @@ var _ = Describe("check-engine", func() {
202201
},
203202
}
204203

205-
schemaReader := factories.SchemaReaderFactory(db, logger.New("debug"))
206-
dataReader := factories.DataReaderFactory(db, logger.New("debug"))
207-
dataWriter := factories.DataWriterFactory(db, logger.New("debug"))
204+
schemaReader := factories.SchemaReaderFactory(db)
205+
dataReader := factories.DataReaderFactory(db)
206+
dataWriter := factories.DataWriterFactory(db)
208207

209208
checkEngine := NewCheckEngine(schemaReader, dataReader)
210209

@@ -275,7 +274,7 @@ var _ = Describe("check-engine", func() {
275274
conf, err := newSchema(driveSchema)
276275
Expect(err).ShouldNot(HaveOccurred())
277276

278-
schemaWriter := factories.SchemaWriterFactory(db, logger.New("debug"))
277+
schemaWriter := factories.SchemaWriterFactory(db)
279278
err = schemaWriter.WriteSchema(context.Background(), conf)
280279
Expect(err).ShouldNot(HaveOccurred())
281280

@@ -308,9 +307,9 @@ var _ = Describe("check-engine", func() {
308307
},
309308
}
310309

311-
schemaReader := factories.SchemaReaderFactory(db, logger.New("debug"))
312-
dataReader := factories.DataReaderFactory(db, logger.New("debug"))
313-
dataWriter := factories.DataWriterFactory(db, logger.New("debug"))
310+
schemaReader := factories.SchemaReaderFactory(db)
311+
dataReader := factories.DataReaderFactory(db)
312+
dataWriter := factories.DataWriterFactory(db)
314313

315314
checkEngine := NewCheckEngine(schemaReader, dataReader)
316315

@@ -406,7 +405,7 @@ var _ = Describe("check-engine", func() {
406405
conf, err := newSchema(githubSchema)
407406
Expect(err).ShouldNot(HaveOccurred())
408407

409-
schemaWriter := factories.SchemaWriterFactory(db, logger.New("debug"))
408+
schemaWriter := factories.SchemaWriterFactory(db)
410409
err = schemaWriter.WriteSchema(context.Background(), conf)
411410
Expect(err).ShouldNot(HaveOccurred())
412411

@@ -434,9 +433,9 @@ var _ = Describe("check-engine", func() {
434433
},
435434
}
436435

437-
schemaReader := factories.SchemaReaderFactory(db, logger.New("debug"))
438-
dataReader := factories.DataReaderFactory(db, logger.New("debug"))
439-
dataWriter := factories.DataWriterFactory(db, logger.New("debug"))
436+
schemaReader := factories.SchemaReaderFactory(db)
437+
dataReader := factories.DataReaderFactory(db)
438+
dataWriter := factories.DataWriterFactory(db)
440439

441440
checkEngine := NewCheckEngine(schemaReader, dataReader)
442441

@@ -507,7 +506,7 @@ var _ = Describe("check-engine", func() {
507506
conf, err := newSchema(githubSchema)
508507
Expect(err).ShouldNot(HaveOccurred())
509508

510-
schemaWriter := factories.SchemaWriterFactory(db, logger.New("debug"))
509+
schemaWriter := factories.SchemaWriterFactory(db)
511510
err = schemaWriter.WriteSchema(context.Background(), conf)
512511
Expect(err).ShouldNot(HaveOccurred())
513512

@@ -539,8 +538,8 @@ var _ = Describe("check-engine", func() {
539538
},
540539
}
541540

542-
schemaReader := factories.SchemaReaderFactory(db, logger.New("debug"))
543-
dataReader := factories.DataReaderFactory(db, logger.New("debug"))
541+
schemaReader := factories.SchemaReaderFactory(db)
542+
dataReader := factories.DataReaderFactory(db)
544543

545544
checkEngine := NewCheckEngine(schemaReader, dataReader)
546545

@@ -611,7 +610,7 @@ var _ = Describe("check-engine", func() {
611610
conf, err := newSchema(githubSchema)
612611
Expect(err).ShouldNot(HaveOccurred())
613612

614-
schemaWriter := factories.SchemaWriterFactory(db, logger.New("debug"))
613+
schemaWriter := factories.SchemaWriterFactory(db)
615614
err = schemaWriter.WriteSchema(context.Background(), conf)
616615
Expect(err).ShouldNot(HaveOccurred())
617616

@@ -642,9 +641,9 @@ var _ = Describe("check-engine", func() {
642641
},
643642
}
644643

645-
schemaReader := factories.SchemaReaderFactory(db, logger.New("debug"))
646-
dataReader := factories.DataReaderFactory(db, logger.New("debug"))
647-
dataWriter := factories.DataWriterFactory(db, logger.New("debug"))
644+
schemaReader := factories.SchemaReaderFactory(db)
645+
dataReader := factories.DataReaderFactory(db)
646+
dataWriter := factories.DataWriterFactory(db)
648647

649648
checkEngine := NewCheckEngine(schemaReader, dataReader)
650649

@@ -746,7 +745,7 @@ var _ = Describe("check-engine", func() {
746745
conf, err := newSchema(exclusionSchema)
747746
Expect(err).ShouldNot(HaveOccurred())
748747

749-
schemaWriter := factories.SchemaWriterFactory(db, logger.New("debug"))
748+
schemaWriter := factories.SchemaWriterFactory(db)
750749
err = schemaWriter.WriteSchema(context.Background(), conf)
751750
Expect(err).ShouldNot(HaveOccurred())
752751

@@ -778,8 +777,8 @@ var _ = Describe("check-engine", func() {
778777
},
779778
}
780779

781-
schemaReader := factories.SchemaReaderFactory(db, logger.New("debug"))
782-
dataReader := factories.DataReaderFactory(db, logger.New("debug"))
780+
schemaReader := factories.SchemaReaderFactory(db)
781+
dataReader := factories.DataReaderFactory(db)
783782

784783
checkEngine := NewCheckEngine(schemaReader, dataReader)
785784

@@ -850,7 +849,7 @@ var _ = Describe("check-engine", func() {
850849
conf, err := newSchema(exclusionSchema)
851850
Expect(err).ShouldNot(HaveOccurred())
852851

853-
schemaWriter := factories.SchemaWriterFactory(db, logger.New("debug"))
852+
schemaWriter := factories.SchemaWriterFactory(db)
854853
err = schemaWriter.WriteSchema(context.Background(), conf)
855854
Expect(err).ShouldNot(HaveOccurred())
856855

@@ -890,9 +889,9 @@ var _ = Describe("check-engine", func() {
890889
},
891890
}
892891

893-
schemaReader := factories.SchemaReaderFactory(db, logger.New("debug"))
894-
dataReader := factories.DataReaderFactory(db, logger.New("debug"))
895-
dataWriter := factories.DataWriterFactory(db, logger.New("debug"))
892+
schemaReader := factories.SchemaReaderFactory(db)
893+
dataReader := factories.DataReaderFactory(db)
894+
dataWriter := factories.DataWriterFactory(db)
896895

897896
checkEngine := NewCheckEngine(schemaReader, dataReader)
898897

@@ -973,7 +972,7 @@ var _ = Describe("check-engine", func() {
973972
conf, err := newSchema(exclusionSchema)
974973
Expect(err).ShouldNot(HaveOccurred())
975974

976-
schemaWriter := factories.SchemaWriterFactory(db, logger.New("debug"))
975+
schemaWriter := factories.SchemaWriterFactory(db)
977976
err = schemaWriter.WriteSchema(context.Background(), conf)
978977
Expect(err).ShouldNot(HaveOccurred())
979978

@@ -1007,9 +1006,9 @@ var _ = Describe("check-engine", func() {
10071006
},
10081007
}
10091008

1010-
schemaReader := factories.SchemaReaderFactory(db, logger.New("debug"))
1011-
dataReader := factories.DataReaderFactory(db, logger.New("debug"))
1012-
dataWriter := factories.DataWriterFactory(db, logger.New("debug"))
1009+
schemaReader := factories.SchemaReaderFactory(db)
1010+
dataReader := factories.DataReaderFactory(db)
1011+
dataWriter := factories.DataWriterFactory(db)
10131012

10141013
checkEngine := NewCheckEngine(schemaReader, dataReader)
10151014

@@ -1079,7 +1078,7 @@ var _ = Describe("check-engine", func() {
10791078
conf, err := newSchema(exclusionSchema)
10801079
Expect(err).ShouldNot(HaveOccurred())
10811080

1082-
schemaWriter := factories.SchemaWriterFactory(db, logger.New("debug"))
1081+
schemaWriter := factories.SchemaWriterFactory(db)
10831082
err = schemaWriter.WriteSchema(context.Background(), conf)
10841083
Expect(err).ShouldNot(HaveOccurred())
10851084

@@ -1122,9 +1121,9 @@ var _ = Describe("check-engine", func() {
11221121
},
11231122
}
11241123

1125-
schemaReader := factories.SchemaReaderFactory(db, logger.New("debug"))
1126-
dataReader := factories.DataReaderFactory(db, logger.New("debug"))
1127-
dataWriter := factories.DataWriterFactory(db, logger.New("debug"))
1124+
schemaReader := factories.SchemaReaderFactory(db)
1125+
dataReader := factories.DataReaderFactory(db)
1126+
dataWriter := factories.DataWriterFactory(db)
11281127

11291128
checkEngine := NewCheckEngine(schemaReader, dataReader)
11301129

@@ -1194,7 +1193,7 @@ var _ = Describe("check-engine", func() {
11941193
conf, err := newSchema(exclusionSchema)
11951194
Expect(err).ShouldNot(HaveOccurred())
11961195

1197-
schemaWriter := factories.SchemaWriterFactory(db, logger.New("debug"))
1196+
schemaWriter := factories.SchemaWriterFactory(db)
11981197
err = schemaWriter.WriteSchema(context.Background(), conf)
11991198
Expect(err).ShouldNot(HaveOccurred())
12001199

@@ -1227,9 +1226,9 @@ var _ = Describe("check-engine", func() {
12271226
},
12281227
}
12291228

1230-
schemaReader := factories.SchemaReaderFactory(db, logger.New("debug"))
1231-
dataReader := factories.DataReaderFactory(db, logger.New("debug"))
1232-
dataWriter := factories.DataWriterFactory(db, logger.New("debug"))
1229+
schemaReader := factories.SchemaReaderFactory(db)
1230+
dataReader := factories.DataReaderFactory(db)
1231+
dataWriter := factories.DataWriterFactory(db)
12331232

12341233
checkEngine := NewCheckEngine(schemaReader, dataReader)
12351234

@@ -1299,7 +1298,7 @@ var _ = Describe("check-engine", func() {
12991298
conf, err := newSchema(exclusionSchema)
13001299
Expect(err).ShouldNot(HaveOccurred())
13011300

1302-
schemaWriter := factories.SchemaWriterFactory(db, logger.New("debug"))
1301+
schemaWriter := factories.SchemaWriterFactory(db)
13031302
err = schemaWriter.WriteSchema(context.Background(), conf)
13041303
Expect(err).ShouldNot(HaveOccurred())
13051304

@@ -1332,9 +1331,9 @@ var _ = Describe("check-engine", func() {
13321331
},
13331332
}
13341333

1335-
schemaReader := factories.SchemaReaderFactory(db, logger.New("debug"))
1336-
dataReader := factories.DataReaderFactory(db, logger.New("debug"))
1337-
dataWriter := factories.DataWriterFactory(db, logger.New("debug"))
1334+
schemaReader := factories.SchemaReaderFactory(db)
1335+
dataReader := factories.DataReaderFactory(db)
1336+
dataWriter := factories.DataWriterFactory(db)
13381337

13391338
checkEngine := NewCheckEngine(schemaReader, dataReader)
13401339

@@ -1432,7 +1431,7 @@ var _ = Describe("check-engine", func() {
14321431
conf, err := newSchema(polymorphicRelationsSchema)
14331432
Expect(err).ShouldNot(HaveOccurred())
14341433

1435-
schemaWriter := factories.SchemaWriterFactory(db, logger.New("debug"))
1434+
schemaWriter := factories.SchemaWriterFactory(db)
14361435
err = schemaWriter.WriteSchema(context.Background(), conf)
14371436
Expect(err).ShouldNot(HaveOccurred())
14381437

@@ -1477,8 +1476,8 @@ var _ = Describe("check-engine", func() {
14771476
},
14781477
}
14791478

1480-
schemaReader := factories.SchemaReaderFactory(db, logger.New("debug"))
1481-
dataReader := factories.DataReaderFactory(db, logger.New("debug"))
1479+
schemaReader := factories.SchemaReaderFactory(db)
1480+
dataReader := factories.DataReaderFactory(db)
14821481

14831482
checkEngine := NewCheckEngine(schemaReader, dataReader)
14841483

@@ -1584,7 +1583,7 @@ var _ = Describe("check-engine", func() {
15841583
conf, err := newSchema(weekdaySchema)
15851584
Expect(err).ShouldNot(HaveOccurred())
15861585

1587-
schemaWriter := factories.SchemaWriterFactory(db, logger.New("debug"))
1586+
schemaWriter := factories.SchemaWriterFactory(db)
15881587
err = schemaWriter.WriteSchema(context.Background(), conf)
15891588

15901589
Expect(err).ShouldNot(HaveOccurred())
@@ -1615,9 +1614,9 @@ var _ = Describe("check-engine", func() {
16151614
},
16161615
}
16171616

1618-
schemaReader := factories.SchemaReaderFactory(db, logger.New("debug"))
1619-
dataReader := factories.DataReaderFactory(db, logger.New("debug"))
1620-
dataWriter := factories.DataWriterFactory(db, logger.New("debug"))
1617+
schemaReader := factories.SchemaReaderFactory(db)
1618+
dataReader := factories.DataReaderFactory(db)
1619+
dataWriter := factories.DataWriterFactory(db)
16211620
checkEngine := NewCheckEngine(schemaReader, dataReader)
16221621

16231622
invoker := invoke.NewDirectInvoker(
@@ -1694,7 +1693,7 @@ var _ = Describe("check-engine", func() {
16941693
conf, err := newSchema(weekdaySchema)
16951694
Expect(err).ShouldNot(HaveOccurred())
16961695

1697-
schemaWriter := factories.SchemaWriterFactory(db, logger.New("debug"))
1696+
schemaWriter := factories.SchemaWriterFactory(db)
16981697
err = schemaWriter.WriteSchema(context.Background(), conf)
16991698

17001699
Expect(err).ShouldNot(HaveOccurred())
@@ -1746,9 +1745,9 @@ var _ = Describe("check-engine", func() {
17461745
},
17471746
}
17481747

1749-
schemaReader := factories.SchemaReaderFactory(db, logger.New("debug"))
1750-
dataReader := factories.DataReaderFactory(db, logger.New("debug"))
1751-
dataWriter := factories.DataWriterFactory(db, logger.New("debug"))
1748+
schemaReader := factories.SchemaReaderFactory(db)
1749+
dataReader := factories.DataReaderFactory(db)
1750+
dataWriter := factories.DataWriterFactory(db)
17521751
checkEngine := NewCheckEngine(schemaReader, dataReader)
17531752

17541753
invoker := invoke.NewDirectInvoker(
@@ -1841,7 +1840,7 @@ var _ = Describe("check-engine", func() {
18411840
conf, err := newSchema(weekdaySchema)
18421841
Expect(err).ShouldNot(HaveOccurred())
18431842

1844-
schemaWriter := factories.SchemaWriterFactory(db, logger.New("debug"))
1843+
schemaWriter := factories.SchemaWriterFactory(db)
18451844
err = schemaWriter.WriteSchema(context.Background(), conf)
18461845

18471846
Expect(err).ShouldNot(HaveOccurred())
@@ -1872,8 +1871,8 @@ var _ = Describe("check-engine", func() {
18721871
},
18731872
}
18741873

1875-
schemaReader := factories.SchemaReaderFactory(db, logger.New("debug"))
1876-
dataReader := factories.DataReaderFactory(db, logger.New("debug"))
1874+
schemaReader := factories.SchemaReaderFactory(db)
1875+
dataReader := factories.DataReaderFactory(db)
18771876
checkEngine := NewCheckEngine(schemaReader, dataReader)
18781877

18791878
invoker := invoke.NewDirectInvoker(
@@ -1970,7 +1969,7 @@ var _ = Describe("check-engine", func() {
19701969
conf, err := newSchema(IpRangeSchema)
19711970
Expect(err).ShouldNot(HaveOccurred())
19721971

1973-
schemaWriter := factories.SchemaWriterFactory(db, logger.New("debug"))
1972+
schemaWriter := factories.SchemaWriterFactory(db)
19741973
err = schemaWriter.WriteSchema(context.Background(), conf)
19751974

19761975
Expect(err).ShouldNot(HaveOccurred())
@@ -2005,9 +2004,9 @@ var _ = Describe("check-engine", func() {
20052004
},
20062005
}
20072006

2008-
schemaReader := factories.SchemaReaderFactory(db, logger.New("debug"))
2009-
dataReader := factories.DataReaderFactory(db, logger.New("debug"))
2010-
dataWriter := factories.DataWriterFactory(db, logger.New("debug"))
2007+
schemaReader := factories.SchemaReaderFactory(db)
2008+
dataReader := factories.DataReaderFactory(db)
2009+
dataWriter := factories.DataWriterFactory(db)
20112010
checkEngine := NewCheckEngine(schemaReader, dataReader)
20122011

20132012
invoker := invoke.NewDirectInvoker(

0 commit comments

Comments
 (0)