[ARVADOS] updated: 2.1.0-443-ga439d4d32
Git user
git at public.arvados.org
Wed Feb 24 18:45:33 UTC 2021
Summary of changes:
lib/controller/router/response.go | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
discards 9260c139580f7c931805f10d09d66f00af9fbbfe (commit)
discards 9c54e08e292d86ed155a6ce8b873867511c5a529 (commit)
via a439d4d3228cae6f2d518c24d1d58a259142e5cd (commit)
via 73d3b56ce6244642486d5ca5e9401a339467b94e (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (9260c139580f7c931805f10d09d66f00af9fbbfe)
\
N -- N -- N (a439d4d3228cae6f2d518c24d1d58a259142e5cd)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit a439d4d3228cae6f2d518c24d1d58a259142e5cd
Author: Ward Vandewege <ward at curii.com>
Date: Tue Feb 23 17:35:51 2021 -0500
17119: fix field type on legacy objects.
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>
diff --git a/sdk/go/arvados/job.go b/sdk/go/arvados/job.go
index 18c84b108..ccf752ce7 100644
--- a/sdk/go/arvados/job.go
+++ b/sdk/go/arvados/job.go
@@ -8,39 +8,39 @@ import "time"
// Job is an arvados#job record
type Job struct {
- UUID string `json:"uuid"`
- Etag string `json:"etag"`
- OwnerUUID string `json:"owner_uuid"`
- ModifiedByClientUUID string `json:"modified_by_client_uuid"`
- ModifiedByUserUUID string `json:"modified_by_user_uuid"`
- ModifiedAt time.Time `json:"modified_at"`
- SubmitID string `json:"submit_id"`
- Script string `json:"script"`
- CancelledByClientUUID string `json:"cancelled_by_client_uuid"`
- CancelledByUserUUID string `json:"cancelled_by_user_uuid"`
- CancelledAt time.Time `json:"cancelled_at"`
- StartedAt time.Time `json:"started_at"`
- FinishedAt time.Time `json:"finished_at"`
- Running bool `json:"running"`
- Success bool `json:"success"`
- Output string `json:"output"`
- CreatedAt time.Time `json:"created_at"`
- UpdatedAt time.Time `json:"updated_at"`
- IsLockedByUUID string `json:"is_locked_by_uuid"`
- Log string `json:"log"`
- TasksSummary string `json:"tasks_summary"`
- RuntimeConstraints string `json:"runtime_constraints"`
- Nondeterministic bool `json:"nondeterministic"`
- Repository string `json:"repository"`
- SuppliedScriptVersion string `json:"supplied_script_version"`
- DockerImageLocator string `json:"docker_image_locator"`
- Priority int `json:"priority"`
- Description string `json:"description"`
- State string `json:"state"`
- ArvadosSDKVersion string `json:"arvados_sdk_version"`
- Components string `json:"components"`
- ScriptParametersDigest string `json:"script_parameters_digest"`
- WritableBy []string `json:"writable_by,omitempty"`
+ UUID string `json:"uuid"`
+ Etag string `json:"etag"`
+ OwnerUUID string `json:"owner_uuid"`
+ ModifiedByClientUUID string `json:"modified_by_client_uuid"`
+ ModifiedByUserUUID string `json:"modified_by_user_uuid"`
+ ModifiedAt time.Time `json:"modified_at"`
+ SubmitID string `json:"submit_id"`
+ Script string `json:"script"`
+ CancelledByClientUUID string `json:"cancelled_by_client_uuid"`
+ CancelledByUserUUID string `json:"cancelled_by_user_uuid"`
+ CancelledAt time.Time `json:"cancelled_at"`
+ StartedAt time.Time `json:"started_at"`
+ FinishedAt time.Time `json:"finished_at"`
+ Running bool `json:"running"`
+ Success bool `json:"success"`
+ Output string `json:"output"`
+ CreatedAt time.Time `json:"created_at"`
+ UpdatedAt time.Time `json:"updated_at"`
+ IsLockedByUUID string `json:"is_locked_by_uuid"`
+ Log string `json:"log"`
+ TasksSummary map[string]interface{} `json:"tasks_summary"`
+ RuntimeConstraints map[string]interface{} `json:"runtime_constraints"`
+ Nondeterministic bool `json:"nondeterministic"`
+ Repository string `json:"repository"`
+ SuppliedScriptVersion string `json:"supplied_script_version"`
+ DockerImageLocator string `json:"docker_image_locator"`
+ Priority int `json:"priority"`
+ Description string `json:"description"`
+ State string `json:"state"`
+ ArvadosSDKVersion string `json:"arvados_sdk_version"`
+ Components map[string]interface{} `json:"components"`
+ ScriptParametersDigest string `json:"script_parameters_digest"`
+ WritableBy []string `json:"writable_by,omitempty"`
}
func (g Job) resourceName() string {
diff --git a/sdk/go/arvados/pipeline_instance.go b/sdk/go/arvados/pipeline_instance.go
index c3645fd70..ace182685 100644
--- a/sdk/go/arvados/pipeline_instance.go
+++ b/sdk/go/arvados/pipeline_instance.go
@@ -8,24 +8,24 @@ import "time"
// PipelineInstance is an arvados#pipelineInstance record
type PipelineInstance struct {
- UUID string `json:"uuid"`
- Etag string `json:"etag"`
- OwnerUUID string `json:"owner_uuid"`
- CreatedAt time.Time `json:"created_at"`
- ModifiedByClientUUID string `json:"modified_by_client_uuid"`
- ModifiedByUserUUID string `json:"modified_by_user_uuid"`
- ModifiedAt time.Time `json:"modified_at"`
- PipelineTemplateUUID string `json:"pipeline_template_uuid"`
- Name string `json:"name"`
- Components string `json:"components"`
- UpdatedAt time.Time `json:"updated_at"`
- Properties string `json:"properties"`
- State string `json:"state"`
- ComponentsSummary string `json:"components_summary"`
- StartedAt time.Time `json:"started_at"`
- FinishedAt time.Time `json:"finished_at"`
- Description string `json:"description"`
- WritableBy []string `json:"writable_by,omitempty"`
+ UUID string `json:"uuid"`
+ Etag string `json:"etag"`
+ OwnerUUID string `json:"owner_uuid"`
+ CreatedAt time.Time `json:"created_at"`
+ ModifiedByClientUUID string `json:"modified_by_client_uuid"`
+ ModifiedByUserUUID string `json:"modified_by_user_uuid"`
+ ModifiedAt time.Time `json:"modified_at"`
+ PipelineTemplateUUID string `json:"pipeline_template_uuid"`
+ Name string `json:"name"`
+ Components map[string]interface{} `json:"components"`
+ UpdatedAt time.Time `json:"updated_at"`
+ Properties map[string]interface{} `json:"properties"`
+ State string `json:"state"`
+ ComponentsSummary map[string]interface{} `json:"components_summary"`
+ StartedAt time.Time `json:"started_at"`
+ FinishedAt time.Time `json:"finished_at"`
+ Description string `json:"description"`
+ WritableBy []string `json:"writable_by,omitempty"`
}
func (g PipelineInstance) resourceName() string {
diff --git a/sdk/go/arvados/pipeline_template.go b/sdk/go/arvados/pipeline_template.go
index 85fec1c12..31d9e8b2f 100644
--- a/sdk/go/arvados/pipeline_template.go
+++ b/sdk/go/arvados/pipeline_template.go
@@ -8,18 +8,18 @@ import "time"
// PipelineTemplate is an arvados#pipelineTemplate record
type PipelineTemplate struct {
- UUID string `json:"uuid"`
- Etag string `json:"etag"`
- OwnerUUID string `json:"owner_uuid"`
- CreatedAt time.Time `json:"created_at"`
- ModifiedByClientUUID string `json:"modified_by_client_uuid"`
- ModifiedByUserUUID string `json:"modified_by_user_uuid"`
- ModifiedAt time.Time `json:"modified_at"`
- Name string `json:"name"`
- Components string `json:"components"`
- UpdatedAt time.Time `json:"updated_at"`
- Description string `json:"description"`
- WritableBy []string `json:"writable_by,omitempty"`
+ UUID string `json:"uuid"`
+ Etag string `json:"etag"`
+ OwnerUUID string `json:"owner_uuid"`
+ CreatedAt time.Time `json:"created_at"`
+ ModifiedByClientUUID string `json:"modified_by_client_uuid"`
+ ModifiedByUserUUID string `json:"modified_by_user_uuid"`
+ ModifiedAt time.Time `json:"modified_at"`
+ Name string `json:"name"`
+ Components map[string]interface{} `json:"components"`
+ UpdatedAt time.Time `json:"updated_at"`
+ Description string `json:"description"`
+ WritableBy []string `json:"writable_by,omitempty"`
}
func (g PipelineTemplate) resourceName() string {
diff --git a/sdk/go/arvados/trait.go b/sdk/go/arvados/trait.go
index 9a2e3cf67..fb0e799b6 100644
--- a/sdk/go/arvados/trait.go
+++ b/sdk/go/arvados/trait.go
@@ -8,17 +8,17 @@ import "time"
// Trait is an arvados#trait record
type Trait struct {
- UUID string `json:"uuid"`
- Etag string `json:"etag"`
- OwnerUUID string `json:"owner_uuid"`
- CreatedAt time.Time `json:"created_at"`
- ModifiedByClientUUID string `json:"modified_by_client_uuid"`
- ModifiedByUserUUID string `json:"modified_by_user_uuid"`
- ModifiedAt time.Time `json:"modified_at"`
- Name string `json:"name"`
- Properties string `json:"properties"`
- UpdatedAt time.Time `json:"updated_at"`
- WritableBy []string `json:"writable_by,omitempty"`
+ UUID string `json:"uuid"`
+ Etag string `json:"etag"`
+ OwnerUUID string `json:"owner_uuid"`
+ CreatedAt time.Time `json:"created_at"`
+ ModifiedByClientUUID string `json:"modified_by_client_uuid"`
+ ModifiedByUserUUID string `json:"modified_by_user_uuid"`
+ ModifiedAt time.Time `json:"modified_at"`
+ Name string `json:"name"`
+ Properties map[string]interface{} `json:"properties"`
+ UpdatedAt time.Time `json:"updated_at"`
+ WritableBy []string `json:"writable_by,omitempty"`
}
func (g Trait) resourceName() string {
commit 73d3b56ce6244642486d5ca5e9401a339467b94e
Author: Ward Vandewege <ward at curii.com>
Date: Tue Feb 23 08:57:05 2021 -0500
17119: drop the 'Kind' fields from the structs, autogenerate them instead.
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>
diff --git a/lib/controller/router/response.go b/lib/controller/router/response.go
index 309ed48f6..aee2fc590 100644
--- a/lib/controller/router/response.go
+++ b/lib/controller/router/response.go
@@ -77,13 +77,20 @@ func (rtr *router) sendResponse(w http.ResponseWriter, req *http.Request, resp i
if included, ok := tmp["included"]; ok && included == nil {
tmp["included"] = make([]interface{}, 0)
}
-
defaultItemKind := ""
if strings.HasSuffix(respKind, "List") {
defaultItemKind = strings.TrimSuffix(respKind, "List")
}
- if items, ok := tmp["items"].([]interface{}); ok {
+ var items, included []interface{}
+ var itemsOK, includedOK bool
+ items, itemsOK = tmp["items"].([]interface{})
+ included, includedOK = tmp["included"].([]interface{})
+ if includedOK && len(included) > 0 {
+ items = append(items, included...)
+ }
+
+ if itemsOK {
for i, item := range items {
// Fill in "kind" by inspecting UUID/PDH if
// possible; fall back on assuming each
diff --git a/sdk/go/arvados/container.go b/sdk/go/arvados/container.go
index b8530db34..f54263470 100644
--- a/sdk/go/arvados/container.go
+++ b/sdk/go/arvados/container.go
@@ -43,7 +43,6 @@ type ContainerRequest struct {
ModifiedByUserUUID string `json:"modified_by_user_uuid"`
ModifiedAt time.Time `json:"modified_at"`
Href string `json:"href"`
- Kind string `json:"kind"`
Etag string `json:"etag"`
Name string `json:"name"`
Description string `json:"description"`
diff --git a/sdk/go/arvados/group.go b/sdk/go/arvados/group.go
index 07632059e..d5243dc17 100644
--- a/sdk/go/arvados/group.go
+++ b/sdk/go/arvados/group.go
@@ -16,7 +16,6 @@ type Group struct {
GroupClass string `json:"group_class"`
Etag string `json:"etag"`
Href string `json:"href"`
- Kind string `json:"kind"`
TrashAt *time.Time `json:"trash_at"`
CreatedAt time.Time `json:"created_at"`
ModifiedAt time.Time `json:"modified_at"`
diff --git a/sdk/go/arvados/job.go b/sdk/go/arvados/job.go
index 7b287b599..18c84b108 100644
--- a/sdk/go/arvados/job.go
+++ b/sdk/go/arvados/job.go
@@ -38,7 +38,6 @@ type Job struct {
Description string `json:"description"`
State string `json:"state"`
ArvadosSDKVersion string `json:"arvados_sdk_version"`
- Kind string `json:"kind"`
Components string `json:"components"`
ScriptParametersDigest string `json:"script_parameters_digest"`
WritableBy []string `json:"writable_by,omitempty"`
diff --git a/sdk/go/arvados/pipeline_instance.go b/sdk/go/arvados/pipeline_instance.go
index f2c0c81a0..c3645fd70 100644
--- a/sdk/go/arvados/pipeline_instance.go
+++ b/sdk/go/arvados/pipeline_instance.go
@@ -25,7 +25,6 @@ type PipelineInstance struct {
StartedAt time.Time `json:"started_at"`
FinishedAt time.Time `json:"finished_at"`
Description string `json:"description"`
- Kind string `json:"kind"`
WritableBy []string `json:"writable_by,omitempty"`
}
diff --git a/sdk/go/arvados/pipeline_template.go b/sdk/go/arvados/pipeline_template.go
index d4677164c..85fec1c12 100644
--- a/sdk/go/arvados/pipeline_template.go
+++ b/sdk/go/arvados/pipeline_template.go
@@ -19,7 +19,6 @@ type PipelineTemplate struct {
Components string `json:"components"`
UpdatedAt time.Time `json:"updated_at"`
Description string `json:"description"`
- Kind string `json:"kind"`
WritableBy []string `json:"writable_by,omitempty"`
}
diff --git a/sdk/go/arvados/trait.go b/sdk/go/arvados/trait.go
index 3195958f5..9a2e3cf67 100644
--- a/sdk/go/arvados/trait.go
+++ b/sdk/go/arvados/trait.go
@@ -18,7 +18,6 @@ type Trait struct {
Name string `json:"name"`
Properties string `json:"properties"`
UpdatedAt time.Time `json:"updated_at"`
- Kind string `json:"kind"`
WritableBy []string `json:"writable_by,omitempty"`
}
diff --git a/sdk/go/arvados/user.go b/sdk/go/arvados/user.go
index 7693c8442..68960144a 100644
--- a/sdk/go/arvados/user.go
+++ b/sdk/go/arvados/user.go
@@ -16,7 +16,6 @@ type User struct {
Email string `json:"email"`
FullName string `json:"full_name"`
FirstName string `json:"first_name"`
- Kind string `json:"kind"`
LastName string `json:"last_name"`
IdentityURL string `json:"identity_url"`
IsInvited bool `json:"is_invited"`
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list