Merge pull request #81 from philbrookes/AEROGEAR-2151

update CRD

Author: philbrookes

.gitignore

@@ -4,6 +4,5 @@
 
 cmd/mobile/mobile
 mobile
-
 coverage.out
 integration.test

artifacts/mobileclient.json

@@ -14,6 +14,10 @@
   "spec": {
     "name": "myapp",
     "apiKey": "25113a4f-48b3-4dbb-b462-e2d388a475ac",
-    "clientType": "cordova"
+    "clientType": "cordova",
+    "excludedServices": [
+      "test",
+      "test2"
+    ]
   }
 }

artifacts/mobileclient.yaml

@@ -11,4 +11,6 @@ Spec:
   clientType: iOS
   apiKey: 834d44f-d697-4c56-aec6-47940679f79a
   name: app2
-
+  excludedServices:
+  - test1
+    test2

artifacts/mobileclient_crd.yaml

@@ -32,4 +32,8 @@ spec:
               type: string
               pattern: '(\w-)'
             appIdentifier:
-              type: string
+              type: string
+            excludedServices:
+              type: array
+              items:
+                type: string

integration/client_delete_serviceInstance_test.go

@@ -148,7 +148,7 @@ func deleteServiceInstance(t *testing.T, sid, namespace string) {
 	cmd := exec.Command("oc", args...)
 	output, err := cmd.CombinedOutput()
 	if err != nil {
-		t.Fatalf("Failed to delete service instance %s: %v, with output %v", sid, err, output)
+		t.Fatalf("Failed to delete service instance %s: %v, with output %v", sid, err, string(output))
 	}
 }
 
@@ -186,6 +186,9 @@ func getInstance(si *ProvisionServiceParams) (instance *v1beta1.ServiceInstance,
 		return nil, err
 	}
 
+	if len(siList.Items) == 0 {
+		return nil, errors.New("no matching instances found")
+	}
 	return &siList.Items[0], nil
 }
 

integration/service_integration_test.go

@@ -139,6 +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, " "))
 	cmd := exec.Command(*executable, args...)
 
 	output, err := cmd.CombinedOutput()

pkg/cmd/clients.go

@@ -69,11 +69,11 @@ func (cc *ClientCmd) ListClientsCmd() *cobra.Command {
 		mClients := mobileClientList.(*v1alpha1.MobileClientList)
 		var data [][]string
 		for _, mClient := range mClients.Items {
-			data = append(data, []string{mClient.Name, mClient.Spec.Name, mClient.Spec.ClientType, mClient.Spec.AppIdentifier})
+			data = append(data, []string{mClient.Name, mClient.Spec.Name, mClient.Spec.ClientType, mClient.Spec.AppIdentifier, strings.Join(mClient.Spec.ExcludedServices, ", ")})
 		}
 		table := tablewriter.NewWriter(out)
 		table.AppendBulk(data)
-		table.SetHeader([]string{"ID", "Name", "ClientType", "AppIdentifier"})
+		table.SetHeader([]string{"ID", "Name", "ClientType", "AppIdentifier", "ExcludedServices"})
 		table.Render()
 		return nil
 	})
@@ -113,10 +113,10 @@ Run the "mobile get clients" command from this tool to get the client ID.`,
 	cc.Out.AddRenderer(command.Name(), "table", func(out io.Writer, mobileClient interface{}) error {
 		mClient := mobileClient.(*v1alpha1.MobileClient)
 		var data [][]string
-		data = append(data, []string{mClient.Name, mClient.Namespace, mClient.Spec.Name, mClient.Spec.ClientType, mClient.Spec.ApiKey, mClient.Spec.AppIdentifier})
+		data = append(data, []string{mClient.Name, mClient.Namespace, mClient.Spec.Name, mClient.Spec.ClientType, mClient.Spec.ApiKey, mClient.Spec.AppIdentifier, strings.Join(mClient.Spec.ExcludedServices, ", ")})
 		table := tablewriter.NewWriter(out)
 		table.AppendBulk(data)
-		table.SetHeader([]string{"ID", "Namespace", "Name", "ClientType", "ApiKey", "AppIdentifier"})
+		table.SetHeader([]string{"ID", "Namespace", "Name", "ClientType", "ApiKey", "AppIdentifier", "Excluded Services"})
 		table.Render()
 		return nil
 	})