get server info from nginx.conf

cmd/client/commandv2/convert/nginx/cmd.go

@@ -40,12 +40,12 @@ func Cmd() *cobra.Command {
  if err != nil {
  general.ExitWithErrorf("parse nginx.conf failed: %v", err)
  }
+ parsePayload(payload)
  data, err := json.Marshal(payload)
  if err != nil {
  general.ExitWithError(err)
  }
  fmt.Println(string(data))
- general.Warnf("warn")
  },
  }
  cmd.Flags().StringVarP(&nginxConf, "file", "f", "", "nginx.conf file path")

cmd/client/commandv2/convert/nginx/convert.go

@@ -16,47 +16,3 @@
  */
 
 package nginx
-
-import (
- "github.com/megaease/easegress/v2/cmd/client/general"
- crossplane "github.com/nginxinc/nginx-go-crossplane"
-)
-
-const (
- DirectiveInclude = "include"
- DirectiveHTTP = "http"
- DirectiveServer = "server"
- DirectiveLocation = "location"
-)
-
-// loadIncludes loads include files recursively.
-// The result contains all directives in the include files and the original directives.
-func loadIncludes(fileName string, directives crossplane.Directives, payload *crossplane.Payload) crossplane.Directives {
- res := crossplane.Directives{}
- for _, d := range directives {
- if d.Directive != DirectiveInclude {
- d.File = fileName
- res = append(res, d)
- continue
- }
-
- if len(d.Args) != 1 {
- continue
- }
- name := d.Args[0]
- var include crossplane.Directives
- for _, config := range payload.Config {
- if config.File == name {
- include = config.Parsed
- break
- }
- }
- if include == nil {
- general.Warnf("can't find include file %s in line %d of file %s", name, d.Line, fileName)
- continue
- }
- include = loadIncludes(name, include, payload)
- res = append(res, include...)
- }
- return res
-}

cmd/client/commandv2/convert/nginx/convert_test.go

@@ -16,96 +16,3 @@
  */
 
 package nginx
-
-import (
- "fmt"
- "testing"
-
- crossplane "github.com/nginxinc/nginx-go-crossplane"
- "github.com/stretchr/testify/assert"
-)
-
-func TestLoadIncludes(t *testing.T) {
- tempDir := newTempTestDir(t)
- defer tempDir.Clean()
-
- {
- conf := `
- events {}
- http {
- include %s;
- server {
- listen 80;
- location / {
- proxy_pass https://localhost:8888;
- }
- }
- }
- `
- conf1 := `include %s; proxy_set_header Conf-One One;`
- conf2 := `proxy_set_header Conf-Two Two;`
-
- file2 := tempDir.Create(t, []byte(conf2))
- file1 := tempDir.Create(t, []byte(fmt.Sprintf(conf1, file2)))
- file := tempDir.Create(t, []byte(fmt.Sprintf(conf, file1)))
-
- payload, err := crossplane.Parse(file, &crossplane.ParseOptions{})
- assert.Nil(t, err)
- httpDirectives := payload.Config[0].Parsed[1].Block
- httpDirectives = loadIncludes(file, httpDirectives, payload)
- assert.Equal(t, 3, len(httpDirectives))
-
- // first directive from conf2
- d2 := httpDirectives[0]
- assert.Equal(t, "proxy_set_header", d2.Directive)
- assert.Equal(t, []string{"Conf-Two", "Two"}, d2.Args)
- assert.Equal(t, file2, d2.File)
- // second directive from conf1
- d1 := httpDirectives[1]
- assert.Equal(t, "proxy_set_header", d1.Directive)
- assert.Equal(t, []string{"Conf-One", "One"}, d1.Args)
- assert.Equal(t, file1, d1.File)
- }
-
- {
- // test invalid includes
- conf := `
- events {}
- http {
- include not-exist.conf;
- include %s invalid-args.conf;
- include;
- include %s;
- server {
- listen 80;
- location / {
- proxy_pass https://localhost:8888;
- }
- }
- }
- `
- conf1 := `include %s; proxy_set_header Conf-One One;`
- conf2 := `proxy_set_header Conf-Two Two;`
-
- file2 := tempDir.Create(t, []byte(conf2))
- file1 := tempDir.Create(t, []byte(fmt.Sprintf(conf1, file2)))
- file := tempDir.Create(t, []byte(fmt.Sprintf(conf, file1, file1)))
-
- payload, err := crossplane.Parse(file, &crossplane.ParseOptions{})
- assert.Nil(t, err)
- httpDirectives := payload.Config[0].Parsed[1].Block
- httpDirectives = loadIncludes(file, httpDirectives, payload)
- assert.Equal(t, 3, len(httpDirectives))
-
- // first directive from conf2
- d2 := httpDirectives[0]
- assert.Equal(t, "proxy_set_header", d2.Directive)
- assert.Equal(t, []string{"Conf-Two", "Two"}, d2.Args)
- assert.Equal(t, file2, d2.File)
- // second directive from conf1
- d1 := httpDirectives[1]
- assert.Equal(t, "proxy_set_header", d1.Directive)
- assert.Equal(t, []string{"Conf-One", "One"}, d1.Args)
- assert.Equal(t, file1, d1.File)
- }
-}