Fix marshalling issue in config.Load() (#317)

* Add extra unmarshalling step in LoadConfig

* Add extra test cases

* Fix test cases

* Refactor load ensembling config to separate block

Author: shydefoo

api/turing/config/config.go

@@ -27,6 +27,7 @@ import (
 	// easily marshalled into JSON, which is currently the format required for experiment config.
 	"github.com/ory/viper"
 	"k8s.io/apimachinery/pkg/api/resource"
+	sigyaml "sigs.k8s.io/yaml"
 )
 
 // Quantity is an alias for resource.Quantity
@@ -495,7 +496,42 @@ func Load(filepaths ...string) (*Config, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed to unmarshal config values: %s", err)
 	}
+	config, err = loadEnsemblingSvcConfig(config, v.AllSettings())
+	if err != nil {
+		return nil, fmt.Errorf("Failed to load ensemblingservicek8sconfig, err %s", err)
+	}
+
+	return config, nil
+}
+
+func loadEnsemblingSvcConfig(config *Config, v map[string]interface{}) (*Config, error) {
+	// NOTE: This section is added to parse any fields in EnsemblingServiceK8sConfig that does not
+	// have yaml tags.
+	// For example `certificate-authority-data` is not unmarshalled
+	// by vipers unmarshal method.
 
+	clusterConfig, ok := v["clusterconfig"]
+	if !ok {
+		return config, nil
+	}
+	contents := clusterConfig.(map[string]interface{})
+	ensemblingSvcK8sCfg, ok := contents["ensemblingservicek8sconfig"]
+	if !ok {
+		return config, nil
+	}
+	// convert back to byte string
+	var byteForm []byte
+	byteForm, err := yaml.Marshal(ensemblingSvcK8sCfg)
+	if err != nil {
+		return nil, err
+	}
+	// use sigyaml.Unmarshal to convert to json object then unmarshal
+
+	k8sConfig := mlpcluster.K8sConfig{}
+	if err := sigyaml.Unmarshal(byteForm, &k8sConfig); err != nil {
+		return nil, err
+	}
+	config.ClusterConfig.EnsemblingServiceK8sConfig = &k8sConfig
 	return config, nil
 }
 

api/turing/config/config_test.go

@@ -243,6 +243,21 @@ func TestLoad(t *testing.T) {
 				ClusterConfig: config.ClusterConfig{
 					InClusterConfig:       false,
 					EnvironmentConfigPath: "path_to_env.yaml",
+					EnsemblingServiceK8sConfig: &mlpcluster.K8sConfig{
+						Name: "dev-server",
+						Cluster: &clientcmdapiv1.Cluster{
+							Server:                   "https://127.0.0.1",
+							CertificateAuthorityData: []byte("some_string"),
+						},
+						AuthInfo: &clientcmdapiv1.AuthInfo{
+							Exec: &clientcmdapiv1.ExecConfig{
+								APIVersion:         "some_api_version",
+								Command:            "some_command",
+								InteractiveMode:    clientcmdapiv1.IfAvailableExecInteractiveMode,
+								ProvideClusterInfo: true,
+							},
+						},
+					},
 				},
 				AlertConfig: &config.AlertConfig{
 					GitLab: &config.GitlabConfig{
@@ -346,6 +361,21 @@ func TestLoad(t *testing.T) {
 				ClusterConfig: config.ClusterConfig{
 					InClusterConfig:       false,
 					EnvironmentConfigPath: "path_to_env.yaml",
+					EnsemblingServiceK8sConfig: &mlpcluster.K8sConfig{
+						Name: "dev-server",
+						Cluster: &clientcmdapiv1.Cluster{
+							Server:                   "https://127.0.0.1",
+							CertificateAuthorityData: []byte("some_string"),
+						},
+						AuthInfo: &clientcmdapiv1.AuthInfo{
+							Exec: &clientcmdapiv1.ExecConfig{
+								APIVersion:         "some_api_version",
+								Command:            "some_command",
+								InteractiveMode:    clientcmdapiv1.IfAvailableExecInteractiveMode,
+								ProvideClusterInfo: true,
+							},
+						},
+					},
 				},
 				AlertConfig: &config.AlertConfig{
 					GitLab: &config.GitlabConfig{
@@ -469,6 +499,21 @@ func TestLoad(t *testing.T) {
 				ClusterConfig: config.ClusterConfig{
 					InClusterConfig:       false,
 					EnvironmentConfigPath: "env_var_path_to_env.yaml",
+					EnsemblingServiceK8sConfig: &mlpcluster.K8sConfig{
+						Name: "dev-server",
+						Cluster: &clientcmdapiv1.Cluster{
+							Server:                   "https://127.0.0.1",
+							CertificateAuthorityData: []byte("some_string"),
+						},
+						AuthInfo: &clientcmdapiv1.AuthInfo{
+							Exec: &clientcmdapiv1.ExecConfig{
+								APIVersion:         "some_api_version",
+								Command:            "some_command",
+								InteractiveMode:    clientcmdapiv1.IfAvailableExecInteractiveMode,
+								ProvideClusterInfo: true,
+							},
+						},
+					},
 				},
 				AlertConfig: &config.AlertConfig{
 					GitLab: &config.GitlabConfig{

api/turing/config/testdata/config-1.yaml

@@ -32,6 +32,19 @@ Sentry:
 ClusterConfig:
   InClusterConfig: false
   EnvironmentConfigPath: "path_to_env.yaml"
+  EnsemblingServiceK8sConfig:
+    name: dev-server
+    cluster:
+      server: https://127.0.0.1
+      certificate-authority-data: c29tZV9zdHJpbmc=
+
+    user:
+      exec:
+        apiVersion: some_api_version
+        command: some_command
+        interactiveMode: IfAvailable
+        provideClusterInfo: true
+
 Experiment:
     qux:
       quxkey1: quxval1