From 1cce02cf86e33234661c280e269b88636fcbfda8 Mon Sep 17 00:00:00 2001
From: Zachary Wasserman <zachwass2000@gmail.com>
Date: Thu, 6 Oct 2016 09:24:12 -0700
Subject: [PATCH] Fix bug causing empty lists to return as null in GetAll/List
 endpoints (#286)

Fixes #285
---
 server/service/endpoint_invites.go | 3 ++-
 server/service/endpoint_labels.go  | 2 +-
 server/service/endpoint_packs.go   | 2 +-
 server/service/endpoint_queries.go | 2 +-
 server/service/endpoint_users.go   | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/server/service/endpoint_invites.go b/server/service/endpoint_invites.go
index 9d267868b9..960323eefd 100644
--- a/server/service/endpoint_invites.go
+++ b/server/service/endpoint_invites.go
@@ -62,7 +62,8 @@ func makeListInvitesEndpoint(svc kolide.Service) endpoint.Endpoint {
 		if err != nil {
 			return listInvitesResponse{Err: err}, nil
 		}
-		var resp listInvitesResponse
+
+		resp := listInvitesResponse{Invites: []inviteResponse{}}
 		for _, invite := range invites {
 			resp.Invites = append(resp.Invites, inviteResponse{
 				ID:        invite.ID,
diff --git a/server/service/endpoint_labels.go b/server/service/endpoint_labels.go
index 98bac6e345..24e55b3b97 100644
--- a/server/service/endpoint_labels.go
+++ b/server/service/endpoint_labels.go
@@ -55,7 +55,7 @@ func makeGetAllLabelsEndpoint(svc kolide.Service) endpoint.Endpoint {
 		if err != nil {
 			return getAllLabelsResponse{Err: err}, nil
 		}
-		var resp getAllLabelsResponse
+		resp := getAllLabelsResponse{Labels: []getLabelResponse{}}
 		for _, label := range labels {
 			resp.Labels = append(resp.Labels, getLabelResponse{
 				ID:      label.ID,
diff --git a/server/service/endpoint_packs.go b/server/service/endpoint_packs.go
index 9c0d4f2657..5f73099154 100644
--- a/server/service/endpoint_packs.go
+++ b/server/service/endpoint_packs.go
@@ -55,7 +55,7 @@ func makeGetAllPacksEndpoint(svc kolide.Service) endpoint.Endpoint {
 		if err != nil {
 			return getPackResponse{Err: err}, nil
 		}
-		var resp getAllPacksResponse
+		resp := getAllPacksResponse{Packs: []getPackResponse{}}
 		for _, pack := range packs {
 			resp.Packs = append(resp.Packs, getPackResponse{
 				ID:       pack.ID,
diff --git a/server/service/endpoint_queries.go b/server/service/endpoint_queries.go
index 6c3eef3ec8..386da4d516 100644
--- a/server/service/endpoint_queries.go
+++ b/server/service/endpoint_queries.go
@@ -65,7 +65,7 @@ func makeGetAllQueriesEndpoint(svc kolide.Service) endpoint.Endpoint {
 		if err != nil {
 			return getAllQueriesResponse{Err: err}, nil
 		}
-		var resp getAllQueriesResponse
+		resp := getAllQueriesResponse{Queries: []getQueryResponse{}}
 		for _, query := range queries {
 			resp.Queries = append(resp.Queries, getQueryResponse{
 				ID:           query.ID,
diff --git a/server/service/endpoint_users.go b/server/service/endpoint_users.go
index 8854e1cb3f..685f34fbe7 100644
--- a/server/service/endpoint_users.go
+++ b/server/service/endpoint_users.go
@@ -129,7 +129,7 @@ func makeListUsersEndpoint(svc kolide.Service) endpoint.Endpoint {
 			return listUsersResponse{Err: err}, nil
 		}
 
-		var resp listUsersResponse
+		resp := listUsersResponse{Users: []getUserResponse{}}
 		for _, user := range users {
 			resp.Users = append(resp.Users, getUserResponse{
 				ID:                       user.ID,