fix: moar linting

.github/workflows/go.yml

@@ -21,9 +21,6 @@ jobs:
       with:
         go-version: '1.23.1'
 
-    - name: Check `go fmt`
-      run: test -z $(gofmt -l ./...)
-
     - name: Install templ
       run: go install github.com/a-h/templ/cmd/templ@latest
 
@@ -35,9 +32,6 @@ jobs:
       with:
         version: latest
 
-    - name: Run `go vet`
-      run: go vet ./...
-
     - name: Build
       run: go build -v ./...
 

.golangci.yml

@@ -0,0 +1,18 @@
+linters:
+  enable:
+    - decorder
+    - durationcheck
+    - errchkjson
+    - exhaustive
+    - goconst
+    - gocritic
+    - gofmt
+    - goimports
+    - gosec
+    - misspell
+    - prealloc
+    - predeclared
+    - reassign
+    - unconvert
+    - wastedassign
+    - whitespace

internal/app/fhir/r5/helpers.go

@@ -66,6 +66,7 @@ func newXhtml(value string) *datatypespb.Xhtml {
 	return &datatypespb.Xhtml{Value: value}
 }
 
+//nolint:gosec
 func newUnsignedInt(value int) *datatypespb.UnsignedInt {
 	return &datatypespb.UnsignedInt{Value: uint32(value)}
 }

internal/app/handlers.go

@@ -57,10 +57,13 @@ func (app *Application) getCodeSystemByID(w http.ResponseWriter, r *http.Request
 	}
 
 	var codeSystem *xo.CodeSystem
-	if id_type == "oid" {
+	switch id_type {
+	case Oid:
 		codeSystem, err = rp.GetCodeSystemByOID(r.Context(), id)
-	} else {
+	case Id:
 		codeSystem, err = rp.GetCodeSystemByID(r.Context(), id)
+	case Unknown:
+		customErrors.ServerError(w, r, customErrors.ErrInvalidId, app.logger)
 	}
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
@@ -97,10 +100,13 @@ func (app *Application) getFHIRCodeSystemByID(w http.ResponseWriter, r *http.Req
 	}
 
 	var codeSystem *xo.CodeSystem
-	if id_type == "oid" {
+	switch id_type {
+	case Oid:
 		codeSystem, err = rp.GetCodeSystemByOID(r.Context(), id)
-	} else {
+	case Id:
 		codeSystem, err = rp.GetCodeSystemByID(r.Context(), id)
+	case Unknown:
+		customErrors.ServerError(w, r, customErrors.ErrInvalidId, app.logger)
 	}
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
@@ -329,10 +335,13 @@ func (app *Application) getValueSetByID(w http.ResponseWriter, r *http.Request)
 	}
 
 	var valueSet *xo.ValueSet
-	if id_type == "oid" {
+	switch id_type {
+	case Oid:
 		valueSet, err = rp.GetValueSetByOID(r.Context(), id)
-	} else {
+	case Id:
 		valueSet, err = rp.GetValueSetByID(r.Context(), id)
+	case Unknown:
+		customErrors.ServerError(w, r, customErrors.ErrInvalidId, app.logger)
 	}
 
 	if err != nil {

internal/app/helpers.go

@@ -6,15 +6,24 @@ import (
 	"github.com/CDCgov/phinvads-go/internal/errors"
 )
 
-func determineIdType(input string) (output string, err error) {
+type IdType int
+
+const (
+	Unknown IdType = iota
+	Oid     IdType = iota
+	Id      IdType = iota
+)
+
+func determineIdType(input string) (output IdType, err error) {
 	validId, _ := regexp.MatchString("^[a-zA-Z0-9-]+$", input)
 	validOid, _ := regexp.MatchString("^[0-9.]+$", input)
 
-	if validId {
-		return "id", nil
-	} else if validOid {
-		return "oid", nil
-	} else {
-		return "", errors.ErrInvalidId
+	switch {
+	case validId:
+		return Id, nil
+	case validOid:
+		return Oid, nil
+	default:
+		return Unknown, errors.ErrInvalidId
 	}
 }

internal/app/main.go

@@ -34,6 +34,7 @@ func SetupApp(cfg *cfg.Config) *Application {
 
 	tlsConfig := &tls.Config{
 		CurvePreferences: []tls.CurveID{tls.X25519, tls.CurveP256},
+		MinVersion:       tls.VersionTLS12,
 	}
 
 	rp := rp.NewRepository(db)
@@ -75,7 +76,7 @@ func (app *Application) Run() {
 
 	app.logger.Error(err.Error())
 
-	defer app.db.Close()
+	app.db.Close()
 
 	os.Exit(1)
 }

internal/database/models/codesystemconcept.go

@@ -23,5 +23,4 @@ func GetAllCodeSystemConcepts(ctx context.Context, db xo.DB) (*[]xo.CodeSystemCo
 		codeSystemConcepts = append(codeSystemConcepts, csc)
 	}
 	return &codeSystemConcepts, nil
-
 }

internal/database/models/repository/repository.go

@@ -183,5 +183,4 @@ func (r *Repository) GetValueSetVersionByVvsvVsvId(ctx context.Context, vvsv *xo
 
 func (r *Repository) GetAllHotTopics(ctx context.Context) (*[]xo.HotTopic, error) {
 	return models.GetAllHotTopics(ctx, r.database)
-
 }