[ARVADOS] updated: 2.1.0-504-g16905dd94

[Git user]

Summary of changes:
 lib/controller/federation/conn.go | 4 ++++
 lib/controller/router/router.go   | 7 +++++++
 lib/controller/rpc/conn.go        | 7 +++++++
 sdk/go/arvados/api.go             | 2 ++
 services/api/app/models/group.rb  | 4 ++--
 5 files changed, 22 insertions(+), 2 deletions(-)

       via  16905dd94cb77336351a7a6d2e6ece957f8f3368 (commit)
       via  eb5d4a8a2b93e9d21ddc7edd805fc181b10521bd (commit)
      from  29634bb07a1f3c9be44e34b24e71badc4b42a860 (commit)

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 16905dd94cb77336351a7a6d2e6ece957f8f3368
Author: Ward Vandewege <ward at curii.com>
Date:   Mon Mar 22 10:37:58 2021 -0400

    17119: add missing GroupTrash endpoint.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/lib/controller/federation/conn.go b/lib/controller/federation/conn.go
index b2e928b82..6029056b2 100644
--- a/lib/controller/federation/conn.go
+++ b/lib/controller/federation/conn.go
@@ -433,6 +433,10 @@ func (conn *Conn) GroupDelete(ctx context.Context, options arvados.DeleteOptions
 	return conn.chooseBackend(options.UUID).GroupDelete(ctx, options)
 }
 
+func (conn *Conn) GroupTrash(ctx context.Context, options arvados.DeleteOptions) (arvados.Group, error) {
+	return conn.chooseBackend(options.UUID).GroupTrash(ctx, options)
+}
+
 func (conn *Conn) GroupUntrash(ctx context.Context, options arvados.UntrashOptions) (arvados.Group, error) {
 	return conn.chooseBackend(options.UUID).GroupUntrash(ctx, options)
 }
diff --git a/lib/controller/router/router.go b/lib/controller/router/router.go
index d7096ab9f..a313ebc8b 100644
--- a/lib/controller/router/router.go
+++ b/lib/controller/router/router.go
@@ -284,6 +284,13 @@ func (rtr *router) addRoutes() {
 				return rtr.backend.GroupDelete(ctx, *opts.(*arvados.DeleteOptions))
 			},
 		},
+		{
+			arvados.EndpointGroupTrash,
+			func() interface{} { return &arvados.DeleteOptions{} },
+			func(ctx context.Context, opts interface{}) (interface{}, error) {
+				return rtr.backend.GroupTrash(ctx, *opts.(*arvados.DeleteOptions))
+			},
+		},
 		{
 			arvados.EndpointGroupUntrash,
 			func() interface{} { return &arvados.UntrashOptions{} },
diff --git a/lib/controller/rpc/conn.go b/lib/controller/rpc/conn.go
index b61dbd1b3..9d64dc539 100644
--- a/lib/controller/rpc/conn.go
+++ b/lib/controller/rpc/conn.go
@@ -506,6 +506,13 @@ func (conn *Conn) GroupDelete(ctx context.Context, options arvados.DeleteOptions
 	return resp, err
 }
 
+func (conn *Conn) GroupTrash(ctx context.Context, options arvados.DeleteOptions) (arvados.Group, error) {
+	ep := arvados.EndpointGroupTrash
+	var resp arvados.Group
+	err := conn.requestAndDecode(ctx, &resp, ep, nil, options)
+	return resp, err
+}
+
 func (conn *Conn) GroupUntrash(ctx context.Context, options arvados.UntrashOptions) (arvados.Group, error) {
 	ep := arvados.EndpointGroupUntrash
 	var resp arvados.Group
diff --git a/sdk/go/arvados/api.go b/sdk/go/arvados/api.go
index 694b61d69..773ea1397 100644
--- a/sdk/go/arvados/api.go
+++ b/sdk/go/arvados/api.go
@@ -59,6 +59,7 @@ var (
 	EndpointGroupContentsUUIDInPath       = APIEndpoint{"GET", "arvados/v1/groups/{uuid}/contents", ""} // Alternative HTTP route; client-side code should always use EndpointGroupContents instead
 	EndpointGroupShared                   = APIEndpoint{"GET", "arvados/v1/groups/shared", ""}
 	EndpointGroupDelete                   = APIEndpoint{"DELETE", "arvados/v1/groups/{uuid}", ""}
+	EndpointGroupTrash                    = APIEndpoint{"POST", "arvados/v1/groups/{uuid}/trash", ""}
 	EndpointGroupUntrash                  = APIEndpoint{"POST", "arvados/v1/groups/{uuid}/untrash", ""}
 	EndpointUserActivate                  = APIEndpoint{"POST", "arvados/v1/users/{uuid}/activate", ""}
 	EndpointUserCreate                    = APIEndpoint{"POST", "arvados/v1/users", "user"}
@@ -233,6 +234,7 @@ type API interface {
 	GroupContents(ctx context.Context, options GroupContentsOptions) (ObjectList, error)
 	GroupShared(ctx context.Context, options ListOptions) (GroupList, error)
 	GroupDelete(ctx context.Context, options DeleteOptions) (Group, error)
+	GroupTrash(ctx context.Context, options DeleteOptions) (Group, error)
 	GroupUntrash(ctx context.Context, options UntrashOptions) (Group, error)
 	SpecimenCreate(ctx context.Context, options CreateOptions) (Specimen, error)
 	SpecimenUpdate(ctx context.Context, options UpdateOptions) (Specimen, error)

commit eb5d4a8a2b93e9d21ddc7edd805fc181b10521bd
Author: Ward Vandewege <ward at curii.com>
Date:   Sun Mar 21 10:15:42 2021 -0400

    17119: address review feedback.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/services/api/app/models/group.rb b/services/api/app/models/group.rb
index 1bf2cf5d5..2243ae54d 100644
--- a/services/api/app/models/group.rb
+++ b/services/api/app/models/group.rb
@@ -83,8 +83,8 @@ class Group < ArvadosModel
           errors.add :properties, "when filter operator is 'is_a', attribute must be 'uuid'"
           return
         end
-        if ! ["=","<","<=",">",">=","!=","like","ilike","in","not in","is_a","exists"].include?(filter[1].downcase)
-          errors.add :properties, "filter operator is not valid (must be =,<,<=,>,>=,!=,like,ilike,in,not in,is_a,exists)"
+        if ! ["=","<","<=",">",">=","!=","like","ilike","in","not in","is_a"].include?(filter[1].downcase)
+          errors.add :properties, "filter operator is not valid (must be =,<,<=,>,>=,!=,like,ilike,in,not in,is_a)"
           return
         end
       end

-----------------------------------------------------------------------


hooks/post-receive
--