Merge pull request #124 from philbrookes/RHMAP-20508

update cli config output to match ui

Author: maleck13

cmd/mobile/main.go

@@ -16,7 +16,6 @@ package main
 
 import (
 	"flag"
-	"fmt"
 	"os"
 
 	"k8s.io/client-go/kubernetes"
@@ -40,8 +39,7 @@ func main() {
 
 	config, err := clientcmd.BuildConfigFromFlags("", *kubeconfig)
 	if err != nil {
-		fmt.Fprintln(os.Stderr, err.Error())
-		os.Exit(1)
+		panic(err)
 	}
 	k8Client, mobileClient, scClient := NewClientsOrDie(config)
 	var (

pkg/cmd/clientConfig.go

@@ -17,10 +17,7 @@ package cmd
 import (
 	"fmt"
 	"io"
-
-	"net/url"
-
-	"path"
+	"regexp"
 
 	"github.com/aerogear/mobile-cli/pkg/cmd/output"
 	mobile "github.com/aerogear/mobile-crd-client/pkg/client/mobile/clientset/versioned"
@@ -66,6 +63,7 @@ kubectl plugin mobile get clientconfig`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			var ns string
 			var err error
+			var dmzRegexp = regexp.MustCompile("http(s)?://.*/")
 			ret := make([]*ServiceConfig, 0)
 
 			if len(args) != 1 {
@@ -94,12 +92,12 @@ kubectl plugin mobile get clientconfig`,
 					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")
+					var dmzURL = mc.Spec.DmzUrl
+					if dmzURL[len(dmzURL)-1:] != "/" {
+						dmzURL += "/"
 					}
-					u.Path = path.Join(u.Path, svcConfig.Name)
-					svcConfig.URL = u.String()
+					dmzURL = dmzURL + "mobile/" + svcConfig.Name + "/"
+					svcConfig.URL = string(dmzRegexp.ReplaceAll([]byte(svcConfig.URL), []byte(dmzURL)))
 				}
 				ret = append(ret, svcConfig)
 			}

pkg/cmd/clientConfig_test.go

@@ -215,6 +215,7 @@ func TestClientConfigCmd_GetClientConfigCmd(t *testing.T) {
 							},
 							Data: map[string][]byte{
 								"name": []byte("test-service"),
+								"uri":  []byte("https://test-service.com/test-path"),
 							},
 						},
 						{
@@ -227,6 +228,7 @@ func TestClientConfigCmd_GetClientConfigCmd(t *testing.T) {
 							},
 							Data: map[string][]byte{
 								"name": []byte("keycloak"),
+								"uri":  []byte("https://keycloak-service.com/keycloak-path"),
 							},
 						},
 					}
@@ -264,14 +266,14 @@ func TestClientConfigCmd_GetClientConfigCmd(t *testing.T) {
 			"id": "test-service",
 			"name": "test-service",
 			"type": "",
-			"url": "https://test.com/test-service",
+			"url": "https://test.com/mobile/test-service/test-path",
 			"config": {}
 		},
 		{
 			"id": "keycloak",
 			"name": "keycloak",
 			"type": "",
-			"url": "https://test.com/keycloak",
+			"url": "https://test.com/mobile/keycloak/keycloak-path",
 			"config": {}
 		}
 	]