X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d44a5c508cfa664134daad806d7be9a7cb0bd6ee..59b22379a693d1fc15b4b77e58e47bac89e62660:/sdk/go/util/util.go

diff --git a/sdk/go/util/util.go b/sdk/go/util/util.go
index f163a82570..6bc86250b4 100644
--- a/sdk/go/util/util.go
+++ b/sdk/go/util/util.go
@@ -3,9 +3,7 @@
 package util
 
 import (
-	"errors"
 	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
-	"log"
 )
 
 func UserIsAdmin(arv arvadosclient.ArvadosClient) (is_admin bool, err error) {
@@ -17,40 +15,20 @@ func UserIsAdmin(arv arvadosclient.ArvadosClient) (is_admin bool, err error) {
 	return u.IsAdmin, err
 }
 
-func SdkListResponseContainsAllAvailableItems(response map[string]interface{}) (containsAll bool, numContained int, numAvailable int) {
-	if value, ok := response["items"]; ok {
-		items := value.([]interface{})
-		{
-			var itemsAvailable interface{}
-			if itemsAvailable, ok = response["items_available"]; !ok {
-				// TODO(misha): Consider returning an error here (and above if
-				// we can't find items) so that callers can recover.
-				log.Fatalf("API server did not return the number of items available")
-			}
-			numContained = len(items)
-			numAvailable = int(itemsAvailable.(float64))
-			// If we never entered this block, allAvailable would be false by
-			// default, which is what we want
-			containsAll = numContained == numAvailable
-		}
+// Returns the total count of a particular type of resource
+//
+//   resource - the arvados resource to count
+// return
+//   count - the number of items of type resource the api server reports, if no error
+//   err - error accessing the resource, or nil if no error
+func NumberItemsAvailable(client arvadosclient.ArvadosClient, resource string) (count int, err error) {
+	var response struct {
+		ItemsAvailable int `json:"items_available"`
 	}
-	return
-}
-
-func IterateSdkListItems(response map[string]interface{}) (c <-chan map[string]interface{}, err error) {
-	if value, ok := response["items"]; ok {
-		ch := make(chan map[string]interface{})
-		c = ch
-		items := value.([]interface{})
-		go func() {
-			for _, item := range items {
-				ch <- item.(map[string]interface{})
-			}
-			close(ch)
-		}()
-	} else {
-		err = errors.New("Could not find \"items\" field in response " +
-			"passed to IterateSdkListItems()")
+	sdkParams := arvadosclient.Dict{"limit": 0}
+	err = client.List(resource, sdkParams, &response)
+	if err == nil {
+		count = response.ItemsAvailable
 	}
 	return
 }