@@ -26,7 +26,7 @@ func Apply(data []byte, storage clientapi.ClientMappings) (errs errors.ErrorList

 	}

 	for _, item := range conf.Items {

-		kind, itemId, parseErrs := parseKindAndId(item)

+		kind, itemID, parseErrs := parseKindAndID(item)

 		if len(parseErrs) != 0 {

 			errs = append(errs, parseErrs...)

 			continue

@@ -34,17 +34,17 @@ func Apply(data []byte, storage clientapi.ClientMappings) (errs errors.ErrorList

 		client, path := getClientAndPath(kind, storage)

 		if client == nil {

-			errs = append(errs, fmt.Errorf("The resource %s is not a known type - unable to create %s", kind, itemId))

+			errs = append(errs, fmt.Errorf("The resource %s is not a known type - unable to create %s", kind, itemID))

 			continue

 		}

 		// Serialize the single Config item back into JSON

-		itemJson, _ := json.Marshal(item)

+		itemJSON, _ := json.Marshal(item)

-		request := client.Verb("POST").Path(path).Body(itemJson)

+		request := client.Verb("POST").Path(path).Body(itemJSON)

 		_, err := request.Do().Get()

 		if err != nil {

-			errs = append(errs, fmt.Errorf("[%s#%s] Failed to create: %v", kind, itemId, err))

+			errs = append(errs, fmt.Errorf("[%s#%s] Failed to create: %v", kind, itemID, err))

 		}

 	}

@@ -55,16 +55,16 @@ func Apply(data []byte, storage clientapi.ClientMappings) (errs errors.ErrorList

 // kind.

 func getClientAndPath(kind string, mappings clientapi.ClientMappings) (client clientapi.RESTClient, path string) {

 	for k, m := range mappings {

-		if k == kind {

+		if m.Kind == kind {

 			return m.Client, k

 		}

 	}

 	return

 }

-// parseKindAndId extracts the 'kind' and 'id' fields from the Config item JSON

+// parseKindAndID extracts the 'kind' and 'id' fields from the Config item JSON

 // and report errors if these fields are missing.

-func parseKindAndId(item interface{}) (kind, id string, errs errors.ErrorList) {

+func parseKindAndID(item interface{}) (kind, id string, errs errors.ErrorList) {

 	itemMap := item.(map[string]interface{})

 	kind, ok := itemMap["kind"].(string)

@@ -83,6 +83,6 @@ func parseKindAndId(item interface{}) (kind, id string, errs errors.ErrorList) {

 // reportError provides a human-readable error message that include the Config

 // item JSON representation.

 func reportError(item interface{}, message string) error {

-	itemJson, _ := json.Marshal(item)

-	return fmt.Errorf(message+": %s", string(itemJson))

+	itemJSON, _ := json.Marshal(item)

+	return fmt.Errorf(message+": %s", string(itemJSON))

 }

@@ -17,23 +17,19 @@ func TestParseKindAndItem(t *testing.T) {

 		t.Errorf("Failed to parse Config: %v", err)

 	}

-	kind, itemId, err := parseKindAndId(conf.Items[0])

+	kind, itemID, err := parseKindAndID(conf.Items[0])

 	if len(err) != 0 {

 		t.Errorf("Failed to parse kind and id from the Config item: %v", err)

 	}

-	if kind != "Service" && itemId != "frontend" {

-		t.Errorf("Invalid kind and id, should be Service and frontend: %s, %s", kind, itemId)

+	if kind != "Service" && itemID != "frontend" {

+		t.Errorf("Invalid kind and id, should be Service and frontend: %s, %s", kind, itemID)

 	}

 }

 func TestApply(t *testing.T) {

-	invalidData := []byte(`{"items": [ { "foo": "bar" } ]}`)

-	invalidConf := configJSON{}

-	if err := json.Unmarshal(invalidData, &invalidConf); err != nil {

-		t.Errorf("Failed to parse Config: %v", err)

-	}

 	clients := clientapi.ClientMappings{}

+	invalidData := []byte(`{"items": [ { "foo": "bar" } ]}`)

 	errs := Apply(invalidData, clients)

 	if len(errs) == 0 {

 		t.Errorf("Expected missing kind field for Config item, got %v", errs)

@@ -44,22 +40,30 @@ func TestApply(t *testing.T) {

 	}

 }

+func TestGetClientAndPath(t *testing.T) {

+	kubeClient, _ := kubeclient.New("127.0.0.1", nil)

+	testClientMappings := clientapi.ClientMappings{

+		"pods":     {"Pod", kubeClient.RESTClient},

+		"services": {"Service", kubeClient.RESTClient},

+	}

+	client, path := getClientAndPath("Service", testClientMappings)

+	if client != kubeClient.RESTClient {

+		t.Errorf("Failed to get client for Service")

+	}

+	if path != "services" {

+		t.Errorf("Failed to get path for Service")

+	}

+}

+

 func ExampleApply() {

 	kubeClient, _ := kubeclient.New("127.0.0.1", nil)

-	clients := clientapi.ClientMappings{

-		"pods": {

-			Kind:   "Pod",

-			Client: kubeClient.RESTClient,

-		},

-		"services": {

-			Kind:   "Service",

-			Client: kubeClient.RESTClient,

-		},

+	testClientMappings := clientapi.ClientMappings{

+		"pods":     {"Pod", kubeClient.RESTClient},

+		"services": {"Service", kubeClient.RESTClient},

 	}

 	data, _ := ioutil.ReadFile("../../examples/guestbook/config.json")

-	errs := Apply(data, clients)

+	errs := Apply(data, testClientMappings)

 	fmt.Println(errs)

 	// Output:

-	// [The resource Service is not a known type - unable to create frontend The resource Service is not a known type - unable to create redismaster The resource Service is not a known type - unable to create redisslave The resource Pod is not a known type - unable to create redis-master-2 The resource ReplicationController is not a known type - unable to create frontendController The resource ReplicationController is not a known type - unable to create redisSlaveController]

-	//

+	// [[Service#frontend] Failed to create: Post http://127.0.0.1/api/v1beta1/services: dial tcp 127.0.0.1:80: connection refused [Service#redismaster] Failed to create: Post http://127.0.0.1/api/v1beta1/services: dial tcp 127.0.0.1:80: connection refused [Service#redisslave] Failed to create: Post http://127.0.0.1/api/v1beta1/services: dial tcp 127.0.0.1:80: connection refused [Pod#redis-master-2] Failed to create: Post http://127.0.0.1/api/v1beta1/pods: dial tcp 127.0.0.1:80: connection refused The resource ReplicationController is not a known type - unable to create frontendController The resource ReplicationController is not a known type - unable to create redisSlaveController]

 }