MINOR: regenerate models

Author: AdamJCrawford

.aspell.yml

@@ -19,17 +19,23 @@ allowed:
   - backends
   - backport
   - bmarkovic
+  - botmgmt
+  - botmgtupdate
   - browserslist
   - bvue
+  - bwlim
   - caniuse
   - casbin
   - chmigrate
   - cli
   - clickhouse
-  - cnt  
+  - cnt
+  - codebase
   - composable
+  - cond
   - conf
   - config
+  - conns
   - const
   - cpu
   - crd
@@ -60,21 +66,28 @@ allowed:
   - eslint
   - failsafe
   - fbt
+  - fcgi
+  - usefcgiapp
   - formatter
   - formatters
   - frontend
   - frontends
   - fullpage
+  - gentype
   - github
   - gitlab
+  - godaddy
+  - gofumpt
   - gokc
   - golang
   - golangci
   - gorm
   - goroutines
   - govulncheck
+  - gotoolchain
   - gpc
-  - gpt  
+  - gpt
+  - gptstr
   - hapee
   - haproxy
   - healthcheck
@@ -112,6 +125,7 @@ allowed:
   - minsize
   - mixin
   - mkdir
+  - mpxs
   - multipartsearch
   - multiselect
   - mutex
@@ -151,9 +165,11 @@ allowed:
   - scrollbar
   - scss
   - searchselect
+  - sig
   - sni
   - spammy
   - ssl
+  - sslv
   - sso
   - struct
   - subnet
@@ -189,3 +205,5 @@ allowed:
   - yaml
   - async
   - rehaul
+  - rebase
+  - XXXX

.gitignore

@@ -4,3 +4,4 @@ bin/check-commit
 bin/golangci-lint
 bin/swagger
 .envrc
+bin/go-method-gen

.gitlab-ci.yml

@@ -78,10 +78,17 @@ generate:
   tags:
     - go
   before_script:
-    - rm -rf models/*
+    - find models -maxdepth 1 -type f -name "*.go" -exec rm {} \;
     - make models
   script:
-    - test -z "$(git diff 2> /dev/null)" || exit "Models are not generated, issue \`make models\` and commit the result"
+    - |
+      # Check for unstaged changes
+      if ! git diff --quiet 2>/dev/null; then
+          echo "Diff output:"
+          git diff
+          echo "Models are not generated. Please run \`make models\` and commit the result."
+          exit 1
+      fi
     - test -z "$(git ls-files --others --exclude-standard 2> /dev/null)" || exit "Models generation created untracked files, cannot proceed"
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

.golangci.yml

@@ -38,7 +38,8 @@ linters:
     - gci
     - goconst
     - recvcheck
-    - tenv  # deprecated
+    - tenv # deprecated
+    - gocritic
 
 issues:
   exclude-files:

Makefile

@@ -1,6 +1,6 @@
 PROJECT_PATH=${PWD}
 DOCKER_HAPROXY_VERSION?=3.2
-SWAGGER_VERSION=v0.30.2
+SWAGGER_VERSION=v0.32.3
 GO_VERSION:=${shell go mod edit -json | jq -r .Go}
 GOLANGCI_LINT_VERSION=1.64.5
 CHECK_COMMIT=5.2.0
@@ -33,15 +33,27 @@ spec:
 	go run cmd/specification/*.go -file specification/haproxy-spec.yaml > specification/build/haproxy_spec.yaml
 
 .PHONY: models
-models: gentypes spec swagger-check
+models: gentypes spec swagger-check go-method-gen-check
+	rm -rf models/*.go
 	./bin/swagger generate model --additional-initialism=FCGI -f ${PROJECT_PATH}/specification/build/haproxy_spec.yaml -r ${PROJECT_PATH}/specification/copyright.txt -m models -t ${PROJECT_PATH}
-	rm -rf models/server_params_prepare_for_runtime.go
-	rm -rf models/*_compare.go
-	rm -rf models/*_compare_test.go
+	./bin/go-method-gen --header-file=specification/copyright.txt --scan=models --debug --overrides=models/funcs/overrides.yaml && find ./generated -name "*.go" -exec cp {} ./models \; && rm -rf generated
 	go run cmd/struct_equal_generator/*.go -l ${PROJECT_PATH}/specification/copyright.txt ${PROJECT_PATH}/models
 	go run cmd/struct_tags_checker/*.go ${PROJECT_PATH}/models
 	go run cmd/kubebuilder_marker_generator/*.go  ${PROJECT_PATH}/models
 	go run cmd/server_params_runtime/*.go ${PROJECT_PATH}/models
+	go run cmd/defaults-setter/main.go ${PROJECT_PATH}/specification/build/haproxy_spec.yaml ${PROJECT_PATH}/models
+	$(MAKE) gofumpt
+
+.PHONY: go-method-gen-check
+go-method-gen-check:
+	@GO_METHOD_GEN_BIN_NAME="go-method-gen"; \
+	GO_METHOD_GEN_GITHUB="github.com/haproxytech/go-method-gen/cmd/go-method-gen@latest"; \
+	if [ -f "$$GO_METHOD_GEN_BIN_NAME" ]; then \
+		echo "✅ $$GO_METHOD_GEN_BIN_NAME already installed"; \
+	else \
+		GOBIN=$(PWD)/bin go install $$GO_METHOD_GEN_GITHUB && \
+		echo "✅ $$GO_METHOD_GEN_BIN_NAME installed"; \
+	fi
 
 .PHONY: swagger-check
 swagger-check:

bin/swagger-check.sh

@@ -3,5 +3,5 @@ V=$(./swagger version | grep version | awk 'NF>1{print $NF}')
 
 case "$V" in
   *$SWAGGER_VERSION*) echo "swagger version $V is OK" ;;
-  *)          echo "Detected $V, Installing $SWAGGER_VERSION"; GOBIN=$(pwd) go install "github.com/go-swagger/go-swagger/cmd/swagger@$SWAGGER_VERSION" ;;
+  *)          echo "Detected $V, Installing $SWAGGER_VERSION"; GOTOOLCHAIN=go1.24.6 GOBIN=$(pwd) go install "github.com/go-swagger/go-swagger/cmd/swagger@$SWAGGER_VERSION" ;;
 esac