#286 Update dependencies

docktermj · docktermj · commit 52a3add9d7b8 · 2024-06-17T10:09:44.000-04:00
diff --git a/.github/linters/.golangci.yml b/.github/linters/.golangci.yml
@@ -0,0 +1,47 @@
+run:
+  modules-download-mode: readonly
+  show-stats: true
+
+output:
+  print-linter-name: false
+  sort-results: true
+
+linters:
+  enable:
+    # List generated from: https://golangci-lint.run/usage/linters/
+    # We are enabling all defaults as well as any bug/security related
+    - asasalint
+    - asciicheck
+    - bidichk
+    - bodyclose
+    - contextcheck
+    - durationcheck
+    - errcheck
+    - errchkjson
+    - errorlint
+    - exhaustive
+    - exportloopref
+    - gocheckcompilerdirectives
+    - gochecksumtype
+    - gocritic
+    - gofmt
+    - gosec
+    - gosimple
+    - gosmopolitan
+    - govet
+    - ineffassign
+    - loggercheck
+    - makezero
+    - musttag
+    - nilerr
+    - noctx
+    - protogetter
+    - reassign
+    - revive
+    - rowserrcheck
+    - spancheck
+    - sqlclosecheck
+    - staticcheck
+    - testifylint
+    - unused
+    - zerologlint
diff --git a/.github/linters/.jscpd.json b/.github/linters/.jscpd.json
@@ -1,3 +1,6 @@
 {
+  "ignore": [
+    "**/*.go,**/go-test*.yaml"
+  ],
   "threshold": 13
 }
diff --git a/.github/workflows/go-test-darwin.yaml.disabled b/.github/workflows/go-test-darwin.yaml.disabled
@@ -1,11 +1,11 @@
 name: go test darwin
 
-on: [push]
+on: [pull_request, workflow_dispatch]
 
 env:
   DYLD_LIBRARY_PATH: /opt/senzing/g2/lib:/opt/senzing/g2/lib/macos
   LD_LIBRARY_PATH: /opt/senzing/g2/lib:/opt/senzing/g2/lib/macos
-  SENZING_TOOLS_DATABASE_URL: sqlite3://na:na@/tmp/sqlite/G2C.db
+  SENZING_TOOLS_DATABASE_URL: sqlite3://na:na@nowhere/tmp/sqlite/G2C.db
 
 permissions:
   contents: read
@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         go: ["1.21"]
-        os: [macos-latest]
+        os: [macos-13]
         senzingapi-version: [staging-v4]
 
     steps:
@@ -43,4 +43,15 @@ jobs:
         run: mkdir /tmp/sqlite && cp testdata/sqlite/G2C.db /tmp/sqlite/G2C.db
 
       - name: run go test
-        run: go test -exec /Users/runner/work/serve-grpc/serve-grpc/bin/macos_exec_dyld.sh -v -p 1 ./...
+        run: go test -exec /Users/runner/work/serve-grpc/serve-grpc/bin/macos_exec_dyld.sh -v -p 1 -coverprofile=./cover.out -covermode=atomic -coverpkg=./... ./...
+
+      - name: Store coverage file
+        uses: actions/upload-artifact@v4
+        with:
+          name: cover.out
+          path: ./cover.out
+
+  coverage:
+    name: coverage
+    needs: go-test-darwin
+    uses: senzing-factory/build-resources/.github/workflows/go-coverage.yaml@v2
diff --git a/.github/workflows/go-test-linux.yaml b/.github/workflows/go-test-linux.yaml
@@ -4,7 +4,8 @@ on: [push]
 
 env:
   LD_LIBRARY_PATH: /opt/senzing/g2/lib
-  SENZING_TOOLS_DATABASE_URL: sqlite3://na:na@/tmp/sqlite/G2C.db
+  SENZING_LOG_LEVEL: TRACE
+  SENZING_TOOLS_DATABASE_URL: sqlite3://na:na@nowhere/tmp/sqlite/G2C.db
 
 permissions:
   contents: read
@@ -30,16 +31,40 @@ jobs:
         with:
           go-version: ${{ matrix.go }}
 
-      - name: install Senzing API Runtime
+      - name: install Senzing API
         uses: senzing-factory/github-action-install-senzing-api@v3
         with:
           senzingapi-runtime-version: ${{ matrix.senzingapi-version }}
 
+      - name: Set up gotestfmt
+        uses: gotesttools/gotestfmt-action@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+
       - name: copy /etc files
         run: sudo cp testdata/senzing-license/g2.lic /etc/opt/senzing/g2.lic
 
       - name: copy test database files
         run: mkdir /tmp/sqlite && cp testdata/sqlite/G2C.db /tmp/sqlite/G2C.db
 
       - name: run go test
-        run: go test -v -p 1 ./...
+        run: go test -json -v -p 1 -coverprofile=./cover.out -covermode=atomic -coverpkg=./... ./...  2>&1 | tee /tmp/gotest.log | gotestfmt
+
+      - name: Store coverage file
+        uses: actions/upload-artifact@v4
+        with:
+          name: cover.out
+          path: ./cover.out
+
+      - name: Upload test log
+        uses: actions/upload-artifact@v2
+        if: always()
+        with:
+          name: test-log
+          path: /tmp/gotest.log
+          if-no-files-found: error
+
+  coverage:
+    name: coverage
+    needs: go-test-linux
+    uses: senzing-factory/build-resources/.github/workflows/go-coverage.yaml@v2
diff --git a/.github/workflows/go-test-windows.yaml b/.github/workflows/go-test-windows.yaml
@@ -1,9 +1,9 @@
 name: go test windows
 
-on: [push]
+on: [pull_request, workflow_dispatch]
 
 env:
-  SENZING_TOOLS_DATABASE_URL: sqlite3://na:na@nowhere/C:\Temp\sqlite\G2C.db
+  SENZING_TOOLS_DATABASE_URL: "sqlite3://na:na@nowhere/C:\\Temp\\sqlite\\G2C.db"
 
 permissions:
   contents: read
@@ -44,4 +44,17 @@ jobs:
         run: mkdir "C:\Temp\sqlite" && copy testdata/sqlite/G2C.db "C:\Temp\sqlite\G2C.db"
 
       - name: run go test
-        run: go test -v -p 1 ./...
+        run: |
+          go test -v -p 1 -coverprofile=cover -covermode=atomic -coverpkg=./... ./...
+          cp cover cover.out
+
+      - name: Store coverage file
+        uses: actions/upload-artifact@v4
+        with:
+          name: cover.out
+          path: cover.out
+
+  coverage:
+    name: coverage
+    needs: go-test-windows
+    uses: senzing-factory/build-resources/.github/workflows/go-coverage.yaml@v2
diff --git a/.github/workflows/gofmt.yaml b/.github/workflows/gofmt.yaml
diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml
@@ -0,0 +1,36 @@
+name: golangci-lint
+
+on:
+  push:
+    branches-ignore: [main]
+  pull_request:
+    branches: [main]
+
+permissions:
+  # Required: allow read access to the content for analysis.
+  contents: read
+  # Optional: allow read access to pull request. Use with `only-new-issues` option.
+  pull-requests: read
+
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: setup go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.21
+
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v6
+        with:
+          args: --config=${{ github.workspace }}/.github/linters/.golangci.yml
+          only-new-issues: false
+          version: latest
diff --git a/.github/workflows/gosec.yaml b/.github/workflows/gosec.yaml
diff --git a/.github/workflows/make-go-github-file.yaml b/.github/workflows/make-go-github-file.yaml
@@ -12,7 +12,7 @@ permissions:
 jobs:
   make-go-github-file:
     secrets:
-      SENZING_GITHUB_GPG_PRIVATE_KEY: ${{ secrets.SENZING_GITHUB_GPG_PRIVATE_KEY }}
-      SENZING_GITHUB_GPG_PASSPHRASE: ${{ secrets.SENZING_GITHUB_GPG_PASSPHRASE }}
       SENZING_GITHUB_ACTOR: ${{ secrets.SENZING_GITHUB_ACTOR }}
+      SENZING_GITHUB_GPG_PASSPHRASE: ${{ secrets.SENZING_GITHUB_GPG_PASSPHRASE }}
+      SENZING_GITHUB_GPG_PRIVATE_KEY: ${{ secrets.SENZING_GITHUB_GPG_PRIVATE_KEY }}
     uses: senzing-factory/build-resources/.github/workflows/make-go-github-file.yaml@v2
diff --git a/Makefile b/Makefile
@@ -33,9 +33,10 @@ GO_ARCH = $(word 2, $(GO_OSARCH))
 
 # Conditional assignment. ('?=')
 # Can be overridden with "export"
-# Example: "export LD_LIBRARY_PATH=/path/to/my/senzing/g2/lib"
+# Example: "export LD_LIBRARY_PATH=/path/to/my/senzing-garage/g2/lib"
 
 LD_LIBRARY_PATH ?= /opt/senzing/g2/lib
+GOBIN ?= $(shell go env GOPATH)/bin
 SENZING_TOOLS_DATABASE_URL ?= sqlite3://na:na@/tmp/sqlite/G2C.db
 
 # Export environment variables.
@@ -64,6 +65,12 @@ hello-world: hello-world-osarch-specific
 # Dependency management
 # -----------------------------------------------------------------------------
 
+.PHONY: make-dependencies
+make-dependencies:
+	@go install github.com/vladopajic/go-test-coverage/v2@latest
+	@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.58.1
+
+
 .PHONY: dependencies
 dependencies:
 	@go get -u ./...
@@ -99,6 +106,28 @@ docker-build:
 .PHONY: test
 test: test-osarch-specific
 
+# -----------------------------------------------------------------------------
+# Coverage
+# -----------------------------------------------------------------------------
+
+.PHONY: coverage
+coverage: coverage-osarch-specific
+
+
+.PHONY: check-coverage
+check-coverage: export SENZING_LOG_LEVEL=TRACE
+check-coverage:
+	go test ./... -coverprofile=./cover.out -covermode=atomic -coverpkg=./...
+	${GOBIN}/go-test-coverage --config=./.testcoverage.yml
+
+# -----------------------------------------------------------------------------
+# Lint
+# -----------------------------------------------------------------------------
+
+.PHONY: run-golangci-lint
+run-golangci-lint:
+	${GOBIN}/golangci-lint run --config=.github/linters/.golangci.yml
+
 # -----------------------------------------------------------------------------
 # Run
 # -----------------------------------------------------------------------------
diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/senzing-garage/go-logging v1.5.0
 	github.com/senzing-garage/go-observing v0.3.2
 	github.com/senzing-garage/sz-sdk-go v0.13.4
-	github.com/senzing-garage/sz-sdk-go-core v0.7.2-0.20240613215505-2784a96de8b7
+	github.com/senzing-garage/sz-sdk-go-core v0.7.3
 	github.com/senzing-garage/sz-sdk-proto v0.7.6
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/viper v1.19.0
diff --git a/go.sum b/go.sum
@@ -49,8 +49,8 @@ github.com/senzing-garage/go-observing v0.3.2 h1:jXW5u656aZywe/UEUi7ga7nieBSW4CU
 github.com/senzing-garage/go-observing v0.3.2/go.mod h1:5yHCwaaIrwX81JOghAL/1Q1V8eF7SQhyBBdhTb7+rgY=
 github.com/senzing-garage/sz-sdk-go v0.13.4 h1:x1VWf4Kch8wlEPVEVOWbizhYyCbp5LiTSm9cQsv9XJI=
 github.com/senzing-garage/sz-sdk-go v0.13.4/go.mod h1:pr9d622FPNGFPgAFooCcUWNeh+AEyVDkvR3Fmsp6whg=
-github.com/senzing-garage/sz-sdk-go-core v0.7.2-0.20240613215505-2784a96de8b7 h1:wzO15ErgeBWUuU31ihnrMLXR6UdZw18PRCcvGY24gTk=
-github.com/senzing-garage/sz-sdk-go-core v0.7.2-0.20240613215505-2784a96de8b7/go.mod h1:+N+l991tA8PHqtKD/f8ubZ/KaedN4uiXB6oHsQo+b6g=
+github.com/senzing-garage/sz-sdk-go-core v0.7.3 h1:hRG/xSzal+uPY3UAhdPv+nQNwiTMoyNOQ2bgY8QfmqQ=
+github.com/senzing-garage/sz-sdk-go-core v0.7.3/go.mod h1:+N+l991tA8PHqtKD/f8ubZ/KaedN4uiXB6oHsQo+b6g=
 github.com/senzing-garage/sz-sdk-proto v0.7.6 h1:mHiZr094UTBcRW1OkNam1Pu/pMLZRO/4cIIyjQ/yDlY=
 github.com/senzing-garage/sz-sdk-proto v0.7.6/go.mod h1:7CZSZ5yEVmT2T0yiijjdq7dWsdQ/KtRgvKRqCy+j7SI=
 github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
diff --git a/makefiles/darwin.mk b/makefiles/darwin.mk
@@ -9,19 +9,28 @@ SENZING_TOOLS_SENZING_DIRECTORY ?= $(SENZING_DIR)
 
 LD_LIBRARY_PATH := $(SENZING_TOOLS_SENZING_DIRECTORY)/lib:$(SENZING_TOOLS_SENZING_DIRECTORY)/lib/macos
 DYLD_LIBRARY_PATH := $(LD_LIBRARY_PATH)
-SENZING_TOOLS_DATABASE_URL ?= sqlite3://na:na@/tmp/sqlite/G2C.db
+SENZING_TOOLS_DATABASE_URL ?= sqlite3://na:na@nowhere/tmp/sqlite/G2C.db
 
 # -----------------------------------------------------------------------------
 # OS specific targets
 # -----------------------------------------------------------------------------
 
 .PHONY: clean-osarch-specific
 clean-osarch-specific:
-	@docker rm --force $(DOCKER_CONTAINER_NAME) 2> /dev/null || true
+	@docker rm  --force $(DOCKER_CONTAINER_NAME) 2> /dev/null || true
 	@docker rmi --force $(DOCKER_IMAGE_NAME) $(DOCKER_BUILD_IMAGE_NAME) 2> /dev/null || true
-	@rm -rf $(TARGET_DIRECTORY) || true
-	@rm -f $(GOPATH)/bin/$(PROGRAM_NAME) || true
-	@rm -rf /tmp/sqlite || true
+	@rm -f  $(GOPATH)/bin/$(PROGRAM_NAME) || true
+	@rm -f  $(MAKEFILE_DIRECTORY)/coverage.html || true
+	@rm -f  $(MAKEFILE_DIRECTORY)/coverage.out || true
+	@rm -fr $(TARGET_DIRECTORY) || true
+	@rm -fr /tmp/sqlite || true
+
+
+.PHONY: coverage-osarch-specific
+coverage-osarch-specific:
+	@go test -v -coverprofile=coverage.out -p 1 ./...
+	@go tool cover -html="coverage.out" -o coverage.html
+	@open file://$(MAKEFILE_DIRECTORY)/coverage.html
 
 
 .PHONY: hello-world-osarch-specific
diff --git a/makefiles/linux.mk b/makefiles/linux.mk
diff --git a/makefiles/windows.mk b/makefiles/windows.mk

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,6 @@`
`1`	`1`	`{`
	`2`	`+ "ignore": [`
	`3`	`+ "*/.go,*/go-test.yaml"`
	`4`	`+ ],`
`2`	`5`	`"threshold": 13`
`3`	`6`	`}`