From d49e18b1be1b64449411101a3116c575ff2a02b2 Mon Sep 17 00:00:00 2001 From: gearnode Date: Thu, 23 Jan 2025 10:08:04 +0100 Subject: [PATCH] Style Signed-off-by: gearnode --- pkg/probo/coredata/framework.go | 2 +- pkg/probo/coredata/organization.go | 4 ++-- pkg/probo/coredata/scope.go | 2 +- pkg/probo/probo.go | 35 +++++++++++++++++++++++++----- 4 files changed, 33 insertions(+), 10 deletions(-) diff --git a/pkg/probo/coredata/framework.go b/pkg/probo/coredata/framework.go index bbe00b423..418292c5c 100644 --- a/pkg/probo/coredata/framework.go +++ b/pkg/probo/coredata/framework.go @@ -134,7 +134,7 @@ LIMIT 1; ` q = fmt.Sprintf(q, scope.SQLFragment()) - + args := pgx.NamedArgs{"framework_id": frameworkID} maps.Copy(args, scope.SQLArguments()) r := conn.QueryRow(ctx, q, args) diff --git a/pkg/probo/coredata/organization.go b/pkg/probo/coredata/organization.go index 79e2c11f6..2dec54974 100644 --- a/pkg/probo/coredata/organization.go +++ b/pkg/probo/coredata/organization.go @@ -16,9 +16,9 @@ package coredata import ( "context" - "time" - "maps" "fmt" + "maps" + "time" "github.com/jackc/pgx/v5" "go.gearno.de/kit/pg" diff --git a/pkg/probo/coredata/scope.go b/pkg/probo/coredata/scope.go index 755757a95..e615c79ed 100644 --- a/pkg/probo/coredata/scope.go +++ b/pkg/probo/coredata/scope.go @@ -19,7 +19,7 @@ import ( ) type ( - Scope struct {} + Scope struct{} ) func NewScope() *Scope { diff --git a/pkg/probo/probo.go b/pkg/probo/probo.go index 9878717ad..61cd22132 100644 --- a/pkg/probo/probo.go +++ b/pkg/probo/probo.go @@ -24,14 +24,14 @@ import ( type ( Service struct { - pg *pg.Client + pg *pg.Client scope *coredata.Scope } ) func NewService(ctx context.Context, pgClient *pg.Client) *Service { return &Service{ - pg: pgClient, + pg: pgClient, scope: coredata.NewScope(), // must be created from auth } } @@ -45,7 +45,12 @@ func (s *Service) GetOrganization( err := s.pg.WithConn( ctx, func(conn pg.Conn) error { - return organization.LoadByID(ctx, conn, s.scope, organizationID) + return organization.LoadByID( + ctx, + conn, + s.scope, + organizationID, + ) }, ) @@ -66,7 +71,13 @@ func (s *Service) ListOrganizationFrameworks( err := s.pg.WithConn( ctx, func(conn pg.Conn) error { - return frameworks.LoadByOrganizationID(ctx, conn, s.scope, organizationID, cursor) + return frameworks.LoadByOrganizationID( + ctx, + conn, + s.scope, + organizationID, + cursor, + ) }, ) @@ -87,7 +98,13 @@ func (s *Service) ListFrameworkControls( err := s.pg.WithConn( ctx, func(conn pg.Conn) error { - return controls.LoadByFrameworkID(ctx, conn, s.scope, frameworkID, cursor) + return controls.LoadByFrameworkID( + ctx, + conn, + s.scope, + frameworkID, + cursor, + ) }, ) @@ -108,7 +125,13 @@ func (s *Service) ListControlTasks( err := s.pg.WithConn( ctx, func(conn pg.Conn) error { - return tasks.LoadByControlID(ctx, conn, s.scope, controlID, cursor) + return tasks.LoadByControlID( + ctx, + conn, + s.scope, + controlID, + cursor, + ) }, )