(MAINT) Rev go to 1.19 and fix ensuing problems. (#51)

Author: eoinmcq

.github/workflows/code-quality.yml

@@ -14,9 +14,9 @@ jobs:
       - name: Set up Go environment
         uses: actions/setup-go@v4
         with:
-          go-version: 1.16
+          go-version: 1.19
       - name: Run linters
         uses: golangci/golangci-lint-action@v3
         with:
           args: "--timeout=3m --verbose"
-          version: v1.49
+          version: v1.55.2

.github/workflows/testing.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Set up Go environment
         uses: actions/setup-go@v4
         with:
-          go-version: 1.16
+          go-version: 1.19
       - name: Run unit tests
         run: |
           make test

.golangci.yml

@@ -21,6 +21,7 @@ linters:
     - varcheck            # deprecated
     - varnamelen          # disallows short variable names even if they are appropriate
     - wsl                 # too aggressive
+    - depguard
 
 linters-settings:
   funlen:

Makefile

@@ -2,7 +2,7 @@ COMMIT=$(shell git describe --always)
 NOW=$(shell date +'%Y-%m-%d_%T')
 TEST_SERVICE=test-generated-service
 
-all: lint test test-generated-service build
+all: lint test build test-generated-service
 
 # install development tools
 PHONY+= install-tools
@@ -46,6 +46,8 @@ test-generated-service:
 	@echo "$(OK_COLOR)==>Testing generated service.$(NO_COLOR)"
 	@mkdir -p $(PWD)/$(TEST_SERVICE)
 	@go run -ldflags "-X main.name=$(TEST_SERVICE) -X main.serviceDir=$(PWD)/$(TEST_SERVICE) -X main.listenAddress=:8888 -X main.listenPort=8888" cmd/service-generator/main.go
+	@go mod tidy
+	@go get github.com/gin-gonic/gin
 	@cd $(PWD)/$(TEST_SERVICE);go test ./...
 	@rm -rf $(PWD)/$(TEST_SERVICE)
 

cmd/cert-generator/main.go

@@ -67,29 +67,29 @@ func main() {
 	}
 
 	if generateCAFiles != nil && *generateCAFiles {
-		err = os.WriteFile(fmt.Sprint(filepath.Join(filepath.Clean(*directory), "ca.crt")), CAKeyPair.Certificate,
+		err = os.WriteFile(filepath.Join(filepath.Clean(*directory), "ca.crt"), CAKeyPair.Certificate,
 			fileModeUserReadWriteOnly)
 		if err != nil {
 			fmt.Printf("Failed to write CA certificate file to disk :%s", err)
 			os.Exit(errorExitCode)
 		}
 
-		err = os.WriteFile(fmt.Sprint(filepath.Join(filepath.Clean(*directory), "ca.key")), CAKeyPair.PrivateKey,
+		err = os.WriteFile(filepath.Join(filepath.Clean(*directory), "ca.key"), CAKeyPair.PrivateKey,
 			fileModeUserReadWriteOnly)
 		if err != nil {
 			fmt.Printf("Failed to write CA key file to disk: %s.", err)
 			os.Exit(errorExitCode)
 		}
 	}
 
-	err = os.WriteFile(fmt.Sprint(filepath.Join(filepath.Clean(*directory), "tls.crt")), certKeyPair.Certificate,
+	err = os.WriteFile(filepath.Join(filepath.Clean(*directory), "tls.crt"), certKeyPair.Certificate,
 		fileModeUserReadWriteOnly)
 	if err != nil {
 		fmt.Printf("Failed to write TLS cert file to disk: %s.", err)
 		os.Exit(errorExitCode)
 	}
 
-	err = os.WriteFile(fmt.Sprint(filepath.Join(filepath.Clean(*directory), "tls.key")), certKeyPair.PrivateKey,
+	err = os.WriteFile(filepath.Join(filepath.Clean(*directory), "tls.key"), certKeyPair.PrivateKey,
 		fileModeUserReadWriteOnly)
 	if err != nil {
 		fmt.Printf("Failed to write TLS key file to disk: %s.", err)

go.mod

@@ -1,18 +1,65 @@
 module github.com/puppetlabs/go-libs
 
-go 1.16
+go 1.19
 
 require (
 	github.com/cnjack/throttle v0.0.0-20160727064406-525175b56e18
-	github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 // indirect
 	github.com/gin-contrib/cors v1.4.0
-	github.com/gin-gonic/gin v1.8.1
-	github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab // indirect
+	github.com/gin-gonic/gin v1.9.1
 	github.com/imdario/mergo v0.3.15
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/prometheus/client_golang v1.14.0
-	github.com/sirupsen/logrus v1.9.0
+	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/viper v1.14.0
 	github.com/toorop/gin-logrus v0.0.0-20210225092905-2c785434f26f
 	gotest.tools v2.2.0+incompatible
 )
+
+require (
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/bytedance/sonic v1.9.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+	github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
+	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab // indirect
+	github.com/go-playground/locales v0.14.1 // indirect
+	github.com/go-playground/universal-translator v0.18.1 // indirect
+	github.com/go-playground/validator/v10 v10.14.0 // indirect
+	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
+	github.com/leodido/go-urn v1.2.4 // indirect
+	github.com/magiconair/properties v1.8.6 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/common v0.37.0 // indirect
+	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/spf13/afero v1.9.2 // indirect
+	github.com/spf13/cast v1.5.0 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/subosito/gotenv v1.4.1 // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	github.com/ugorji/go/codec v1.2.11 // indirect
+	golang.org/x/arch v0.3.0 // indirect
+	golang.org/x/crypto v0.9.0 // indirect
+	golang.org/x/net v0.10.0 // indirect
+	golang.org/x/sys v0.8.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)