diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 851b3d8..4b53101 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -35,11 +35,10 @@ jobs: with: go-version-file: 'go.mod' - - name: Build and push Docker image + - name: Build Docker image run: | cd mongoapi/dbtestapp make docker-build - make docker-push build: runs-on: ubuntu-latest @@ -56,6 +55,9 @@ jobs: lint: name: lint runs-on: ubuntu-latest + strategy: + matrix: + directory: [drsm, flowdesc, fsm, httpwrapper, idgenerator, logger, mapstruct, milenage, mongoapi, mongoapi/dbtestapp, ueauth, version] steps: - uses: actions/checkout@v4 @@ -67,7 +69,8 @@ jobs: uses: golangci/golangci-lint-action@v3.7.0 with: version: latest - args: -v --config ./.golangci.yml + args: -v --config ../.golangci.yml + working-directory: ${{ matrix.directory }} license-check: runs-on: ubuntu-latest diff --git a/mongoapi/dbtestapp/Dockerfile b/mongoapi/dbtestapp/Dockerfile index 6c0ca73..a845c77 100644 --- a/mongoapi/dbtestapp/Dockerfile +++ b/mongoapi/dbtestapp/Dockerfile @@ -4,15 +4,15 @@ # SPDX-License-Identifier: Apache-2.0 # -FROM golang:1.21.3-bookworm AS test +FROM golang:1.21.6-bookworm AS test LABEL maintainer="ONF " RUN apt-get update && apt-get -y install vim -RUN cd $GOPATH/src && mkdir -p dbtestapp -COPY . $GOPATH/src/dbtestapp -RUN cd $GOPATH/src/dbtestapp && go install +WORKDIR $GOPATH/src/dbtestapp +COPY . . +RUN go install FROM alpine:3.16 AS dbtestapp RUN apk update && apk add -U gcompat vim strace net-tools curl netcat-openbsd bind-tools bash diff --git a/mongoapi/dbtestapp/student.go b/mongoapi/dbtestapp/student.go index f58106f..6d9a34d 100644 --- a/mongoapi/dbtestapp/student.go +++ b/mongoapi/dbtestapp/student.go @@ -40,18 +40,18 @@ func StudentRecordTest(c *gin.Context) { if err == nil { log.Printf("Retrieved student %v ", student) } else { - log.Printf("Failed to retrieve student %v. Error - ", student, err) + log.Printf("Failed to retrieve student %v. Error - %+v", student, err) } insertStudentInDB(collName, "John Smith", 25) // test document fetch from student that doesn't exist. qName := "Nerf Doodle" - student, err = getStudentFromDB(collName, qName) + _, err = getStudentFromDB(collName, qName) if err == nil { log.Printf("Retrieved student %v ", qName) } else { - log.Printf("Failed to retrieve student %v. Error - ", qName, err) + log.Printf("Failed to retrieve student %v. Error - %+v ", qName, err) } c.JSON(http.StatusOK, gin.H{}) } @@ -65,7 +65,7 @@ func insertStudentInDB(collName string, name string, age int) { filter := bson.M{} _, err := mongoHndl.PutOneCustomDataStructure(collName, filter, student) if err != nil { - log.Printf("Inserting student %v failed with error ", student, err) + log.Printf("Inserting student %v failed with error %+v ", student, err) return } log.Printf("Inserting student %v successful ", student)