Merge remote-tracking branch 'upstream/main' into pr/68

Author: mromaszewicz

.github/workflows/ci.yml

@@ -1,25 +1,12 @@
-name: Build project
-on: [ push, pull_request ]
+name: CI
+on:
+  push: {}
+  pull_request: {}
+  workflow_dispatch: {}
+permissions:
+  contents: read
 jobs:
   build:
-    name: Build
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      # perform matrix testing to give us an earlier insight into issues with different versions of supported major versions of Go
-      matrix:
-        version:
-        - "1.20"
-        - "1.21"
-        - "1.22"
-    steps:
-      - name: Check out source code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-
-      - name: Set up Go
-        uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5
-        with:
-          go-version: ${{ matrix.version }}
-
-      - name: Test
-        run: make test
+    uses: oapi-codegen/actions/.github/workflows/ci.yml@75566d848d25021f137594c947f26171094fb511 # v0.5.0
+    with:
+      lint_versions: '["1.25"]'

.github/workflows/generate.yml

@@ -0,0 +1,33 @@
+name: Determine known CVEs through `govulncheck`
+on:
+  push:
+    branches:
+      - main
+  schedule:
+    # Mondays at 0000
+    - cron: "0 0 * * 1"
+jobs:
+  check-for-vulnerabilities:
+    name: Check for vulnerabilities using `govulncheck`
+    runs-on: ubuntu-latest
+    permissions:
+      security-events: write
+      contents: read
+    steps:
+      - uses: golang/govulncheck-action@b625fbe08f3bccbe446d94fbf87fcc875a4f50ee # v1.0.4
+        with:
+          go-package: ./...
+          # NOTE that we want to produce the SARIF-formatted report, which can then be consumed by other tools ...
+          output-format: sarif
+          output-file: govulncheck.sarif
+
+      # ... such as the Code Scanning tab (https://github.com/oapi-codegen/runtime/security/code-scanning?query=is%3Aopen+branch%3Amain+tool%3Agovulncheck)
+      - name: Upload SARIF file
+        uses: github/codeql-action/upload-sarif@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.2
+        with:
+          sarif_file: govulncheck.sarif
+          category: govulncheck
+
+      - name: Print code scanning results URL
+        run: |
+          echo "Results: https://github.com/${{ github.repository }}/security/code-scanning?query=is%3Aopen+branch%3Amain+tool%3Agovulncheck"

.github/workflows/govulncheck.yml

@@ -16,7 +16,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@09c613e259eb8d4e7c81c2cb00618eb5fc4575a7 # v5
+      - uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6
         with:
           name: next
           tag: next

.github/workflows/lint.yml

@@ -1,32 +1,44 @@
 GOBASE=$(shell pwd)
 GOBIN=$(GOBASE)/bin
 
-help:
-	@echo "This is a helper makefile for oapi-codegen"
-	@echo "Targets:"
-	@echo "    generate:    regenerate all generated files"
-	@echo "    test:        run all tests"
-	@echo "    gin_example  generate gin example server code"
-	@echo "    tidy         tidy go mod"
-
 $(GOBIN)/golangci-lint:
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) v1.55.2
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) v2.10.1
 
 .PHONY: tools
 tools: $(GOBIN)/golangci-lint
 
 lint: tools
+	# run the root module explicitly, to prevent recursive calls by re-invoking `make ...` top-level
 	$(GOBIN)/golangci-lint run ./...
+	# then, for all child modules, use a module-managed `Makefile`
+	git ls-files '**/*go.mod' -z | xargs -0 -I{} bash -xc 'cd $$(dirname {}) && env GOBIN=$(GOBIN) make lint'
 
 lint-ci: tools
-	$(GOBIN)/golangci-lint run ./... --out-format=github-actions --timeout=5m
+	# for the root module, explicitly run the step, to prevent recursive calls
+	$(GOBIN)/golangci-lint run ./... --output.text.path=stdout --timeout=5m
+	# then, for all child modules, use a module-managed `Makefile`
+	git ls-files '**/*go.mod' -z | xargs -0 -I{} bash -xc 'cd $$(dirname {}) && env GOBIN=$(GOBIN) make lint-ci'
 
 generate:
+	# for the root module, explicitly run the step, to prevent recursive calls
 	go generate ./...
+	# then, for all child modules, use a module-managed `Makefile`
+	git ls-files '**/*go.mod' -z | xargs -0 -I{} bash -xc 'cd $$(dirname {}) && make generate'
 
 test:
+	# for the root module, explicitly run the step, to prevent recursive calls
 	go test -cover ./...
+	# then, for all child modules, use a module-managed `Makefile`
+	git ls-files '**/*go.mod' -z | xargs -0 -I{} bash -xc 'cd $$(dirname {}) && make test'
 
 tidy:
-	@echo "tidy..."
+	# for the root module, explicitly run the step, to prevent recursive calls
 	go mod tidy
+	# then, for all child modules, use a module-managed `Makefile`
+	git ls-files '**/*go.mod' -z | xargs -0 -I{} bash -xc 'cd $$(dirname {}) && make tidy'
+
+tidy-ci:
+	# for the root module, explicitly run the step, to prevent recursive calls
+	tidied -verbose
+	# then, for all child modules, use a module-managed `Makefile`
+	git ls-files '**/*go.mod' -z | xargs -0 -I{} bash -xc 'cd $$(dirname {}) && make tidy-ci'

.github/workflows/release-drafter.yml

@@ -288,7 +288,12 @@ func bindAdditionalProperties(additionalProperties reflect.Value, parentStruct r
 
 func marshalFormImpl(v reflect.Value, result url.Values, name string) {
 	switch v.Kind() {
-	case reflect.Interface, reflect.Ptr:
+	case reflect.Ptr:
+		if v.IsNil() {
+			break
+		}
+		fallthrough
+	case reflect.Interface:
 		marshalFormImpl(v.Elem(), result, name)
 	case reflect.Slice:
 		for i := 0; i < v.Len(); i++ {

.github/workflows/tidy.yml

@@ -133,6 +133,7 @@ func TestMarshalForm(t *testing.T) {
 		StructSlice     []testSubStruct  `json:"struct_slice,omitempty"`
 		OptInt          *int             `json:"opt_int,omitempty"`
 		OptBool         *bool            `json:"opt_bool,omitempty"`
+		OptBoolNullable *bool            `json:"opt_bool_nullable"`
 		OptString       *string          `json:"opt_string,omitempty"`
 		OptStruct       *testSubStruct   `json:"opt_struct,omitempty"`
 		OptStructSlice  *[]testSubStruct `json:"opt_struct_slice,omitempty"`
@@ -151,6 +152,7 @@ func TestMarshalForm(t *testing.T) {
 		},
 		"opt_int=456":    {OptInt: func(v int) *int { return &v }(456)},
 		"opt_bool=true":  {OptBool: func(v bool) *bool { return &v }(true)},
+		"":               {OptBoolNullable: nil},
 		"opt_string=def": {OptString: func(v string) *string { return &v }("def")},
 		"opt_struct[int]=456&opt_struct[string]=def": {OptStruct: &testSubStruct{Int: 456, String: "def"}},
 		"opt_struct_slice[0][int]=123&opt_struct_slice[0][string]=abc&opt_struct_slice[1][int]=456&opt_struct_slice[1][string]=def": {