From 21bff6641b87af08314a40573b230fcfe3029896 Mon Sep 17 00:00:00 2001 From: Joel Messerli Date: Mon, 13 May 2024 13:39:11 +0200 Subject: [PATCH] chore: sonarlint --- Dockerfile | 4 ++-- tagparser/tagparser.go | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 640b4d1..c104392 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -FROM golang:1 as builder +FROM golang:1 AS builder LABEL maintainer="Joel Messerli " WORKDIR /go/src/github.com/jmesserli/nx COPY . . RUN go get -d -v ./... RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /go/bin/nx . -FROM alpine:latest +FROM alpine:3 RUN apk --no-cache add ca-certificates tzdata WORKDIR /root/ COPY --from=builder /go/bin/nx . diff --git a/tagparser/tagparser.go b/tagparser/tagparser.go index 468023e..294667d 100644 --- a/tagparser/tagparser.go +++ b/tagparser/tagparser.go @@ -8,6 +8,8 @@ import ( "strconv" ) +const NoValueErrStr = "no value available" + var tagRegex = regexp.MustCompile("^(\\w+),ns:(\\w+)$") type annotatedField struct { @@ -103,7 +105,7 @@ func findValueForField(field annotatedField, tags []model.Tag) (interface{}, err if sKind == reflect.String { if len(strValues) == 0 { - return nil, fmt.Errorf("no value available") + return nil, fmt.Errorf(NoValueErrStr) } return strValues, nil } else if sKind == reflect.Int { @@ -123,14 +125,14 @@ func findValueForField(field annotatedField, tags []model.Tag) (interface{}, err } else if fKind == reflect.String { if len(strValues) == 0 { //fmt.Printf("warn: No values available for string field <%s>. Returning empty string.\n", field.sField.Name) - return "", fmt.Errorf("no value available") + return "", fmt.Errorf(NoValueErrStr) } return strValues[0], nil } else if fKind == reflect.Int { if len(strValues) == 0 { //fmt.Printf("warn: No values available for int field <%s>. Returning 0.\n", field.sField.Name) - return 0, fmt.Errorf("no value available") + return 0, fmt.Errorf(NoValueErrStr) } for _, val := range strValues { @@ -144,11 +146,11 @@ func findValueForField(field annotatedField, tags []model.Tag) (interface{}, err } //fmt.Printf("warn: No values available for int field <%s>. Returning 0.\n", field.sField.Name) - return 0, fmt.Errorf("no value available") + return 0, fmt.Errorf(NoValueErrStr) } else if fKind == reflect.Bool { if len(strValues) == 0 { //fmt.Printf("warn: No values available for bool field <%s>. Returning false.\n", field.sField.Name) - return false, fmt.Errorf("no value available") + return false, fmt.Errorf(NoValueErrStr) } for _, val := range strValues { @@ -162,7 +164,7 @@ func findValueForField(field annotatedField, tags []model.Tag) (interface{}, err } //fmt.Printf("warn: No values available for bool field <%s>. Returning false.\n", field.sField.Name) - return false, fmt.Errorf("no value available") + return false, fmt.Errorf(NoValueErrStr) } panic(fmt.Sprintf("Unsupported field type <%v>", fKind))