-
Notifications
You must be signed in to change notification settings - Fork 504
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* finish include directive * httpserver spec support wildcards * get server info from nginx.conf * finish parse part of nginx convert * fix bug * optim * finish convert code * mv omitempty from jsonschema to json, to the generated yaml is more clean * finish nginx convert code * fix go.mod * add more test for parse * add more test for convert * add more test in cmd * add tests * fix conflict * add more test * add doc * add comments to variables and functions * Update cmd/client/commandv2/convert.go Co-authored-by: Yun Long <[email protected]> * Update cmd/client/commandv2/convert/nginx/cmd.go Co-authored-by: Yun Long <[email protected]> * udpate based on review advice * fix test --------- Co-authored-by: Yun Long <[email protected]>
- Loading branch information
1 parent
be99c1b
commit 4a57baf
Showing
41 changed files
with
2,956 additions
and
111 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
/* | ||
* Copyright (c) 2017, MegaEase | ||
* All rights reserved. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package commandv2 | ||
|
||
import ( | ||
"github.com/spf13/cobra" | ||
|
||
"github.com/megaease/easegress/v2/cmd/client/commandv2/convert/nginx" | ||
) | ||
|
||
// ConvertCmd returns convert command. | ||
func ConvertCmd() *cobra.Command { | ||
cmd := &cobra.Command{ | ||
Use: "convert", | ||
Short: "Convert other kinds of config to Easegress yaml file", | ||
} | ||
cmd.AddCommand(nginx.Cmd()) | ||
return cmd | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,153 @@ | ||
/* | ||
* Copyright (c) 2017, MegaEase | ||
* All rights reserved. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package nginx | ||
|
||
import ( | ||
"fmt" | ||
"math/rand" | ||
"os" | ||
"path/filepath" | ||
|
||
"github.com/megaease/easegress/v2/cmd/client/commandv2/specs" | ||
"github.com/megaease/easegress/v2/cmd/client/general" | ||
"github.com/megaease/easegress/v2/pkg/util/codectool" | ||
crossplane "github.com/nginxinc/nginx-go-crossplane" | ||
"github.com/spf13/cobra" | ||
) | ||
|
||
// Options contains the options for convert nginx.conf. | ||
type Options struct { | ||
NginxConf string | ||
Output string | ||
ResourcePrefix string | ||
usedNames map[string]struct{} | ||
} | ||
|
||
// Cmd returns convert nginx.conf command. | ||
func Cmd() *cobra.Command { | ||
flags := &Options{} | ||
flags.init() | ||
examples := []general.Example{ | ||
{ | ||
Desc: "Convert nginx config to easegress yamls", | ||
Command: "egctl convert nginx -f <nginx.conf> -o <output.yaml> --resource-prefix <prefix>", | ||
}, | ||
} | ||
cmd := &cobra.Command{ | ||
Use: "nginx", | ||
Short: "Convert nginx.conf to easegress yaml file", | ||
Example: general.CreateMultiExample(examples), | ||
Args: func(cmd *cobra.Command, args []string) error { | ||
if flags.NginxConf == "" { | ||
return fmt.Errorf("nginx.conf file path is required") | ||
} | ||
if flags.Output == "" { | ||
return fmt.Errorf("output yaml file path is required") | ||
} | ||
if flags.ResourcePrefix == "" { | ||
return fmt.Errorf("prefix is required") | ||
} | ||
return nil | ||
}, | ||
Run: func(cmd *cobra.Command, args []string) { | ||
payload, err := crossplane.Parse(flags.NginxConf, &crossplane.ParseOptions{}) | ||
if err != nil { | ||
general.ExitWithErrorf("parse nginx.conf failed: %v", err) | ||
} | ||
for _, e := range payload.Errors { | ||
general.Warnf("parse nginx.conf error: %v in %s of %s", e.Error, e.Line, e.File) | ||
} | ||
config, err := parsePayload(payload) | ||
if err != nil { | ||
general.ExitWithError(err) | ||
} | ||
hs, pls, err := convertConfig(flags, config) | ||
if err != nil { | ||
general.ExitWithError(err) | ||
} | ||
if err := writeYaml(flags.Output, hs, pls); err != nil { | ||
general.ExitWithError(err) | ||
} | ||
}, | ||
} | ||
cmd.Flags().StringVarP(&flags.NginxConf, "file", "f", "", "nginx.conf file path") | ||
cmd.Flags().StringVarP(&flags.Output, "output", "o", "", "output yaml file path") | ||
cmd.Flags().StringVar(&flags.ResourcePrefix, "resource-prefix", "nginx", "prefix of output yaml resources") | ||
return cmd | ||
} | ||
|
||
func (opt *Options) init() { | ||
opt.usedNames = make(map[string]struct{}) | ||
opt.usedNames[""] = struct{}{} | ||
} | ||
|
||
// GetPipelineName creates a globally unique name for the pipeline based on the path. | ||
func (opt *Options) GetPipelineName(path string) string { | ||
letters := []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ") | ||
nameRunes := make([]rune, 0) | ||
for _, r := range path { | ||
if (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z') || (r >= '0' && r <= '9') { | ||
nameRunes = append(nameRunes, r) | ||
} | ||
} | ||
name := string(nameRunes) | ||
if _, ok := opt.usedNames[name]; !ok { | ||
opt.usedNames[name] = struct{}{} | ||
return fmt.Sprintf("%s-%s", opt.ResourcePrefix, name) | ||
} | ||
for i := 0; i < 8; i++ { | ||
nameRunes = append(nameRunes, letters[rand.Intn(len(letters))]) | ||
} | ||
name = string(nameRunes) | ||
if _, ok := opt.usedNames[name]; !ok { | ||
opt.usedNames[name] = struct{}{} | ||
return fmt.Sprintf("%s-%s", opt.ResourcePrefix, name) | ||
} | ||
return opt.GetPipelineName(path) | ||
} | ||
|
||
func writeYaml(filename string, servers []*specs.HTTPServerSpec, pipelines []*specs.PipelineSpec) error { | ||
absPath, err := filepath.Abs(filename) | ||
if err != nil { | ||
return err | ||
} | ||
file, err := os.Create(absPath) | ||
if err != nil { | ||
return err | ||
} | ||
defer file.Close() | ||
|
||
for _, s := range servers { | ||
data, err := codectool.MarshalYAML(s) | ||
if err != nil { | ||
return err | ||
} | ||
file.WriteString(string(data)) | ||
file.WriteString("\n---\n") | ||
} | ||
for _, p := range pipelines { | ||
data, err := codectool.MarshalYAML(p) | ||
if err != nil { | ||
return err | ||
} | ||
file.WriteString(string(data)) | ||
file.WriteString("\n---\n") | ||
} | ||
file.Sync() | ||
return nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
/* | ||
* Copyright (c) 2017, MegaEase | ||
* All rights reserved. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package nginx | ||
|
||
import ( | ||
"io" | ||
"os" | ||
"testing" | ||
|
||
"github.com/stretchr/testify/assert" | ||
) | ||
|
||
func TestCmd(t *testing.T) { | ||
cmd := Cmd() | ||
assert.NotNil(t, cmd) | ||
cmd.ParseFlags([]string{""}) | ||
assert.NotNil(t, cmd.Args(cmd, []string{})) | ||
|
||
cmd.ParseFlags([]string{"-f", "test.conf"}) | ||
assert.NotNil(t, cmd.Args(cmd, []string{})) | ||
|
||
cmd.ParseFlags([]string{"-o", "test.yaml"}) | ||
assert.Nil(t, cmd.Args(cmd, []string{})) | ||
|
||
cmd.ParseFlags([]string{"--resource-prefix", "test"}) | ||
assert.Nil(t, cmd.Args(cmd, []string{})) | ||
|
||
tempDir := newTempTestDir(t) | ||
defer tempDir.Clean() | ||
|
||
nginxConf := ` | ||
events {} | ||
http { | ||
server { | ||
listen 127.0.0.1:8080; | ||
location = /user { | ||
proxy_pass http://localhost:9999; | ||
} | ||
} | ||
} | ||
` | ||
nginxFile := tempDir.Create("nginx.conf", []byte(nginxConf)) | ||
outputFile := tempDir.Create("test.yaml", []byte("")) | ||
cmd.ParseFlags([]string{"-f", nginxFile, "-o", outputFile, "--prefix", "test"}) | ||
cmd.Run(cmd, []string{}) | ||
file, err := os.Open(outputFile) | ||
assert.Nil(t, err) | ||
defer file.Close() | ||
data, err := io.ReadAll(file) | ||
assert.Nil(t, err) | ||
assert.Contains(t, string(data), "test-8080") | ||
assert.Contains(t, string(data), "test-user") | ||
} | ||
|
||
func TestOption(t *testing.T) { | ||
option := &Options{ | ||
NginxConf: "test.conf", | ||
Output: "test.yaml", | ||
ResourcePrefix: "test", | ||
} | ||
option.init() | ||
path := option.GetPipelineName("/user") | ||
assert.Equal(t, "test-user", path) | ||
path = option.GetPipelineName("/apis/v1") | ||
assert.Equal(t, "test-apisv1", path) | ||
|
||
path = option.GetPipelineName("/apis/v1/") | ||
assert.Contains(t, path, "test-apisv1") | ||
assert.NotEqual(t, "test-apisv1", path) | ||
} |
Oops, something went wrong.