Merge pull request #60 from maleck13/fix-config

update config command to use configmap as per proposal

integration/client_get_config_test.go

@@ -42,14 +42,14 @@ func TestGetClientConfig(t *testing.T) {
 
 			output, err := cmd.CombinedOutput()
 			if err != nil {
-				t.Fatal(err)
+				t.Fatal(err, string(output))
 			}
 
 			actual := string(output)
 			expected := LoadSnapshot(t, getClientTestPath+test.fixture)
 
 			if *update {
-				WriteSnapshot(t, getClientTestPath+test.fixture, output)
+				WriteSnapshot(t, getClientTestPath+test.fixture, []byte(CleanStringByRegex(actual, regexes)))
 			}
 
 			if test.name == "json output" {

pkg/cmd/clientConfig.go

@@ -22,6 +22,7 @@ import (
 	"github.com/olekukonko/tablewriter"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+	"k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 )
 
@@ -61,23 +62,28 @@ kubectl plugin mobile get clientconfig`,
 				return cmd.Usage()
 			}
 			clientID := args[0]
-			if ns, err = currentNamespace(cmd.Flags()); err != nil {
+			ns, err = currentNamespace(cmd.Flags())
+			if err != nil {
 				return err
 			}
 			ms := listServices(ns, ccc.k8Client)
 			for _, svc := range ms {
 				var svcConfig *ServiceConfig
 				var err error
+				configMap, err := ccc.k8Client.CoreV1().ConfigMaps(ns).Get(svc.Name, v1.GetOptions{})
+				if err != nil {
+					return errors.Wrap(err, "unable to create config. Failed to get service "+svc.Name+" configmap")
+				}
 				if _, ok := convertors[svc.Name]; !ok {
 
 					convertor := defaultSecretConvertor{}
-					if svcConfig, err = convertor.Convert(svc); err != nil {
+					if svcConfig, err = convertor.Convert(svc.ID, configMap.Data); err != nil {
 						return err
 					}
 				} else {
 					// we can only convert what is available
 					convertor := convertors[svc.Name]
-					if svcConfig, err = convertor.Convert(svc); err != nil {
+					if svcConfig, err = convertor.Convert(svc.ID, configMap.Data); err != nil {
 						return err
 					}
 				}

pkg/cmd/clientConfig_test.go

@@ -119,8 +119,7 @@ func TestClientConfigCmd_GetClientConfigCmd(t *testing.T) {
 								},
 							},
 							Data: map[string][]byte{
-								"name":                []byte("keycloak"),
-								"public_installation": []byte("{}"),
+								"name": []byte("keycloak"),
 							},
 						},
 					}
@@ -129,6 +128,26 @@ func TestClientConfigCmd_GetClientConfigCmd(t *testing.T) {
 					}
 					return true, secretList, nil
 				})
+				fakeclient.AddReactor("get", "configmaps", func(action ktesting.Action) (handled bool, ret runtime.Object, err error) {
+					var config *v1.ConfigMap
+					name := action.(ktesting.GetAction).GetName()
+					if name == "keycloak" {
+						config = &v1.ConfigMap{
+							Data: map[string]string{
+								"public_installation": "{}",
+								"name":                "keycloak",
+							},
+						}
+					}
+					if name == "test-service" {
+						config = &v1.ConfigMap{
+							Data: map[string]string{
+								"name": "test-service",
+							},
+						}
+					}
+					return true, config, nil
+				})
 				return fakeclient
 			},
 			namespace:   "testing-ns",

pkg/cmd/types.go

@@ -72,7 +72,7 @@ const (
 
 // SecretConvertor converts a kubernetes secret into a mobile.ServiceConfig
 type SecretConvertor interface {
-	Convert(s *Service) (*ServiceConfig, error)
+	Convert(id string, params map[string]string) (*ServiceConfig, error)
 }
 
 //ServiceConfigs are collection of configurations for services in a specific namespace
@@ -110,10 +110,10 @@ 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(s *Service) (*ServiceConfig, error) {
+func (dsc defaultSecretConvertor) Convert(id string, params map[string]string) (*ServiceConfig, error) {
 	config := map[string]interface{}{}
 	headers := map[string]string{}
-	for k, v := range s.Params {
+	for k, v := range params {
 		if !defaultIgnored.Contains(k) {
 			config[k] = string(v)
 		}
@@ -122,21 +122,21 @@ func (dsc defaultSecretConvertor) Convert(s *Service) (*ServiceConfig, error) {
 		config["headers"] = headers
 	}
 	return &ServiceConfig{
-		ID:     string(s.ID),
-		Name:   string(s.Name),
-		URL:    string(s.Host),
-		Type:   string(s.Type),
+		ID:     id,
+		Name:   params["name"],
+		URL:    params["uri"],
+		Type:   params["type"],
 		Config: config,
 	}, nil
 }
 
 type keycloakSecretConvertor struct{}
 
 //Convert a kubernetes keycloak secret into a keycloak mobile.ServiceConfig
-func (ksc keycloakSecretConvertor) Convert(s *Service) (*ServiceConfig, error) {
+func (ksc keycloakSecretConvertor) Convert(id string, params map[string]string) (*ServiceConfig, error) {
 	config := map[string]interface{}{}
 	headers := map[string]string{}
-	err := json.Unmarshal([]byte(s.Params["public_installation"]), &config)
+	err := json.Unmarshal([]byte(params["public_installation"]), &config)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to unmarshall keycloak configuration ")
 	}
@@ -145,25 +145,25 @@ func (ksc keycloakSecretConvertor) Convert(s *Service) (*ServiceConfig, error) {
 	}
 	return &ServiceConfig{
 		Config: config,
-		Name:   string(s.Name),
-		URL:    string(s.Host),
-		Type:   string(s.Type),
-		ID:     string(s.ID),
+		ID:     id,
+		Name:   string(params["name"]),
+		URL:    string(params["uri"]),
+		Type:   string(params["type"]),
 	}, nil
 }
 
 type syncSecretConvertor struct{}
 
 //Convert a kubernetes Sync Server secret into a keycloak mobile.ServiceConfig
-func (scc syncSecretConvertor) Convert(s *Service) (*ServiceConfig, error) {
+func (scc syncSecretConvertor) Convert(id string, params map[string]string) (*ServiceConfig, error) {
 	config := map[string]interface{}{
-		"url": s.Host,
+		"url": params["host"],
 	}
 	headers := map[string]string{}
 
-	acAppID, acAppIDExists := s.Params["apicast_app_id"]
-	acAppKey, acAppKeyExists := s.Params["apicast_app_key"]
-	acRoute, acRouteExists := s.Params["apicast_route"]
+	acAppID, acAppIDExists := params["apicast_app_id"]
+	acAppKey, acAppKeyExists := params["apicast_app_key"]
+	acRoute, acRouteExists := params["apicast_route"]
 	if acAppIDExists && acAppKeyExists && acRouteExists {
 		headers["app_id"] = acAppID
 		headers["app_key"] = acAppKey
@@ -175,10 +175,10 @@ func (scc syncSecretConvertor) Convert(s *Service) (*ServiceConfig, error) {
 
 	return &ServiceConfig{
 		Config: config,
-		Name:   string(s.Name),
-		URL:    string(s.Host),
-		Type:   string(s.Type),
-		ID:     string(s.ID),
+		ID:     id,
+		Name:   params["name"],
+		URL:    params["uri"],
+		Type:   params["type"],
 	}, nil
 }