chore: bump deps and clean code

Author: dunglas

.github/CODE_OF_CONDUCT.md

@@ -11,20 +11,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
       - name: Install Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.14'
-      - name: Docker Hub Login
-        run: docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
-        env:
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          go-version: stable
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Release
-        uses: goreleaser/goreleaser-action@v1
+        uses: goreleaser/goreleaser-action@v6
         with:
           version: latest
-          args: release
+          args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/FUNDING.yml

@@ -4,19 +4,17 @@ on:
   push:
   pull_request:
 
-env:
-  GO111MODULE: 'on'
-
 jobs:
   lint:
     name: Lint
     runs-on: ubuntu-latest
     steps:
     - name: Check out code
-      uses: actions/checkout@master
-    - name: Lint Go Code
-      uses: docker://golangci/golangci-lint:latest
+      uses: actions/checkout@v5
+    - uses: actions/setup-go@v5
       with:
-        args: golangci-lint run ./...
+        go-version: stable
+    - name: golangci-lint
+      uses: golangci/golangci-lint-action@v8
     - name: Lint Helm Chart
       run: helm lint chart/uri-template-tester

.github/workflows/cd.yml

@@ -1,3 +1,4 @@
+version: 2
 before:
   hooks:
   - go mod download
@@ -10,30 +11,22 @@ builds:
     - darwin
     - windows
   goarch:
-    - 386
+    - "386"
     - amd64
     - arm
     - arm64
 archives:
   -
-    replacements:
-      darwin: Darwin
-      linux: Linux
-      windows: Windows
-      386: i386
-      amd64: x86_64
     files:
     - COPYRIGHT
     - LICENSE
     - README.md
     - public/*
     format_overrides:
     - goos: windows
-      format: zip
+      formats: [zip]
 checksum:
   name_template: 'checksums.txt'
-snapshot:
-  name_template: "{{ .Tag }}-next"
 changelog:
   sort: asc
   filters:

.github/workflows/ci.yaml

@@ -2,4 +2,4 @@ FROM gcr.io/distroless/static
 COPY uri-template-tester /
 COPY public /public/
 CMD ["/uri-template-tester"]
-EXPOSE 80 443
+EXPOSE 80

.goreleaser.yml

@@ -2,4 +2,4 @@ module github.com/dunglas/uri-template-tester
 
 go 1.14
 
-require github.com/yosida95/uritemplate v0.0.0-20170413134207-5c22f358020b
+require github.com/yosida95/uritemplate v2.0.0+incompatible

Dockerfile

@@ -1,2 +1,4 @@
 github.com/yosida95/uritemplate v0.0.0-20170413134207-5c22f358020b h1:Lz1ji+ezbzsAY9OFYZxa+Tzao42+DMJIR6jn3N+H87I=
 github.com/yosida95/uritemplate v0.0.0-20170413134207-5c22f358020b/go.mod h1:mksJanHNnLsh6wYgt/AbBRZ4ogsHsO2uiZlm/UURY5c=
+github.com/yosida95/uritemplate v2.0.0+incompatible h1:j6LR/+4tiD14zc0Z0M8QilHLULqgZFD47XqgXQgCE1A=
+github.com/yosida95/uritemplate v2.0.0+incompatible/go.mod h1:mksJanHNnLsh6wYgt/AbBRZ4ogsHsO2uiZlm/UURY5c=

go.mod

@@ -5,10 +5,6 @@ import (
 	"os"
 )
 
-type error struct {
-	Error string
-}
-
 func main() {
 	http.HandleFunc("/match", match)
 	fs := http.FileServer(http.Dir("public"))

go.sum

@@ -3,14 +3,19 @@ package main
 import (
 	"encoding/json"
 	"fmt"
+	"log/slog"
 	"net/http"
 	"strings"
 
 	"github.com/yosida95/uritemplate"
 )
 
+type jsonError struct {
+	Error string
+}
+
 func match(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/json")
+	w.Header().Set("Content-Type", "application/payload")
 	w.Header().Set("X-Content-Type-Options", "nosniff")
 	w.Header().Set("X-Frame-Options", "deny")
 
@@ -19,39 +24,44 @@ func match(w http.ResponseWriter, r *http.Request) {
 
 	errors := make([]string, 0, 2)
 	if template == "" {
-		errors = append(errors, "The \"template\" parameter is mandatory.")
+		errors = append(errors, `The "template" parameter is mandatory.`)
 	}
 
 	uri := query.Get("uri")
 	if uri == "" {
-		errors = append(errors, "The \"uri\" parameter is mandatory.")
+		errors = append(errors, `The "uri" parameter is mandatory.`)
 	}
 
 	if len(errors) > 0 {
-		err, _ := json.MarshalIndent(error{strings.Join(errors, " ")}, "", "  ")
-		http.Error(w, string(err), http.StatusBadRequest)
+		payload, _ := json.MarshalIndent(jsonError{strings.Join(errors, " ")}, "", "  ")
+		http.Error(w, string(payload), http.StatusBadRequest)
+
 		return
 	}
 
 	tpl, err := uritemplate.New(template)
 	if nil != err {
-		err, _ := json.MarshalIndent(error{fmt.Sprintf("\"%s\" is not a valid URI template (RFC6570).", template)}, "", "  ")
-		http.Error(w, string(err), http.StatusBadRequest)
+		payload, _ := json.MarshalIndent(jsonError{fmt.Sprintf(`"%s" is not a valid URI template (RFC6570).`, template)}, "", "  ")
+		http.Error(w, string(payload), http.StatusBadRequest)
+
 		return
 	}
 
 	match := tpl.Match(uri)
 	if match == nil {
-		err, _ := json.Marshal(struct{ Match bool }{false})
-		fmt.Fprintf(w, "%s", string(err))
+		payload, _ := json.Marshal(struct{ Match bool }{false})
+		if _, err := w.Write(payload); err != nil {
+			slog.Info("failed to write response", "remote_addr", r.RemoteAddr, "error", err)
+		}
+
 		return
 	}
 
-	json, _ := json.MarshalIndent(struct {
+	payload, _ := json.MarshalIndent(struct {
 		Match  bool
 		Values uritemplate.Values
 	}{true, match}, "", "  ")
-	if _, err := w.Write(json); err != nil {
-		panic(err)
+	if _, err := w.Write(payload); err != nil {
+		slog.Info("failed to write response", "remote_addr", r.RemoteAddr, "error", err)
 	}
 }