Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support nginx conf #1130

Merged
merged 23 commits into from
Nov 10, 2023
Merged

Support nginx conf #1130

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
6e0e682
finish include directive
suchen-sci Oct 30, 2023
52cddb0
httpserver spec support wildcards
suchen-sci Oct 31, 2023
c8fa3e2
get server info from nginx.conf
suchen-sci Oct 31, 2023
4d4c0b0
finish parse part of nginx convert
suchen-sci Nov 1, 2023
4219c60
fix bug
suchen-sci Nov 1, 2023
db56904
optim
suchen-sci Nov 2, 2023
f81a0c9
finish convert code
suchen-sci Nov 2, 2023
09a055b
mv omitempty from jsonschema to json, to the generated yaml is more c…
suchen-sci Nov 2, 2023
977554f
finish nginx convert code
suchen-sci Nov 3, 2023
17d5e70
fix go.mod
suchen-sci Nov 3, 2023
970e3af
add more test for parse
suchen-sci Nov 7, 2023
0d472e4
add more test for convert
suchen-sci Nov 7, 2023
5a8c606
add more test in cmd
suchen-sci Nov 7, 2023
6d47267
add tests
suchen-sci Nov 7, 2023
96f36eb
Merge branch 'main' into support-nginx-conf
suchen-sci Nov 7, 2023
d966e40
fix conflict
suchen-sci Nov 7, 2023
3fdb6fd
add more test
suchen-sci Nov 8, 2023
1f88675
add doc
suchen-sci Nov 8, 2023
423867c
add comments to variables and functions
suchen-sci Nov 8, 2023
64689a2
Update cmd/client/commandv2/convert.go
suchen-sci Nov 10, 2023
1f9f2cb
Update cmd/client/commandv2/convert/nginx/cmd.go
suchen-sci Nov 10, 2023
f7c6ba2
udpate based on review advice
suchen-sci Nov 10, 2023
8471544
fix test
suchen-sci Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix test
  • Loading branch information
@suchen-sci
suchen-sci committed Nov 10, 2023
commit 847154464f9a62a91eb618d61cd3ccd25599efbc
4 changes: 2 additions & 2 deletions cmd/client/commandv2/convert/nginx/cmd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ func TestCmd(t *testing.T) {
assert.NotNil(t, cmd.Args(cmd, []string{}))

cmd.ParseFlags([]string{"-o", "test.yaml"})
assert.NotNil(t, cmd.Args(cmd, []string{}))
assert.Nil(t, cmd.Args(cmd, []string{}))

cmd.ParseFlags([]string{"--prefix", "test"})
cmd.ParseFlags([]string{"--resource-prefix", "test"})
assert.Nil(t, cmd.Args(cmd, []string{}))

tempDir := newTempTestDir(t)
Expand Down
Loading