From 336d60af0543bc3f23c7bbb0453e5951553a8ec2 Mon Sep 17 00:00:00 2001 From: Moshe Immerman Date: Wed, 20 Dec 2023 19:08:27 +0200 Subject: [PATCH] chore: fix linting issues --- cmd/root.go | 11 +++++------ cmd/serve.go | 1 - pkg/db/init.go | 4 ---- pkg/jobs/canary/sync_upstream.go | 16 ++++++++-------- pkg/jobs/jobs.go | 4 +--- 5 files changed, 14 insertions(+), 22 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index 57dee23d4..28e0f4881 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -47,12 +47,11 @@ var Root = &cobra.Command{ } var ( - httpPort = 8080 - publicEndpoint = "http://localhost:8080" - pushServers, pullServers []string - sharedLibrary []string - exposeEnv bool - logPass, logFail bool + httpPort = 8080 + publicEndpoint = "http://localhost:8080" + sharedLibrary []string + exposeEnv bool + logPass, logFail bool otelcollectorURL string otelServiceName string diff --git a/cmd/serve.go b/cmd/serve.go index 7b8aa0e10..fe8875ed5 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -76,7 +76,6 @@ func setup() { if err := duty.UpdatePropertiesFromFile(apicontext.DefaultContext, propertiesFile); err != nil { logger.Fatalf("Error setting properties in database: %v", err) } - } func postgrestResponseModifier(r *http.Response) error { diff --git a/pkg/db/init.go b/pkg/db/init.go index 0d0249891..cb96d75fd 100644 --- a/pkg/db/init.go +++ b/pkg/db/init.go @@ -11,7 +11,6 @@ import ( embeddedpostgres "github.com/fergusstrange/embedded-postgres" "github.com/flanksource/commons/logger" "github.com/flanksource/duty" - dutyContext "github.com/flanksource/duty/context" "github.com/flanksource/duty/migrate" "github.com/jackc/pgx/v5/pgxpool" "gorm.io/gorm" @@ -26,7 +25,6 @@ var RunMigrations bool var DBMetrics bool var PostgresServer *embeddedpostgres.EmbeddedPostgres var HTTPEndpoint = "http://localhost:8080/db" -var defaultCtx dutyContext.Context func Start(ctx context.Context) error { if err := Init(); err != nil { @@ -104,8 +102,6 @@ func Init() error { return err } - defaultCtx = dutyContext.Context{}.WithDB(Gorm, Pool) - if DBMetrics { go func() { if err := Gorm.Use(prometheus.New(prometheus.Config{ diff --git a/pkg/jobs/canary/sync_upstream.go b/pkg/jobs/canary/sync_upstream.go index 143219a27..91c05101d 100644 --- a/pkg/jobs/canary/sync_upstream.go +++ b/pkg/jobs/canary/sync_upstream.go @@ -60,7 +60,7 @@ var PullUpstreamCanaries = job.Job{ Singleton: true, Schedule: "@every 10m", Fn: func(ctx job.JobRuntime) error { - err, count := pull(ctx, UpstreamConf) + count, err := pull(ctx, UpstreamConf) ctx.History.SuccessCount = count return err }, @@ -71,36 +71,36 @@ type CanaryPullResponse struct { Canaries []models.Canary `json:"canaries,omitempty"` } -func pull(ctx gocontext.Context, config upstream.UpstreamConfig) (error, int) { +func pull(ctx gocontext.Context, config upstream.UpstreamConfig) (int, error) { logger.Tracef("pulling canaries from upstream since: %v", lastRuntime) client := upstream.NewUpstreamClient(config) req := client.Client.R(ctx).QueryParam("since", lastRuntime.Format(time.RFC3339)) resp, err := req.Get(fmt.Sprintf("canary/pull/%s", config.AgentName)) if err != nil { - return fmt.Errorf("error making request: %w", err), 0 + return 0, fmt.Errorf("error making request: %w", err) } defer resp.Body.Close() if !resp.IsOK() { - return fmt.Errorf("upstream responded with status: %s", resp.Status), 0 + return 0, fmt.Errorf("upstream responded with status: %s", resp.Status) } var response CanaryPullResponse if err := resp.Into(&response); err != nil { - return fmt.Errorf("error decoding response: %w", err), 0 + return 0, fmt.Errorf("error decoding response: %w", err) } lastRuntime = response.Before if len(response.Canaries) == 0 { - return nil, 0 + return 0, nil } - return db.Gorm.Omit("agent_id").Clauses(clause.OnConflict{ + return len(response.Canaries), db.Gorm.Omit("agent_id").Clauses(clause.OnConflict{ Columns: []clause.Column{{Name: "id"}}, UpdateAll: true, - }).Create(&response.Canaries).Error, len(response.Canaries) + }).Create(&response.Canaries).Error } var UpstreamJobs = []job.Job{ diff --git a/pkg/jobs/jobs.go b/pkg/jobs/jobs.go index 9758e5a40..3590e34bc 100644 --- a/pkg/jobs/jobs.go +++ b/pkg/jobs/jobs.go @@ -5,7 +5,6 @@ import ( v1 "github.com/flanksource/canary-checker/api/v1" "github.com/flanksource/canary-checker/pkg/db" - "github.com/flanksource/canary-checker/pkg/jobs/canary" canaryJobs "github.com/flanksource/canary-checker/pkg/jobs/canary" systemJobs "github.com/flanksource/canary-checker/pkg/jobs/system" "github.com/flanksource/canary-checker/pkg/topology" @@ -45,13 +44,12 @@ func Start() { FuncScheduler.Start() if canaryJobs.UpstreamConf.Valid() { - // Push checks to upstream in real-time if err := canaryJobs.StartUpstreamEventQueueConsumer(context.New(nil, nil, db.Gorm, db.Pool, v1.Canary{})); err != nil { logger.Fatalf("Failed to start upstream event queue consumer: %v", err) } - for _, job := range canary.UpstreamJobs { + for _, job := range canaryJobs.UpstreamJobs { job.Context = context.DefaultContext if err := job.AddToScheduler(FuncScheduler); err != nil { logger.Errorf(err.Error())