Skip to content

Commit 43ffce3

Browse files
committedSep 30, 2024·
REORG/MAJOR: Merge config-parser into client-native 5.1
1 parent c88a8e5 commit 43ffce3

File tree

645 files changed

+74928
-181
lines changed

Some content is hidden

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

645 files changed

+74928
-181
lines changed
 

‎.golangci.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,10 @@ issues:
6767
# bugs of typecheck linter
6868
- "undeclared name: `shellquote`"
6969
- "github.com/kballard/go-shellquote\" imported but not used"
70-
- "github.com/haproxytech/config-parser/v5/types\" imported but not used"
70+
- "github.com/haproxytech/client-native/v5/config-parser/types\" imported but not used"
71+
- "unused-parameter: parameter 'comment' seems to be unused"
72+
- "unused-parameter: parameter 'parts' seems to be unused"
73+
- "unused-parameter: parameter 'parserType' seems to be unused"
7174

7275
run:
7376
skip-dirs:

‎Makefile

+5-1
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,16 @@ e2e-docker:
1818
docker build -f e2e/Dockerfile --build-arg GO_VERSION=${GO_VERSION} --build-arg HAPROXY_VERSION=${DOCKER_HAPROXY_VERSION} -t client-native-test:${DOCKER_HAPROXY_VERSION} .
1919
docker run --rm -t client-native-test:${DOCKER_HAPROXY_VERSION}
2020

21+
.PHONY: gentypes
22+
gentypes:
23+
cd config-parser && go run generate/*.go ${PROJECT_PATH}/config-parser
24+
2125
.PHONY: spec
2226
spec:
2327
go run specification/build/build.go -file specification/haproxy-spec.yaml > specification/build/haproxy_spec.yaml
2428

2529
.PHONY: models
26-
models: spec swagger-check
30+
models: gentypes spec swagger-check
2731
./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}
2832
rm -rf models/*_compare.go
2933
rm -rf models/*_compare_test.go

0 commit comments

Comments
 (0)
Please sign in to comment.