Merge pull request #97 from odra/xamarin-support

Xamarin support

Author: odra

integration/client_crudl_test.go

@@ -47,6 +47,7 @@ func TestClientJson(t *testing.T) {
 		"cordova",
 		"iOS",
 		"android",
+		"xamarin",
 	}
 
 	name := fmt.Sprintf("%s-mobile-crud-test-entity", *prefix)

integration/getServicesTestData/json-output.golden

@@ -19,11 +19,15 @@
 				"planUpdatable": false,
 				"externalMetadata": {
 					"dependencies": [
-						"POSTGRES:95"
+						"docker.io/aerogear/unifiedpush-wildfly:1.3.1.no-auth.Final",
+						"docker.io/centos/postgresql-96-centos7:9.6",
+						"docker.io/aerogear/ups-config-operator:master",
+						"docker.io/openshift/oauth-proxy:v1.1.0"
 					],
-					"displayName": "AeroGear UPS",
+					"displayName": "AeroGear Unified Push Server (UPS)",
 					"documentationUrl": "https://aerogear.org/push",
 					"imageUrl": "https://pbs.twimg.com/profile_images/1794440005/aerogear_icon-1_400x400.png",
+					"longDescription": "An APB deploying the AeroGear UnifiedPush Server with persistent storage and authentication through Openshift",
 					"providerDisplayName": "Red Hat, Inc.",
 					"serviceName": "ups"
 				},
@@ -147,7 +151,8 @@
 				"planUpdatable": false,
 				"externalMetadata": {
 					"dependencies": [
-						"Postgresql:9.5"
+						"docker.io/jboss/keycloak-openshift:3.4.3.Final",
+						"docker.io/centos/postgresql-96-centos7:9.6"
 					],
 					"displayName": "Keycloak",
 					"documentationUrl": "http://www.keycloak.org/documentation.html",

integration/service_integration_test.go

@@ -139,7 +139,7 @@ func TestIntegration(t *testing.T) {
 func CreateInstance(t *testing.T, si *ProvisionServiceParams) {
 	args := []string{"create", "serviceinstance", si.ServiceName, si.Namespace}
 	args = append(args, si.Params...)
-	t.Logf("executing: %v\n", *executable+strings.Join(args, " "))
+	t.Logf("executing: %v\n", *executable+" "+strings.Join(args, " "))
 	cmd := exec.Command(*executable, args...)
 
 	output, err := cmd.CombinedOutput()

pkg/cmd/clients.go

@@ -126,12 +126,12 @@ Run the "mobile get clients" command from this tool to get the client ID.`,
 // CreateClientCmd builds the create mobileclient command
 func (cc *ClientCmd) CreateClientCmd() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "client <name> <clientType iOS|cordova|android> <appIdentifier bundleID|packageName>",
+		Use:   "client <name> <clientType iOS|cordova|android|xamarin> <appIdentifier bundleID|packageName>",
 		Short: "create a mobile client representation in your namespace",
 		Long: `create client sets up the representation of a mobile application of the specified type in your namespace.
 This is used to provide a mobile client context for various actions such as creating, starting or stopping mobile client builds.
 
-The available client types are android, cordova and iOS. 
+The available client types are android, cordova, iOS and xamarin.
 
 When used standalone, a namespace must be specified by providing the --namespace flag.`,
 		Example: `  mobile create client <name> <clientType> <appIdentifier> --namespace=myproject 
@@ -172,6 +172,11 @@ When used standalone, a namespace must be specified by providing the --namespace
 			case "cordova":
 				app.Annotations["icon"] = "font-icon icon-cordova"
 				break
+			case "xamarin":
+				app.Annotations["icon"] = "font-icon icon-xamarin"
+				break
+			default:
+				return errors.New("Unknown client type")
 			}
 			app.Name = name + "-" + strings.ToLower(app.Spec.ClientType)
 			if err := input.ValidateMobileClient(app); err != nil {

pkg/cmd/clients_test.go

@@ -417,11 +417,48 @@ func TestMobileClientsCmd_TestCreateClient(t *testing.T) {
 				}
 			},
 		},
+		{
+			Name: "test create xamarin mobile client succeeds without error",
+			Args: []string{"test", "xamarin", "my.app.org"},
+			MobileClient: func() mc.Interface {
+				fkMc := &mcFake.Clientset{}
+				fkMc.AddReactor("create", "mobileclients", func(action kt.Action) (handled bool, ret runtime.Object, err error) {
+					ca := action.(kt.CreateAction)
+					return true, ca.GetObject(), nil
+				})
+				return fkMc
+			},
+			Flags: []string{"--namespace=myproject", "-o=json"},
+			Validate: func(t *testing.T, c *v1alpha1.MobileClient) {
+				if nil == c {
+					t.Fatal("expected a mobile client but got nil")
+				}
+				if c.Spec.ClientType != "xamarin" {
+					t.Fatal("expected the clientType to be cordova but got ", c.Spec.ClientType)
+				}
+				if c.Spec.AppIdentifier != "my.app.org" {
+					t.Fatal("expected an appIdentifier to be set as my.app.org but was  ", c.Spec.AppIdentifier)
+				}
+				if c.Spec.Name != "test" {
+					t.Fatal("expected the client name to be test but got ", c.Spec.Name)
+				}
+				if c.Spec.ApiKey == "" {
+					t.Fatal("expected an apiKey to be generated but it was empty")
+				}
+				icon, ok := c.Annotations["icon"]
+				if !ok {
+					t.Fatal("expected an icon to be set but there was none")
+				}
+				if icon != "font-icon icon-xamarin" {
+					t.Fatal("expected the icon to be icon-xamarin but got ", icon)
+				}
+			},
+		},
 		{
 			Name:         "test create mobile client fails with unknown client type",
 			Args:         []string{"test", "firefox", "my.app.org"},
 			ExpectError:  true,
-			ErrorPattern: "^Failed validation while creating new mobile client: .*",
+			ErrorPattern: "^Unknown client type",
 			MobileClient: func() mc.Interface {
 				fkMc := &mcFake.Clientset{}
 				fkMc.AddReactor("create", "mobileclients", func(action kt.Action) (handled bool, ret runtime.Object, err error) {

pkg/cmd/input/validate.go

@@ -42,4 +42,4 @@ func (vc validClients) Contains(client string) bool {
 	return false
 }
 
-var ValidClients = validClients{"iOS", "android", "cordova"}
+var ValidClients = validClients{"iOS", "android", "cordova", "xamarin"}