14287: Remove omitempty tags so zeroes/nulls appear in responses.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --git a/sdk/go/arvados/api_client_authorization.go b/sdk/go/arvados/api_client_authorization.go
index 17cff235db82fba55fa12c6ff08fe0a114dff27b..7c17cdef04debdf4540b6c2de761673c34d01883 100644 (file)
--- a/sdk/go/arvados/api_client_authorization.go
+++ b/sdk/go/arvados/api_client_authorization.go
@@ -6,10 +6,10 @@ package arvados
 
 // APIClientAuthorization is an arvados#apiClientAuthorization resource.
 type APIClientAuthorization struct {
-       UUID      string   `json:"uuid,omitempty"`
-       APIToken  string   `json:"api_token,omitempty"`
-       ExpiresAt string   `json:"expires_at,omitempty"`
-       Scopes    []string `json:"scopes,omitempty"`
+       UUID      string   `json:"uuid"`
+       APIToken  string   `json:"api_token"`
+       ExpiresAt string   `json:"expires_at"`
+       Scopes    []string `json:"scopes"`
 }
 
 // APIClientAuthorizationList is an arvados#apiClientAuthorizationList resource.

diff --git a/sdk/go/arvados/collection.go b/sdk/go/arvados/collection.go
index f374eea07054b3fc08da7a37f163a50baf8e8d5f..136159a7e02897b825ce7f6b5c87c74798f38255 100644 (file)
--- a/sdk/go/arvados/collection.go
+++ b/sdk/go/arvados/collection.go
@@ -15,23 +15,24 @@ import (
 
 // Collection is an arvados#collection resource.
 type Collection struct {
-       UUID                      string     `json:"uuid,omitempty"`
-       OwnerUUID                 string     `json:"owner_uuid,omitempty"`
-       TrashAt                   *time.Time `json:"trash_at,omitempty"`
-       ManifestText              string     `json:"manifest_text"`
-       UnsignedManifestText      string     `json:"unsigned_manifest_text,omitempty"`
-       Name                      string     `json:"name,omitempty"`
-       CreatedAt                 *time.Time `json:"created_at,omitempty"`
-       ModifiedAt                *time.Time `json:"modified_at,omitempty"`
-       PortableDataHash          string     `json:"portable_data_hash,omitempty"`
-       ReplicationConfirmed      *int       `json:"replication_confirmed,omitempty"`
-       ReplicationConfirmedAt    *time.Time `json:"replication_confirmed_at,omitempty"`
-       ReplicationDesired        *int       `json:"replication_desired,omitempty"`
-       StorageClassesDesired     []string   `json:"storage_classes_desired,omitempty"`
-       StorageClassesConfirmed   []string   `json:"storage_classes_confirmed,omitempty"`
-       StorageClassesConfirmedAt *time.Time `json:"storage_classes_confirmed_at,omitempty"`
-       DeleteAt                  *time.Time `json:"delete_at,omitempty"`
-       IsTrashed                 bool       `json:"is_trashed,omitempty"`
+       UUID                      string                 `json:"uuid"`
+       OwnerUUID                 string                 `json:"owner_uuid"`
+       TrashAt                   *time.Time             `json:"trash_at"`
+       ManifestText              string                 `json:"manifest_text"`
+       UnsignedManifestText      string                 `json:"unsigned_manifest_text"`
+       Name                      string                 `json:"name"`
+       CreatedAt                 *time.Time             `json:"created_at"`
+       ModifiedAt                *time.Time             `json:"modified_at"`
+       PortableDataHash          string                 `json:"portable_data_hash"`
+       ReplicationConfirmed      *int                   `json:"replication_confirmed"`
+       ReplicationConfirmedAt    *time.Time             `json:"replication_confirmed_at"`
+       ReplicationDesired        *int                   `json:"replication_desired"`
+       StorageClassesDesired     []string               `json:"storage_classes_desired"`
+       StorageClassesConfirmed   []string               `json:"storage_classes_confirmed"`
+       StorageClassesConfirmedAt *time.Time             `json:"storage_classes_confirmed_at"`
+       DeleteAt                  *time.Time             `json:"delete_at"`
+       IsTrashed                 bool                   `json:"is_trashed"`
+       Properties                map[string]interface{} `json:"properties"`
 }
 
 func (c Collection) resourceName() string {

diff --git a/sdk/go/arvados/group.go b/sdk/go/arvados/group.go
index 6b5718a6c740e69b0fd5c4fc8f19106c7dddef11..bf2fe72ff880b9a3885482bbd326aab4255c0691 100644 (file)
--- a/sdk/go/arvados/group.go
+++ b/sdk/go/arvados/group.go
@@ -6,9 +6,9 @@ package arvados
 
 // Group is an arvados#group record
 type Group struct {
-       UUID       string `json:"uuid,omitempty"`
-       Name       string `json:"name,omitempty"`
-       OwnerUUID  string `json:"owner_uuid,omitempty"`
+       UUID       string `json:"uuid"`
+       Name       string `json:"name"`
+       OwnerUUID  string `json:"owner_uuid"`
        GroupClass string `json:"group_class"`
 }
 

diff --git a/sdk/go/arvados/link.go b/sdk/go/arvados/link.go
index dee13556e1098f1788a36a55c49eb39df44c78a1..fbd699f30653035ff8c23ad1f62223c5ca54adc9 100644 (file)
--- a/sdk/go/arvados/link.go
+++ b/sdk/go/arvados/link.go
@@ -7,13 +7,13 @@ package arvados
 // Link is an arvados#link record
 type Link struct {
        UUID      string `json:"uuid,omiempty"`
-       OwnerUUID string `json:"owner_uuid,omitempty"`
-       Name      string `json:"name,omitempty"`
-       LinkClass string `json:"link_class,omitempty"`
-       HeadUUID  string `json:"head_uuid,omitempty"`
-       HeadKind  string `json:"head_kind,omitempty"`
-       TailUUID  string `json:"tail_uuid,omitempty"`
-       TailKind  string `json:"tail_kind,omitempty"`
+       OwnerUUID string `json:"owner_uuid"`
+       Name      string `json:"name"`
+       LinkClass string `json:"link_class"`
+       HeadUUID  string `json:"head_uuid"`
+       HeadKind  string `json:"head_kind"`
+       TailUUID  string `json:"tail_uuid"`
+       TailKind  string `json:"tail_kind"`
 }
 
 // UserList is an arvados#userList resource.

diff --git a/sdk/go/arvados/log.go b/sdk/go/arvados/log.go
index 6f72bf7c6c9f46d931aaafbe9c4f8594ac470984..6f72634e5457e7379ee6660297be9aced63b91a0 100644 (file)
--- a/sdk/go/arvados/log.go
+++ b/sdk/go/arvados/log.go
@@ -10,14 +10,14 @@ import (
 
 // Log is an arvados#log record
 type Log struct {
-       ID              uint64                 `json:"id,omitempty"`
-       UUID            string                 `json:"uuid,omitempty"`
-       ObjectUUID      string                 `json:"object_uuid,omitempty"`
-       ObjectOwnerUUID string                 `json:"object_owner_uuid,omitempty"`
-       EventType       string                 `json:"event_type,omitempty"`
-       EventAt         *time.Time             `json:"event,omitempty"`
-       Properties      map[string]interface{} `json:"properties,omitempty"`
-       CreatedAt       *time.Time             `json:"created_at,omitempty"`
+       ID              uint64                 `json:"id"`
+       UUID            string                 `json:"uuid"`
+       ObjectUUID      string                 `json:"object_uuid"`
+       ObjectOwnerUUID string                 `json:"object_owner_uuid"`
+       EventType       string                 `json:"event_type"`
+       EventAt         *time.Time             `json:"event"`
+       Properties      map[string]interface{} `json:"properties"`
+       CreatedAt       *time.Time             `json:"created_at"`
 }
 
 // LogList is an arvados#logList resource.

diff --git a/sdk/go/arvados/node.go b/sdk/go/arvados/node.go
index cc844fe8253c1684dcec9b006659b8a08e84e8cf..97466eb8ae8bc44863cf4711582268108772bbf6 100644 (file)
--- a/sdk/go/arvados/node.go
+++ b/sdk/go/arvados/node.go
@@ -12,10 +12,10 @@ type Node struct {
        Domain     string         `json:"domain"`
        Hostname   string         `json:"hostname"`
        IPAddress  string         `json:"ip_address"`
-       LastPingAt *time.Time     `json:"last_ping_at,omitempty"`
+       LastPingAt *time.Time     `json:"last_ping_at"`
        SlotNumber int            `json:"slot_number"`
        Status     string         `json:"status"`
-       JobUUID    string         `json:"job_uuid,omitempty"`
+       JobUUID    string         `json:"job_uuid"`
        Properties NodeProperties `json:"properties"`
 }
 

diff --git a/sdk/go/arvados/user.go b/sdk/go/arvados/user.go
index 3a36e5ebaee6614ba6ae64be3f353bd3edef6dba..27d2b28a42b6c5c4312d0aa16624e8061103ac5d 100644 (file)
--- a/sdk/go/arvados/user.go
+++ b/sdk/go/arvados/user.go
@@ -6,11 +6,11 @@ package arvados
 
 // User is an arvados#user record
 type User struct {
-       UUID     string `json:"uuid,omitempty"`
+       UUID     string `json:"uuid"`
        IsActive bool   `json:"is_active"`
        IsAdmin  bool   `json:"is_admin"`
-       Username string `json:"username,omitempty"`
-       Email    string `json:"email,omitempty"`
+       Username string `json:"username"`
+       Email    string `json:"email"`
 }
 
 // UserList is an arvados#userList resource.

diff --git a/sdk/go/arvados/workflow.go b/sdk/go/arvados/workflow.go
index 09c8c71e8ef5e7c1c03c5f33aa6f3a6c923cf22d..5ddc8732df16b09ad81f21686b25f05cca9eb873 100644 (file)
--- a/sdk/go/arvados/workflow.go
+++ b/sdk/go/arvados/workflow.go
@@ -8,13 +8,13 @@ import "time"
 
 // Workflow is an arvados#workflow resource.
 type Workflow struct {
-       UUID        string     `json:"uuid,omitempty"`
-       OwnerUUID   string     `json:"owner_uuid,omitempty"`
-       Name        string     `json:"name,omitempty"`
-       Description string     `json:"description,omitempty"`
-       Definition  string     `json:"definition,omitempty"`
-       CreatedAt   *time.Time `json:"created_at,omitempty"`
-       ModifiedAt  *time.Time `json:"modified_at,omitempty"`
+       UUID        string     `json:"uuid"`
+       OwnerUUID   string     `json:"owner_uuid"`
+       Name        string     `json:"name"`
+       Description string     `json:"description"`
+       Definition  string     `json:"definition"`
+       CreatedAt   *time.Time `json:"created_at"`
+       ModifiedAt  *time.Time `json:"modified_at"`
 }
 
 // WorkflowList is an arvados#workflowList resource.