Skip to content

Commit 59cc077

Browse files
an1l4an1l4
committed
var keyword removed
1 parent 28da13c commit 59cc077

File tree

1 file changed

+37
-68
lines changed

1 file changed

+37
-68
lines changed

‎client/pkg/clickhouse/db_client.go‎

Lines changed: 37 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -133,18 +133,17 @@ func NewDBClient(conf *config.Config) (DBInterface, error) {
133133
}
134134

135135
func (c *DBClient) InsertContainerEventAzure(pushEvent model.AzureContainerPushEventPayload) {
136-
var (
137-
tx, err = c.conn.Begin()
138-
)
136+
137+
tx, err := c.conn.Begin()
139138
if err != nil {
140139
log.Printf("error beginning transaction: %v", err)
141140
return
142141
}
143142

144143
stmt, err := tx.Prepare(string(InsertAzureContainerPushEvent))
145144
if err != nil {
146-
log.Printf("error preparing statement: %v", err)
147-
return
145+
log.Printf("error preparing statement: %v", err)
146+
return
148147
}
149148

150149
defer stmt.Close()
@@ -186,10 +185,7 @@ func (c *DBClient) InsertContainerEventAzure(pushEvent model.AzureContainerPushE
186185
}
187186

188187
func (c *DBClient) InsertContainerEventQuay(pushEvent model.QuayImagePushPayload) {
189-
var (
190-
tx, err = c.conn.Begin()
191-
)
192-
188+
tx, err := c.conn.Begin()
193189
if err != nil {
194190
log.Printf("error beginning transaction: %v", err)
195191
return
@@ -199,8 +195,7 @@ func (c *DBClient) InsertContainerEventQuay(pushEvent model.QuayImagePushPayload
199195
if err != nil {
200196
log.Printf("error preparing statement: %v", err)
201197
return
202-
}
203-
198+
}
204199

205200
defer stmt.Close()
206201

@@ -243,9 +238,7 @@ func (c *DBClient) InsertContainerEventQuay(pushEvent model.QuayImagePushPayload
243238
}
244239

245240
func (c *DBClient) InsertContainerEventJfrog(pushEvent model.JfrogContainerPushEventPayload) {
246-
var (
247-
tx, err = c.conn.Begin()
248-
)
241+
tx, err := c.conn.Begin()
249242
if err != nil {
250243
log.Printf("error beginning transaction: %v", err)
251244
return
@@ -255,7 +248,7 @@ func (c *DBClient) InsertContainerEventJfrog(pushEvent model.JfrogContainerPushE
255248
if err != nil {
256249
log.Printf("error preparing statement: %v", err)
257250
return
258-
}
251+
}
259252

260253
defer stmt.Close()
261254

@@ -298,9 +291,7 @@ func (c *DBClient) InsertContainerEventJfrog(pushEvent model.JfrogContainerPushE
298291
}
299292

300293
func (c *DBClient) InsertRakeesMetrics(metrics model.RakeesMetrics) {
301-
var (
302-
tx, err = c.conn.Begin()
303-
)
294+
tx, err := c.conn.Begin()
304295
if err != nil {
305296
log.Printf("error beginning transaction: %v", err)
306297
return
@@ -309,7 +300,7 @@ func (c *DBClient) InsertRakeesMetrics(metrics model.RakeesMetrics) {
309300
if err != nil {
310301
log.Printf("error preparing statement: %v", err)
311302
return
312-
}
303+
}
313304

314305
defer stmt.Close()
315306

@@ -332,9 +323,7 @@ func (c *DBClient) InsertRakeesMetrics(metrics model.RakeesMetrics) {
332323
}
333324

334325
func (c *DBClient) InsertKetallEvent(metrics model.Resource) {
335-
var (
336-
tx, err = c.conn.Begin()
337-
)
326+
tx, err := c.conn.Begin()
338327
if err != nil {
339328
log.Printf("error beginning transaction: %v", err)
340329
return
@@ -343,7 +332,7 @@ func (c *DBClient) InsertKetallEvent(metrics model.Resource) {
343332
if err != nil {
344333
log.Printf("error preparing statement: %v", err)
345334
return
346-
}
335+
}
347336

348337
defer stmt.Close()
349338

@@ -365,9 +354,7 @@ func (c *DBClient) InsertKetallEvent(metrics model.Resource) {
365354
}
366355

367356
func (c *DBClient) InsertOutdatedEvent(metrics model.CheckResultfinal) {
368-
var (
369-
tx, err = c.conn.Begin()
370-
)
357+
tx, err := c.conn.Begin()
371358
if err != nil {
372359
log.Printf("error beginning transaction: %v", err)
373360
return
@@ -376,7 +363,7 @@ func (c *DBClient) InsertOutdatedEvent(metrics model.CheckResultfinal) {
376363
if err != nil {
377364
log.Printf("error preparing statement: %v", err)
378365
return
379-
}
366+
}
380367

381368
defer stmt.Close()
382369

@@ -400,9 +387,7 @@ func (c *DBClient) InsertOutdatedEvent(metrics model.CheckResultfinal) {
400387
}
401388

402389
func (c *DBClient) InsertDeprecatedAPI(deprecatedAPI model.DeprecatedAPI) {
403-
var (
404-
tx, err = c.conn.Begin()
405-
)
390+
tx, err := c.conn.Begin()
406391
if err != nil {
407392
log.Printf("error beginning transaction: %v", err)
408393
return
@@ -411,7 +396,7 @@ func (c *DBClient) InsertDeprecatedAPI(deprecatedAPI model.DeprecatedAPI) {
411396
if err != nil {
412397
log.Printf("error preparing statement: %v", err)
413398
return
414-
}
399+
}
415400

416401
defer stmt.Close()
417402

@@ -442,9 +427,7 @@ func (c *DBClient) InsertDeprecatedAPI(deprecatedAPI model.DeprecatedAPI) {
442427
}
443428

444429
func (c *DBClient) InsertDeletedAPI(deletedAPI model.DeletedAPI) {
445-
var (
446-
tx, err = c.conn.Begin()
447-
)
430+
tx, err := c.conn.Begin()
448431
if err != nil {
449432
log.Printf("error beginning transaction: %v", err)
450433
return
@@ -453,7 +436,7 @@ func (c *DBClient) InsertDeletedAPI(deletedAPI model.DeletedAPI) {
453436
if err != nil {
454437
log.Printf("error preparing statement: %v", err)
455438
return
456-
}
439+
}
457440

458441
defer stmt.Close()
459442
deleted := uint8(0)
@@ -485,9 +468,7 @@ func (c *DBClient) InsertDeletedAPI(deletedAPI model.DeletedAPI) {
485468
}
486469

487470
func (c *DBClient) InsertKubvizEvent(metrics model.Metrics) {
488-
var (
489-
tx, err = c.conn.Begin()
490-
)
471+
tx, err := c.conn.Begin()
491472
if err != nil {
492473
log.Printf("error beginning transaction: %v", err)
493474
return
@@ -496,7 +477,7 @@ func (c *DBClient) InsertKubvizEvent(metrics model.Metrics) {
496477
if err != nil {
497478
log.Printf("error preparing statement: %v", err)
498479
return
499-
}
480+
}
500481

501482
defer stmt.Close()
502483
eventJson, _ := json.Marshal(metrics.Event)
@@ -556,9 +537,7 @@ func (c *DBClient) InsertContainerEvent(event string) {
556537
}
557538

558539
func (c *DBClient) InsertKubeScoreMetrics(metrics model.KubeScoreRecommendations) {
559-
var (
560-
tx, err = c.conn.Begin()
561-
)
540+
tx, err := c.conn.Begin()
562541
if err != nil {
563542
log.Printf("error beginning transaction: %v", err)
564543
return
@@ -567,7 +546,7 @@ func (c *DBClient) InsertKubeScoreMetrics(metrics model.KubeScoreRecommendations
567546
if err != nil {
568547
log.Printf("error preparing statement: %v", err)
569548
return
570-
}
549+
}
571550
defer stmt.Close()
572551

573552
currentTime := time.Now().UTC()
@@ -590,9 +569,7 @@ func (c *DBClient) InsertTrivyMetrics(metrics model.Trivy) {
590569
for _, finding := range metrics.Report.Findings {
591570
for _, result := range finding.Results {
592571
for _, vulnerability := range result.Vulnerabilities {
593-
var (
594-
tx, err = c.conn.Begin()
595-
)
572+
tx, err := c.conn.Begin()
596573
if err != nil {
597574
log.Printf("error beginning transaction: %v", err)
598575
return
@@ -601,7 +578,7 @@ func (c *DBClient) InsertTrivyMetrics(metrics model.Trivy) {
601578
if err != nil {
602579
log.Printf("error preparing statement: %v", err)
603580
return
604-
}
581+
}
605582
if _, err := stmt.Exec(
606583
metrics.ID,
607584
metrics.ClusterName,
@@ -629,9 +606,7 @@ func (c *DBClient) InsertTrivyMetrics(metrics model.Trivy) {
629606
}
630607

631608
for _, misconfiguration := range result.Misconfigurations {
632-
var (
633-
tx, err = c.conn.Begin()
634-
)
609+
tx, err := c.conn.Begin()
635610
if err != nil {
636611
log.Printf("error beginning transaction: %v", err)
637612
return
@@ -640,7 +615,7 @@ func (c *DBClient) InsertTrivyMetrics(metrics model.Trivy) {
640615
if err != nil {
641616
log.Printf("error preparing statement: %v", err)
642617
return
643-
}
618+
}
644619

645620
defer stmt.Close()
646621

@@ -677,9 +652,7 @@ func (c *DBClient) InsertTrivyMetrics(metrics model.Trivy) {
677652
func (c *DBClient) InsertTrivyImageMetrics(metrics model.TrivyImage) {
678653
for _, result := range metrics.Report.Results {
679654
for _, vulnerability := range result.Vulnerabilities {
680-
var (
681-
tx, err = c.conn.Begin()
682-
)
655+
tx, err := c.conn.Begin()
683656
if err != nil {
684657
log.Printf("error beginning transaction: %v", err)
685658
return
@@ -688,7 +661,7 @@ func (c *DBClient) InsertTrivyImageMetrics(metrics model.TrivyImage) {
688661
if err != nil {
689662
log.Printf("error preparing statement: %v", err)
690663
return
691-
}
664+
}
692665

693666
if _, err := stmt.Exec(
694667
metrics.ID,
@@ -725,9 +698,7 @@ func (c *DBClient) InsertTrivySbomMetrics(metrics model.Sbom) {
725698
result := metrics.Report
726699

727700
if result.CycloneDX != nil {
728-
var (
729-
tx, err = c.conn.Begin()
730-
)
701+
tx, err := c.conn.Begin()
731702
if err != nil {
732703
log.Printf("error beginning transaction: %v", err)
733704
return
@@ -736,9 +707,9 @@ func (c *DBClient) InsertTrivySbomMetrics(metrics model.Sbom) {
736707
if err != nil {
737708
log.Printf("error preparing statement: %v", err)
738709
return
739-
}
710+
}
740711

741-
if _,err:= stmt.Exec(
712+
if _, err := stmt.Exec(
742713
metrics.ID,
743714
result.CycloneDX.Metadata.Component.Name,
744715
result.CycloneDX.Metadata.Component.PackageURL,
@@ -748,18 +719,18 @@ func (c *DBClient) InsertTrivySbomMetrics(metrics model.Sbom) {
748719
result.CycloneDX.BOMFormat,
749720
result.CycloneDX.Metadata.Component.Version,
750721
result.CycloneDX.Metadata.Component.MIMEType,
751-
); err!=nil {
722+
); err != nil {
752723
log.Fatal(err)
753724
}
754-
if err:=tx.Commit();err!=nil {
725+
if err := tx.Commit(); err != nil {
755726
log.Fatal(err)
756727
}
757728
stmt.Close()
758-
}else {
729+
} else {
759730
log.Println("sbom payload not available for db insertion, skipping db insertion")
760731

761732
}
762-
733+
763734
}
764735
func (c *DBClient) Close() {
765736
_ = c.conn.Close()
@@ -861,9 +832,7 @@ func (c *DBClient) RetrieveKubvizEvent() ([]model.DbEvent, error) {
861832
}
862833

863834
func (c *DBClient) InsertContainerEventDockerHub(build model.DockerHubBuild) {
864-
var (
865-
tx, err = c.conn.Begin()
866-
)
835+
tx, err := c.conn.Begin()
867836
if err != nil {
868837
log.Printf("error beginning transaction: %v", err)
869838
return
@@ -873,7 +842,7 @@ func (c *DBClient) InsertContainerEventDockerHub(build model.DockerHubBuild) {
873842
if err != nil {
874843
log.Printf("error preparing statement: %v", err)
875844
return
876-
}
845+
}
877846
defer stmt.Close()
878847

879848
currentTime := time.Now().UTC()

0 commit comments

Comments
 (0)