Address comments: add unit tests, defaulting and update comment

This commit is contained in:
Jingfang Liu
2018-06-06 10:21:15 -07:00
parent 35344c163a
commit 1a28f3a391
7 changed files with 110 additions and 8 deletions

View File

@@ -347,7 +347,10 @@ func (a *applicationImpl) Vars() ([]types.Var, error) {
}
vars = append(vars, subAppVars...)
}
vars = append(vars, a.kustomization.Vars...)
for _, v := range a.kustomization.Vars {
v.Defaulting()
vars = append(vars, v)
}
if len(errs.Get()) > 0 {
return nil, errs
}

View File

@@ -1,3 +1,19 @@
/*
Copyright 2018 The Kubernetes Authors.
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 app
import (

51
pkg/app/var_test.go Normal file
View File

@@ -0,0 +1,51 @@
/*
Copyright 2018 The Kubernetes Authors.
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 app
import (
"strings"
"testing"
)
func TestGetFieldAsString(t *testing.T) {
m := map[string]interface{}{
"Kind": "Service",
"metadata": map[string]interface{}{
"labels": map[string]string{
"app": "application-name",
},
"name": "service-name",
},
}
p := []string{"Kind"}
s, _ := getFieldAsString(m, p)
if s != "Service" {
t.Errorf("Expected to get Service, but actually got %s", s)
}
p = []string{"metadata", "name"}
s, _ = getFieldAsString(m, p)
if s != "service-name" {
t.Errorf("Expected to get service-name, but actually got %s", s)
}
p = []string{"metadata", "non-existing-field"}
s, err := getFieldAsString(m, p)
if !strings.HasSuffix(err.Error(), "field at given fieldpath does not exist") {
t.Errorf("Unexpected failure due to incorrect error message %s", err.Error())
}
}