AEROGEAR-2371 [APB] Parse config element of Config Map as Json in mob…

…ile cli
aerogear-attic · Mar 22, 2018 · 9ca9891 · 9ca9891
1 parent b8e65ee
commit 9ca9891
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/pkg/cmd/clientConfig.go b/pkg/cmd/clientConfig.go
@@ -106,15 +106,16 @@ kubectl plugin mobile get clientconfig`,
 					}
 					return errors.Wrap(err, "unable to create config. Failed to get service "+svc.Name+" configmap")
 				}
+				configType := configMap.ObjectMeta.Annotations["configType"]
 				if _, ok := convertors[svc.Name]; !ok {
 					convertor := defaultSecretConvertor{}
-					if svcConfig, err = convertor.Convert(svc.ID, configMap.Data); err != nil {
+					if svcConfig, err = convertor.Convert(svc.ID, configMap.Data, configType); err != nil {
 						return err
 					}
 				} else {
 					// we can only convert what is available
 					convertor := convertors[svc.Name]
-					if svcConfig, err = convertor.Convert(svc.ID, configMap.Data); err != nil {
+					if svcConfig, err = convertor.Convert(svc.ID, configMap.Data, configType); err != nil {
 						return err
 					}
 				}

diff --git a/pkg/cmd/types.go b/pkg/cmd/types.go
@@ -72,7 +72,7 @@ const (
 
 // SecretConvertor converts a kubernetes secret into a mobile.ServiceConfig
 type SecretConvertor interface {
-	Convert(id string, params map[string]string) (*ServiceConfig, error)
+	Convert(id string, params map[string]string, configType string) (*ServiceConfig, error)
 }
 
 //ServiceConfigs are collection of configurations for services in a specific namespace
@@ -110,17 +110,26 @@ func (i ignoredFields) Contains(field string) bool {
 var defaultIgnored = ignoredFields{"password", "token", "url", "uri", "name", "type", "id"}
 
 //Convert a kubernetes secret to a mobile.ServiceConfig
-func (dsc defaultSecretConvertor) Convert(id string, params map[string]string) (*ServiceConfig, error) {
+func (dsc defaultSecretConvertor) Convert(id string, params map[string]string, configType string) (*ServiceConfig, error) {
 	config := map[string]interface{}{}
 	headers := map[string]string{}
 	for k, v := range params {
 		if !defaultIgnored.Contains(k) {
-			config[k] = string(v)
+			if configType == "json" && k == "config" {
+				jsCfg := map[string]interface{}{}
+				if err := json.Unmarshal([]byte(v), &jsCfg); err != nil {
+					return nil, errors.Wrap(err, "failed to unmarshall service configuration ")
+				}
+				config[k] = jsCfg
+			} else {
+				config[k] = string(v)
+			}
 		}
 	}
 	if len(headers) > 0 {
 		config["headers"] = headers
 	}
+
 	return &ServiceConfig{
 		ID:     id,
 		Name:   params["name"],
@@ -133,7 +142,7 @@ func (dsc defaultSecretConvertor) Convert(id string, params map[string]string) (
 type keycloakSecretConvertor struct{}
 
 //Convert a kubernetes keycloak secret into a keycloak mobile.ServiceConfig
-func (ksc keycloakSecretConvertor) Convert(id string, params map[string]string) (*ServiceConfig, error) {
+func (ksc keycloakSecretConvertor) Convert(id string, params map[string]string, configType string) (*ServiceConfig, error) {
 	config := map[string]interface{}{}
 	headers := map[string]string{}
 	err := json.Unmarshal([]byte(params["public_installation"]), &config)
@@ -155,7 +164,7 @@ func (ksc keycloakSecretConvertor) Convert(id string, params map[string]string)
 type syncSecretConvertor struct{}
 
 //Convert a kubernetes Sync Server secret into a keycloak mobile.ServiceConfig
-func (scc syncSecretConvertor) Convert(id string, params map[string]string) (*ServiceConfig, error) {
+func (scc syncSecretConvertor) Convert(id string, params map[string]string, configType string) (*ServiceConfig, error) {
 	config := map[string]interface{}{
 		"url": params["host"],
 	}