fix: fixed backend api error checking; added golang linting (#28)

Author: talentedmrjones

.github/workflows/deploy.yml

@@ -42,6 +42,18 @@ jobs:
         id: uiDiff
         run: git --no-pager diff --name-only origin/main HEAD | grep ui/
         continue-on-error: true
+      
+      - uses: actions/setup-go@v5
+        if: steps.backendDiff.outcome == 'success'
+        with:
+          go-version: '1.22'
+      
+      - name: LINT - backend/
+        if: steps.backendDiff.outcome == 'success'
+        uses: golangci/golangci-lint-action@v6
+        with:
+          version: v1.58
+          working-directory: backend
 
       - name: Get AWS Creds
         if: steps.backendDiff.outcome == 'success' || steps.infraDiff.outcome == 'success' || steps.uiDiff.outcome == 'success'

backend/cmd/api/fismasystems.go

@@ -25,8 +25,6 @@ type FismaSystem struct {
 }
 
 func (r *rootResolver) FismaSystems(ctx context.Context, args struct{ Fismaacronym *string }) ([]*FismaSystemResolver, error) {
-	var fismaSystemsRxs []*FismaSystemResolver
-
 	db, err := db.Conn(ctx)
 	if err != nil {
 		log.Println(err)
@@ -52,14 +50,12 @@ func (r *rootResolver) FismaSystems(ctx context.Context, args struct{ Fismaacron
 		return nil, err
 	}
 
-	for rows.Next() {
+	return pgx.CollectRows(rows, func(row pgx.CollectableRow) (*FismaSystemResolver, error) {
 		fismaSystem := FismaSystem{}
-		rows.Scan(&fismaSystem.Fismasystemid, &fismaSystem.Fismauid, &fismaSystem.Fismaacronym, &fismaSystem.Fismaname, &fismaSystem.Fismasubsystem, &fismaSystem.Component, &fismaSystem.Groupacronym, &fismaSystem.Groupname, &fismaSystem.Divisionname, &fismaSystem.Datacenterenvironment, &fismaSystem.Datacallcontact, &fismaSystem.Issoemail)
-		fismaSystemRx := FismaSystemResolver{&fismaSystem}
-		fismaSystemsRxs = append(fismaSystemsRxs, &fismaSystemRx)
-	}
+		err := rows.Scan(&fismaSystem.Fismasystemid, &fismaSystem.Fismauid, &fismaSystem.Fismaacronym, &fismaSystem.Fismaname, &fismaSystem.Fismasubsystem, &fismaSystem.Component, &fismaSystem.Groupacronym, &fismaSystem.Groupname, &fismaSystem.Divisionname, &fismaSystem.Datacenterenvironment, &fismaSystem.Datacallcontact, &fismaSystem.Issoemail)
+		return &FismaSystemResolver{&fismaSystem}, err
+	})
 
-	return fismaSystemsRxs, nil
 }
 
 func (r *rootResolver) FismaSystem(ctx context.Context, args struct{ Fismasystemid graphql.ID }) (*FismaSystemResolver, error) {

backend/cmd/api/functions.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/CMS-Enterprise/ztmf/backend/internal/db"
 	"github.com/graph-gophers/graphql-go"
+	"github.com/jackc/pgx/v5"
 )
 
 type Function struct {
@@ -21,8 +22,6 @@ type Function struct {
 }
 
 func (r *rootResolver) Functions(ctx context.Context) ([]*FunctionResolver, error) {
-	var functionsRxs []*FunctionResolver
-
 	db, err := db.Conn(ctx)
 	if err != nil {
 		log.Println(err)
@@ -35,14 +34,12 @@ func (r *rootResolver) Functions(ctx context.Context) ([]*FunctionResolver, erro
 		return nil, err
 	}
 
-	for rows.Next() {
+	return pgx.CollectRows(rows, func(row pgx.CollectableRow) (*FunctionResolver, error) {
 		function := Function{}
-		rows.Scan(&function.Functionid, &function.Pillar, &function.Name, &function.Description, &function.Traditional, &function.Initial, &function.Advanced, &function.Optimal, &function.Datacenterenvironment)
-		functionRx := FunctionResolver{&function}
-		functionsRxs = append(functionsRxs, &functionRx)
-	}
+		err := rows.Scan(&function.Functionid, &function.Pillar, &function.Name, &function.Description, &function.Traditional, &function.Initial, &function.Advanced, &function.Optimal, &function.Datacenterenvironment)
+		return &FunctionResolver{&function}, err
+	})
 
-	return functionsRxs, nil
 }
 
 // resolver for graph entry from root

backend/cmd/api/main.go

@@ -24,5 +24,4 @@ func main() {
 	} else {
 		log.Fatal("could not listen and serve:", http.ListenAndServe(":"+cfg.Port, nil))
 	}
-
 }

backend/go.mod

@@ -26,8 +26,6 @@ require (
 	github.com/aws/smithy-go v1.20.2 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
-	github.com/jackc/puddle/v2 v2.2.1 // indirect
 	golang.org/x/crypto v0.17.0 // indirect
-	golang.org/x/sync v0.1.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 )