* Rewrite clean-nginx-conf.sh to speed up admission webhook * Less diff with original clean-nginx-conf.sh * Add error handling, add documentation, add unit test * indent code * Don't ignore Getwd() error
This commit is contained in:
parent
f5c80783bf
commit
a064337621
8 changed files with 462 additions and 60 deletions
|
|
@ -17,6 +17,7 @@ limitations under the License.
|
|||
package template
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/base64"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
|
|
@ -29,6 +30,7 @@ import (
|
|||
"testing"
|
||||
|
||||
jsoniter "github.com/json-iterator/go"
|
||||
"github.com/pmezard/go-difflib/difflib"
|
||||
apiv1 "k8s.io/api/core/v1"
|
||||
networking "k8s.io/api/networking/v1beta1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
|
|
@ -178,6 +180,14 @@ proxy_pass http://upstream_balancer;`,
|
|||
}
|
||||
)
|
||||
|
||||
func getTestDataDir() (string, error) {
|
||||
pwd, err := os.Getwd()
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return path.Join(pwd, "../../../../test/data"), nil
|
||||
}
|
||||
|
||||
func TestBuildLuaSharedDictionaries(t *testing.T) {
|
||||
invalidType := &ingress.Ingress{}
|
||||
expected := ""
|
||||
|
|
@ -1576,3 +1586,34 @@ func TestConvertGoSliceIntoLuaTablet(t *testing.T) {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestCleanConf(t *testing.T) {
|
||||
testDataDir, err := getTestDataDir()
|
||||
if err != nil {
|
||||
t.Error("unexpected error reading conf file: ", err)
|
||||
}
|
||||
actual := &bytes.Buffer{}
|
||||
{
|
||||
data, err := ioutil.ReadFile(testDataDir + "/cleanConf.src.conf")
|
||||
if err != nil {
|
||||
t.Error("unexpected error reading conf file: ", err)
|
||||
}
|
||||
in := bytes.NewBuffer(data)
|
||||
err = cleanConf(in, actual)
|
||||
if err != nil {
|
||||
t.Error("cleanConf failed: ", err)
|
||||
}
|
||||
}
|
||||
|
||||
expected, err := ioutil.ReadFile(testDataDir + "/cleanConf.expected.conf")
|
||||
if err != nil {
|
||||
t.Error("unexpected error reading conf file: ", err)
|
||||
}
|
||||
if !bytes.Equal(expected, actual.Bytes()) {
|
||||
diff, err := difflib.GetUnifiedDiffString(difflib.UnifiedDiff{A: strings.SplitAfter(string(expected), "\n"), B: strings.SplitAfter(actual.String(), "\n"), Context: 3})
|
||||
if err != nil {
|
||||
t.Error("failed to get diff for cleanConf", err)
|
||||
}
|
||||
t.Errorf("cleanConf result don't match with expected: %s", diff)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue