Merge branch 'main' into 22235-toolbar-access-fixes

[arvados.git] / sdk / go / arvados / api.go

diff --git a/sdk/go/arvados/api.go b/sdk/go/arvados/api.go
index c3d0ea8aef676b3d3c57ce0bfbbcbe129b7689ac..2c932531aed13efcb54689e54a555b6c537f8b51 100644 (file)
--- a/sdk/go/arvados/api.go
+++ b/sdk/go/arvados/api.go
@@ -42,11 +42,7 @@ var (
        EndpointCollectionDelete                = APIEndpoint{"DELETE", "arvados/v1/collections/{uuid}", ""}
        EndpointCollectionTrash                 = APIEndpoint{"POST", "arvados/v1/collections/{uuid}/trash", ""}
        EndpointCollectionUntrash               = APIEndpoint{"POST", "arvados/v1/collections/{uuid}/untrash", ""}
-       EndpointSpecimenCreate                  = APIEndpoint{"POST", "arvados/v1/specimens", "specimen"}
-       EndpointSpecimenUpdate                  = APIEndpoint{"PATCH", "arvados/v1/specimens/{uuid}", "specimen"}
-       EndpointSpecimenGet                     = APIEndpoint{"GET", "arvados/v1/specimens/{uuid}", ""}
-       EndpointSpecimenList                    = APIEndpoint{"GET", "arvados/v1/specimens", ""}
-       EndpointSpecimenDelete                  = APIEndpoint{"DELETE", "arvados/v1/specimens/{uuid}", ""}
+       EndpointComputedPermissionList          = APIEndpoint{"GET", "arvados/v1/computed_permissions", ""}
        EndpointContainerCreate                 = APIEndpoint{"POST", "arvados/v1/containers", "container"}
        EndpointContainerUpdate                 = APIEndpoint{"PATCH", "arvados/v1/containers/{uuid}", "container"}
        EndpointContainerPriorityUpdate         = APIEndpoint{"POST", "arvados/v1/containers/{uuid}/update_priority", "container"}
@@ -156,7 +152,7 @@ type ListOptions struct {
        IncludeOldVersions bool                   `json:"include_old_versions"`
        BypassFederation   bool                   `json:"bypass_federation"`
        ForwardedFor       string                 `json:"forwarded_for,omitempty"`
-       Include            string                 `json:"include"`
+       Include            []string               `json:"include"`
 }
 
 type CreateOptions struct {
@@ -187,7 +183,7 @@ type GroupContentsOptions struct {
        Order              []string `json:"order"`
        Distinct           bool     `json:"distinct"`
        Count              string   `json:"count"`
-       Include            string   `json:"include"`
+       Include            []string `json:"include"`
        Recursive          bool     `json:"recursive"`
        IncludeTrash       bool     `json:"include_trash"`
        IncludeOldVersions bool     `json:"include_old_versions"`
@@ -296,6 +292,7 @@ type API interface {
        CollectionDelete(ctx context.Context, options DeleteOptions) (Collection, error)
        CollectionTrash(ctx context.Context, options DeleteOptions) (Collection, error)
        CollectionUntrash(ctx context.Context, options UntrashOptions) (Collection, error)
+       ComputedPermissionList(ctx context.Context, options ListOptions) (ComputedPermissionList, error)
        ContainerCreate(ctx context.Context, options CreateOptions) (Container, error)
        ContainerUpdate(ctx context.Context, options UpdateOptions) (Container, error)
        ContainerPriorityUpdate(ctx context.Context, options UpdateOptions) (Container, error)
@@ -332,11 +329,6 @@ type API interface {
        LogGet(ctx context.Context, options GetOptions) (Log, error)
        LogList(ctx context.Context, options ListOptions) (LogList, error)
        LogDelete(ctx context.Context, options DeleteOptions) (Log, error)
-       SpecimenCreate(ctx context.Context, options CreateOptions) (Specimen, error)
-       SpecimenUpdate(ctx context.Context, options UpdateOptions) (Specimen, error)
-       SpecimenGet(ctx context.Context, options GetOptions) (Specimen, error)
-       SpecimenList(ctx context.Context, options ListOptions) (SpecimenList, error)
-       SpecimenDelete(ctx context.Context, options DeleteOptions) (Specimen, error)
        SysTrashSweep(ctx context.Context, options struct{}) (struct{}, error)
        UserCreate(ctx context.Context, options CreateOptions) (User, error)
        UserUpdate(ctx context.Context, options UpdateOptions) (User, error)