From ee3940e1638834ad737fe367c865d79645953aee Mon Sep 17 00:00:00 2001
From: Mike Arpaia <mike@arpaia.co>
Date: Mon, 9 Jan 2017 22:05:18 -0700
Subject: [PATCH] Adding the display_text attribute to the hosts API (#842)

* initial scaffolding of a hostResponseForHost helper to consistently get all required values when returning hosts via the api

* Using the hostname as the display text

* remove err: nil

* groob comments

* pre-allocating the hostResponses slice
---
 server/service/endpoint_hosts.go | 42 ++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/server/service/endpoint_hosts.go b/server/service/endpoint_hosts.go
index 8f13ce0e58..f6fd325df2 100644
--- a/server/service/endpoint_hosts.go
+++ b/server/service/endpoint_hosts.go
@@ -10,7 +10,16 @@ import (
 
 type hostResponse struct {
 	kolide.Host
-	Status string `json:"status"`
+	Status      string `json:"status"`
+	DisplayText string `json:"display_text"`
+}
+
+func hostResponseForHost(ctx context.Context, svc kolide.Service, host *kolide.Host) (*hostResponse, error) {
+	return &hostResponse{
+		Host:        *host,
+		Status:      host.Status(time.Now()),
+		DisplayText: host.HostName,
+	}, nil
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -35,12 +44,14 @@ func makeGetHostEndpoint(svc kolide.Service) endpoint.Endpoint {
 		if err != nil {
 			return getHostResponse{Err: err}, nil
 		}
+
+		resp, err := hostResponseForHost(ctx, svc, host)
+		if err != nil {
+			return getHostResponse{Err: err}, nil
+		}
+
 		return getHostResponse{
-			&hostResponse{
-				Host:   *host,
-				Status: host.Status(time.Now()),
-			},
-			nil,
+			Host: resp,
 		}, nil
 	}
 }
@@ -68,17 +79,16 @@ func makeListHostsEndpoint(svc kolide.Service) endpoint.Endpoint {
 			return listHostsResponse{Err: err}, nil
 		}
 
-		resp := listHostsResponse{Hosts: []hostResponse{}}
-		for _, host := range hosts {
-			resp.Hosts = append(
-				resp.Hosts,
-				hostResponse{
-					Host:   *host,
-					Status: host.Status(time.Now()),
-				},
-			)
+		hostResponses := make([]hostResponse, len(hosts), len(hosts))
+		for i, host := range hosts {
+			h, err := hostResponseForHost(ctx, svc, host)
+			if err != nil {
+				return listHostsResponse{Err: err}, nil
+			}
+
+			hostResponses[i] = *h
 		}
-		return resp, nil
+		return listHostsResponse{Hosts: hostResponses}, nil
 	}
 }