Skip to content

test(): Add comprehensive unit tests for values.go functions #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Arpit529Srivastava wants to merge 1 commit into
base: master
Choose a base branch
from
Open

test(): Add comprehensive unit tests for values.go functions #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/internal/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func UninstallKubeSliceController(ApplicationConfiguration *ConfigurationSpecs)
}

func generateControllerValuesFile(cluster Cluster, hcConfig HelmChartConfiguration) {
err := generateValuesFile(kubesliceDirectory+"/"+controllerValuesFileName, &hcConfig.ControllerChart, fmt.Sprintf(controllerValuesTemplate+generateImagePullSecretsValue(hcConfig.ImagePullSecret), cluster.ControlPlaneAddress))
err := GenerateValuesFile(kubesliceDirectory+"/"+controllerValuesFileName, &hcConfig.ControllerChart, fmt.Sprintf(controllerValuesTemplate+generateImagePullSecretsValue(hcConfig.ImagePullSecret), cluster.ControlPlaneAddress))
if err != nil {
log.Fatalf("%s %s", util.Cross, err)
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/internal/enterprise.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func generateUIValuesFile(clusterType string, cluster Cluster, hcConfig HelmChar
} else {
serviceType = "LoadBalancer"
}
err := generateValuesFile(kubesliceDirectory+"/"+uiValuesFileName, &hcConfig.UIChart, fmt.Sprintf(UIValuesTemplate+generateImagePullSecretsValue(hcConfig.ImagePullSecret), serviceType))
err := GenerateValuesFile(kubesliceDirectory+"/"+uiValuesFileName, &hcConfig.UIChart, fmt.Sprintf(UIValuesTemplate+generateImagePullSecretsValue(hcConfig.ImagePullSecret), serviceType))
if err != nil {
log.Fatalf("%s %s", util.Cross, err)
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/internal/prometheus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func patchClusterObjectInControllerCluster(wc []Cluster, cc *Cluster, projectNS
}

func generatePrometheusValuesFile(hcConfig HelmChartConfiguration) {
err := generateValuesFile(kubesliceDirectory+"/"+PrometheusValuesFileName, &hcConfig.PrometheusChart, "")
err := GenerateValuesFile(kubesliceDirectory+"/"+PrometheusValuesFileName, &hcConfig.PrometheusChart, "")
if err != nil {
log.Fatalf("%s %s", util.Cross, err)
}
Expand Down
17 changes: 13 additions & 4 deletions pkg/internal/values.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,17 @@ import (
"gopkg.in/yaml.v2"
)

func mergeMaps(dest, src map[interface{}]interface{}) map[interface{}]interface{} {
func MergeMaps(dest, src map[interface{}]interface{}) map[interface{}]interface{} {
// If dest is nil, create a new map
if dest == nil {
dest = make(map[interface{}]interface{})
}

for k, v := range src {
if d, ok := dest[k]; ok {
switch d.(type) {
case map[interface{}]interface{}:
dest[k] = mergeMaps(d.(map[interface{}]interface{}), v.(map[interface{}]interface{}))
dest[k] = MergeMaps(d.(map[interface{}]interface{}), v.(map[interface{}]interface{}))
default:
dest[k] = v
}
Expand All @@ -24,7 +29,11 @@ func mergeMaps(dest, src map[interface{}]interface{}) map[interface{}]interface{
return dest
}

func generateValuesFile(filePath string, hc *HelmChart, defaults string) error {
func GenerateValuesFile(filePath string, hc *HelmChart, defaults string) error {
if hc == nil {
return fmt.Errorf("helm chart cannot be nil")
}

valuesMap := make(map[interface{}]interface{})
for k, v := range hc.Values {
keys := strings.Split(k, ".")
Expand All @@ -46,7 +55,7 @@ func generateValuesFile(filePath string, hc *HelmChart, defaults string) error {
return fmt.Errorf("error parsing defaults: %v", err)
}

mergedMap := mergeMaps(valuesMap, defaultsMap)
mergedMap := MergeMaps(defaultsMap, valuesMap)

finalData, err := yaml.Marshal(mergedMap)
if err != nil {
Expand Down
Loading