From d5c40ce7d27d5fc0e98b9f85c10fd550c003b406 Mon Sep 17 00:00:00 2001 From: Elio Bischof Date: Tue, 4 Jul 2023 16:16:38 +0200 Subject: [PATCH] lint --- internal/integration/client.go | 2 +- internal/query/milestone.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/integration/client.go b/internal/integration/client.go index c5f5433590..019fc2a4e5 100644 --- a/internal/integration/client.go +++ b/internal/integration/client.go @@ -3,7 +3,6 @@ package integration import ( "context" "fmt" - "github.com/zitadel/zitadel/pkg/grpc/system" "testing" "time" @@ -21,6 +20,7 @@ import ( mgmt "github.com/zitadel/zitadel/pkg/grpc/management" object "github.com/zitadel/zitadel/pkg/grpc/object/v2alpha" session "github.com/zitadel/zitadel/pkg/grpc/session/v2alpha" + "github.com/zitadel/zitadel/pkg/grpc/system" user "github.com/zitadel/zitadel/pkg/grpc/user/v2alpha" ) diff --git a/internal/query/milestone.go b/internal/query/milestone.go index 6df3bac47f..8837bd8884 100644 --- a/internal/query/milestone.go +++ b/internal/query/milestone.go @@ -88,7 +88,10 @@ func (q *Queries) SearchMilestones(ctx context.Context, instanceIDs []string, qu if err != nil { return nil, err } - if err := rows.Err(); err != nil { + if err = rows.Close(); err != nil { + return nil, errors.ThrowInternal(err, "QUERY-CK9mI", "Errors.Query.CloseRows") + } + if err = rows.Err(); err != nil { return nil, errors.ThrowInternal(err, "QUERY-asLsI", "Errors.Internal") } milestones.LatestSequence, err = q.latestSequence(ctx, milestonesTable) @@ -131,9 +134,6 @@ func prepareMilestonesQuery(ctx context.Context, db prepareDatabase) (sq.SelectB m.PushedDate = pushedDate.Time milestones = append(milestones, m) } - if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-CK9mI", "Errors.Query.CloseRows") - } return &Milestones{ Milestones: milestones, SearchResponse: SearchResponse{