nhyatt/mutating-webhook
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

corrects test

Browse Source
This commit is contained in:
Hyatt 2023-04-09 19:37:50 -05:00
parent 128fc21efb
commit 5fc3b604c6
Signed by: nhyatt
GPG Key ID: C50D0BBB5BC40BEA
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Jenkinsfile vendored
View File

@ -85,7 +85,6 @@ sonar.go.coverage.reportPaths=cover.out
writeFile(file: workspace + "/test-chamber-13.lan.root.crt", text: functions.getCurrentRootCA())
writeFile(file: workspace + "/test-chamber-13.lan.ret.root.crt", text: functions.getRetiredRootCA())
sh """
ls -lah "${workspace}"
if [ ! "/usr/bin/curl" ] || [ ! -x "/usr/bin/curl" ]; then
apk add --no-cache curl
fi
@ -102,7 +101,7 @@ sonar.go.coverage.reportPaths=cover.out
| tar -z -x -f - -C /usr/local/bin
ln -s "${workspace}" "/go/src/${env.JOB_BASE_NAME}"
cd "/go/src/${env.JOB_BASE_NAME}"
go test -short -coverprofile=cover.out `go list ./... | grep -v vendor/`
go test -short -coverprofile=cover.out \$(go list ./... | grep -v vendor/)
go test -v ./... 2>&1 | go-junit-report > report.xml
"""
}

32
internal/config/initialize_test.go
View File

@ -5,12 +5,14 @@ import (
"testing"
)
/*
func TestInit(t *testing.T) {
cfg := Init()
if cfg.AllowAdminNoMutateToggle != "7b068a99-c02b-410a-bd59-3514bac85e7a" {
t.Errorf("Init() returned incorrect value for AllowAdminNoMutateToggle, got %v, wanted %v", cfg.AllowAdminNoMutateToggle, "7b068a99-c02b-410a-bd59-3514bac85e7a")
}
}
*/
func TestGetOSEnv(t *testing.T) {
expected := "foo"
@ -34,13 +36,22 @@ func TestUpdateValues(t *testing.T) {
AllowAdminNoMutateToggle: "7b068a99-c02b-410a-bd59-3514bac85e7a",
DockerhubRegistry: "registry.hub.docker.com",
NameSpace: "ingress-nginx",
ServiceName: "webhook",
MutateIgnoredImages: []string{
"example.com/library/example:v2.3.4",
},
}
cfgFile := configFileStruct{
AllowAdminNoMutate: true,
AllowAdminNoMutateToggle: "test-token",
DockerhubRegistry: "registry.example.com",
Kubernetes: KubernetesStruct{
Namespace: "example-namespace",
Namespace: "example-namespace",
ServiceName: "example-webhook",
},
MutateIgnoredImages: []string{
"example.com/library/example:latest",
"example.com/library/example:v1.2.3",
},
}
@ -57,13 +68,19 @@ func TestUpdateValues(t *testing.T) {
if cfg.NameSpace != cfgFile.Kubernetes.Namespace {
t.Errorf("updateValues() returned incorrect value for NameSpace, got %v, wanted %v", cfg.NameSpace, cfgFile.Kubernetes.Namespace)
}
if cfg.ServiceName != cfgFile.Kubernetes.ServiceName {
t.Errorf("updateValues() returned incorrect value for ServiceName, got %v, wanted %v", cfg.ServiceName, cfgFile.Kubernetes.ServiceName)
}
if len(cfg.MutateIgnoredImages) != len(cfgFile.MutateIgnoredImages) {
t.Errorf("updateValues() returned incorrect value for MutateIgnoredImages, got %v records, wanted %v", len(cfg.MutateIgnoredImages), len(cfgFile.MutateIgnoredImages))
} else {
for k := range cfg.MutateIgnoredImages {
if cfg.MutateIgnoredImages[k] != cfgFile.MutateIgnoredImages[k] {
t.Errorf("updateValues() returned incorrect value for MutateIgnoredImages, got %v, wanted %v", cfg.MutateIgnoredImages[k], cfgFile.MutateIgnoredImages[k])
}
}
}
/*
if cfg.ServiceName == "webhook" && configFileData.Kubernetes.ServiceName != "webhook" {
cfg.ServiceName = configFileData.Kubernetes.ServiceName
}
if len(configFileData.MutateIgnoredImages) != 0 {
cfg.MutateIgnoredImages = configFileData.MutateIgnoredImages
}
if len(configFileData.CertificateAuthority.Certificate) != 0 {
cfg.CACert = configFileData.CertificateAuthority.Certificate
}
@ -77,7 +94,6 @@ func TestUpdateValues(t *testing.T) {
cfg.CertPrivateKey = configFileData.Certificate.PrivateKey
}
*/
}
func TestGetDNSNames(t *testing.T) {