Upgrade to golang 1.22

- Upgrade swag
- Upgrade golangci-lint
- Upgrade packages

Author: arunvelsriram

.golangci.yml

@@ -5,5 +5,11 @@ linters:
   enable:
     - revive
     - gofmt
+linters-settings:
+  revive:
+    # severity: warning
+    rules:
+      - name: package-comments
+        disabled: true
 issues:
   exclude-use-default: false

Makefile

@@ -2,12 +2,12 @@
 help: ## Prints help (only for targets with comments)
 	@grep -E '^[a-zA-Z._-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
-GO111MODULE=on
 APP=dobby
 VERSION?=1.0
 APP_EXECUTABLE="./out/$(APP)"
 SRC_PACKAGES=$(shell go list ./... | grep -v "vendor")
 SHELL=/bin/bash -o pipefail
+GOPATH=$(shell go env GOPATH)
 
 ifeq ($(GOMETA_LINT),)
 	GOMETA_LINT=$(shell command -v $(PWD)/bin/golangci-lint 2> /dev/null)
@@ -33,7 +33,7 @@ else
 endif
 
 GOLANGCI_LINT=$(shell command -v golangci-lint 2> /dev/null)
-GOLANGCI_LINT_VERSION=v1.41.1
+GOLANGCI_LINT_VERSION=v1.59.1
 ifeq ($(GOLANGCI_LINT),)
 	GOLANGCI_LINT=$(shell command -v $(PWD)/bin/golangci-lint 2> /dev/null)
 endif
@@ -44,18 +44,18 @@ endif
 
 setup-richgo:
 ifeq ($(RICHGO),)
-	GO111MODULE=off $(GO_BINARY) get -u github.com/kyoh86/richgo
+	$(GO_BINARY) get -u github.com/kyoh86/richgo
 endif
 
 setup-golangci-lint:
 ifeq ($(GOLANGCI_LINT),)
-	curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s $(GOLANGCI_LINT_VERSION)
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin $(GOLANGCI_LINT_VERSION)
 endif
 
 SWAG=$(shell command -v swag 2> /dev/null)
 setup-swag:
 ifeq ($(SWAG),)
-	GO111MODULE=off $(GO_BINARY) get -u github.com/swaggo/swag/cmd/swag
+	$(GO_BINARY) install github.com/swaggo/swag/cmd/swag@latest
 endif
 
 setup: setup-golangci-lint setup-swag ensure-build-dir ## Setup environment

docs/docs.go

@@ -1,21 +1,13 @@
-// Package docs GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-// This file was generated by swaggo/swag
+// Package docs Code generated by swaggo/swag. DO NOT EDIT
 package docs
 
-import (
-	"bytes"
-	"encoding/json"
-	"strings"
-	"text/template"
+import "github.com/swaggo/swag"
 
-	"github.com/swaggo/swag"
-)
-
-var doc = `{
+const docTemplate = `{
     "schemes": {{ marshal .Schemes }},
     "swagger": "2.0",
     "info": {
-        "description": "{{.Description}}",
+        "description": "{{escape .Description}}",
         "title": "{{.Title}}",
         "contact": {},
         "version": "{{.Version}}"
@@ -66,7 +58,8 @@ var doc = `{
                 "tags": [
                     "Control"
                 ],
-                "summary": "Suicide"
+                "summary": "Suicide",
+                "responses": {}
             }
         },
         "/control/goturbo/cpu": {
@@ -485,9 +478,7 @@ var doc = `{
         "model.CallRequest": {
             "type": "object",
             "properties": {
-                "body": {
-                    "type": "object"
-                },
+                "body": {},
                 "method": {
                     "type": "string"
                 },
@@ -555,49 +546,20 @@ var doc = `{
     }
 }`
 
-type swaggerInfo struct {
-	Version     string
-	Host        string
-	BasePath    string
-	Schemes     []string
-	Title       string
-	Description string
-}
-
 // SwaggerInfo holds exported Swagger Info so clients can modify it
-var SwaggerInfo = swaggerInfo{
-	Version:     "",
-	Host:        "",
-	BasePath:    "",
-	Schemes:     []string{},
-	Title:       "",
-	Description: "",
-}
-
-type s struct{}
-
-func (s *s) ReadDoc() string {
-	sInfo := SwaggerInfo
-	sInfo.Description = strings.Replace(sInfo.Description, "\n", "\\n", -1)
-
-	t, err := template.New("swagger_info").Funcs(template.FuncMap{
-		"marshal": func(v interface{}) string {
-			a, _ := json.Marshal(v)
-			return string(a)
-		},
-	}).Parse(doc)
-	if err != nil {
-		return doc
-	}
-
-	var tpl bytes.Buffer
-	if err := t.Execute(&tpl, sInfo); err != nil {
-		return doc
-	}
-
-	return tpl.String()
+var SwaggerInfo = &swag.Spec{
+	Version:          "",
+	Host:             "",
+	BasePath:         "",
+	Schemes:          []string{},
+	Title:            "",
+	Description:      "",
+	InfoInstanceName: "swagger",
+	SwaggerTemplate:  docTemplate,
+	LeftDelim:        "{{",
+	RightDelim:       "}}",
 }
 
 func init() {
-	swag.Register(swag.Name, &s{})
+	swag.Register(SwaggerInfo.InstanceName(), SwaggerInfo)
 }

docs/swagger.json

@@ -47,7 +47,8 @@
                 "tags": [
                     "Control"
                 ],
-                "summary": "Suicide"
+                "summary": "Suicide",
+                "responses": {}
             }
         },
         "/control/goturbo/cpu": {
@@ -466,9 +467,7 @@
         "model.CallRequest": {
             "type": "object",
             "properties": {
-                "body": {
-                    "type": "object"
-                },
+                "body": {},
                 "method": {
                     "type": "string"
                 },

docs/swagger.yaml

@@ -17,8 +17,7 @@ definitions:
     type: object
   model.CallRequest:
     properties:
-      body:
-        type: object
+      body: {}
       method:
         type: string
       url:
@@ -94,6 +93,7 @@ paths:
       consumes:
       - application/json
       description: Make Dobby kill itself
+      responses: {}
       summary: Suicide
       tags:
       - Control

go.mod

@@ -1,26 +1,46 @@
 module github.com/thecasualcoder/dobby
 
-go 1.14
+go 1.22
 
 require (
-	github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
 	github.com/gin-gonic/gin v1.7.2
-	github.com/go-openapi/jsonreference v0.19.6 // indirect
-	github.com/go-openapi/spec v0.20.3 // indirect
-	github.com/go-openapi/swag v0.19.15 // indirect
-	github.com/go-playground/validator/v10 v10.8.0 // indirect
 	github.com/golang/mock v1.4.3
+	github.com/stretchr/testify v1.9.0
+	github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14
+	github.com/swaggo/gin-swagger v1.3.0
+	github.com/swaggo/swag v1.16.3
+	github.com/urfave/cli v1.22.5
+)
+
+require (
+	github.com/KyleBanks/depth v1.2.1 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/spec v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/go-playground/locales v0.13.0 // indirect
+	github.com/go-playground/universal-translator v0.17.0 // indirect
+	github.com/go-playground/validator/v10 v10.8.0 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.11 // indirect
+	github.com/leodido/go-urn v1.2.1 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-isatty v0.0.13 // indirect
-	github.com/stretchr/testify v1.6.1
-	github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14
-	github.com/swaggo/gin-swagger v1.3.0
-	github.com/swaggo/swag v1.7.0
-	github.com/ugorji/go v1.2.6 // indirect
-	github.com/urfave/cli v1.22.5
-	golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985 // indirect
-	golang.org/x/tools v0.1.5 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/ugorji/go/codec v1.2.6 // indirect
+	golang.org/x/crypto v0.25.0 // indirect
+	golang.org/x/net v0.27.0 // indirect
+	golang.org/x/sys v0.22.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/tools v0.23.0 // indirect
 	google.golang.org/protobuf v1.27.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )