Skip to content

Commit 2d5fce9

Browse files
ivanmatmatioktalz
authored andcommitted
MEDIUM: switch to go-method-gen for methods generation
1 parent b4cdf62 commit 2d5fce9

917 files changed

Lines changed: 31917 additions & 73227 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ bin/check-commit
44
bin/golangci-lint
55
bin/swagger
66
.envrc
7+
bin/go-method-gen

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ generate:
7878
tags:
7979
- go
8080
before_script:
81-
- rm -rf models/*
81+
- find -maxdepth 1 -type f -name "*.go" -exec rm {} \;
8282
- make models
8383
script:
8484
- test -z "$(git diff 2> /dev/null)" || exit "Models are not generated, issue \`make models\` and commit the result"

Makefile

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,27 @@ models: gentypes spec swagger-check
4343
go run cmd/kubebuilder_marker_generator/*.go ${PROJECT_PATH}/models
4444
go run cmd/server_params_runtime/*.go ${PROJECT_PATH}/models
4545

46+
.PHONY: models-with-go-method-gen
47+
models-with-go-method-gen: gentypes spec go-method-gen-check
48+
./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}
49+
rm -rf models/server_params_prepare_for_runtime.go
50+
rm -rf models/*_generated*.go
51+
./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
52+
go run cmd/struct_tags_checker/*.go ${PROJECT_PATH}/models
53+
go run cmd/kubebuilder_marker_generator/*.go ${PROJECT_PATH}/models
54+
go run cmd/server_params_runtime/*.go ${PROJECT_PATH}/models
55+
56+
.PHONY: go-method-gen-check
57+
go-method-gen-check:
58+
@GO_METHOD_GEN_BIN_NAME="go-method-gen"; \
59+
GO_METHOD_GEN_GITHUB="github.com/haproxytech/go-method-gen/cmd/go-method-gen@latest"; \
60+
if [ -f "$$GO_METHOD_GEN_BIN_NAME" ]; then \
61+
echo "$$GO_METHOD_GEN_BIN_NAME already installed"; \
62+
else \
63+
GOBIN=$(PWD)/bin go install $$GO_METHOD_GEN_GITHUB && \
64+
echo "$$GO_METHOD_GEN_BIN_NAME installed"; \
65+
fi
66+
4667
.PHONY: swagger-check
4768
swagger-check:
4869
cd bin; SWAGGER_VERSION=${SWAGGER_VERSION} sh swagger-check.sh

models/acl_compare.go

Lines changed: 0 additions & 103 deletions
This file was deleted.

models/acl_compare_test.go

Lines changed: 0 additions & 188 deletions
This file was deleted.

models/acl_diff_generated.go

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/acl_equal_generated.go

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)