update the client config command to use dmzURL if present

Author: maleck13

pkg/cmd/clientConfig.go

@@ -18,6 +18,10 @@ import (
 	"fmt"
 	"io"
 
+	"net/url"
+
+	"path"
+
 	mobile "github.com/aerogear/mobile-cli/pkg/client/mobile/clientset/versioned"
 	sc "github.com/aerogear/mobile-cli/pkg/client/servicecatalog/clientset/versioned"
 	"github.com/aerogear/mobile-cli/pkg/cmd/output"
@@ -73,18 +77,30 @@ kubectl plugin mobile get clientconfig`,
 				return err
 			}
 
+			mc, err := ccc.mobileClient.MobileV1alpha1().MobileClients(ns).Get(clientID, v1.GetOptions{})
+			if err != nil {
+				return errors.Wrap(err, "failed to get mobile client with id "+clientID)
+			}
+
 			filter := v1.ListOptions{LabelSelector: fmt.Sprintf("clientId=%s", clientID)}
 			secrets, err := ccc.k8Client.CoreV1().Secrets(ns).List(filter)
 			if err != nil {
 				return errors.Wrap(err, fmt.Sprintf("Error retrieving secrets with clientId %s", clientID))
 			}
-
 			for _, secret := range secrets.Items {
 				convertor := defaultSecretConvertor{}
 				svcConfig, err := convertor.Convert(secret)
 				if err != nil {
 					return err
 				}
+				if nil != mc && mc.Spec.DmzUrl != "" {
+					u, err := url.Parse(mc.Spec.DmzUrl)
+					if err != nil {
+						return errors.Wrap(err, "failed to parse dmz url")
+					}
+					u.Path = path.Join(u.Path, svcConfig.Name)
+					svcConfig.URL = u.String()
+				}
 				ret = append(ret, svcConfig)
 			}
 

pkg/cmd/clientConfig_test.go

@@ -22,6 +22,7 @@ import (
 
 	"regexp"
 
+	"github.com/aerogear/mobile-cli/pkg/apis/mobile/v1alpha1"
 	mobile "github.com/aerogear/mobile-cli/pkg/client/mobile/clientset/versioned"
 	mcFake "github.com/aerogear/mobile-cli/pkg/client/mobile/clientset/versioned/fake"
 	"github.com/aerogear/mobile-cli/pkg/client/servicecatalog/clientset/versioned"
@@ -192,6 +193,88 @@ func TestClientConfigCmd_GetClientConfigCmd(t *testing.T) {
 			"config": {}
 		}
 	]
+}`
+				if strings.TrimSpace(out.String()) != expected {
+					return errors.New(fmt.Sprintf("expected: '%v', got: '%v'", expected, strings.TrimSpace(out.String())))
+				}
+				return nil
+			},
+		}, {
+			name: "get client config command with services and dmz url",
+			k8Client: func() kubernetes.Interface {
+				fakeclient := &kFake.Clientset{}
+				fakeclient.AddReactor("list", "secrets", func(action ktesting.Action) (handled bool, ret runtime.Object, err error) {
+					secrets := []v1.Secret{
+						{
+							ObjectMeta: metav1.ObjectMeta{
+								Name: "test-service",
+								Labels: map[string]string{
+									"mobile":   "enabled",
+									"clientId": "client-id",
+								},
+							},
+							Data: map[string][]byte{
+								"name": []byte("test-service"),
+							},
+						},
+						{
+							ObjectMeta: metav1.ObjectMeta{
+								Name: "keycloak",
+								Labels: map[string]string{
+									"mobile":   "enabled",
+									"clientId": "client-id",
+								},
+							},
+							Data: map[string][]byte{
+								"name": []byte("keycloak"),
+							},
+						},
+					}
+					secretList := &v1.SecretList{
+						Items: secrets,
+					}
+					return true, secretList, nil
+				})
+				return fakeclient
+			},
+			mobileClient: func() mobile.Interface {
+				mc := &mcFake.Clientset{}
+				mc.AddReactor("get", "mobileclients", func(action ktesting.Action) (handled bool, ret runtime.Object, err error) {
+					return true, &v1alpha1.MobileClient{Spec: v1alpha1.MobileClientSpec{DmzUrl: "https://test.com"}}, nil
+				})
+				return mc
+			},
+			SvcCatalogClient: func() versioned.Interface {
+				fake := &scFake.Clientset{}
+				return fake
+			},
+			namespace:   "testing-ns",
+			ClusterHost: "test",
+			args:        []string{"client-id"},
+			cobraCmd:    getFakeCbrCmd(),
+			ExpectError: false,
+			ValidateOut: func(out bytes.Buffer) error {
+				expected := `{
+	"version": 1,
+	"clusterName": "test",
+	"namespace": "testing-ns",
+	"clientId": "client-id",
+	"services": [
+		{
+			"id": "test-service",
+			"name": "test-service",
+			"type": "",
+			"url": "https://test.com/test-service",
+			"config": {}
+		},
+		{
+			"id": "keycloak",
+			"name": "keycloak",
+			"type": "",
+			"url": "https://test.com/keycloak",
+			"config": {}
+		}
+	]
 }`
 				if strings.TrimSpace(out.String()) != expected {
 					return errors.New(fmt.Sprintf("expected: '%v', got: '%v'", expected, strings.TrimSpace(out.String())))