X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/de89bbf6824a39990e1605e4bd041b5d1ed464ea..72d7d41944006d1f48f570784dafe56b9812b0c8:/sdk/go/arvados/api.go

diff --git a/sdk/go/arvados/api.go b/sdk/go/arvados/api.go
index 4e7e74c8ac..736ace75e7 100644
--- a/sdk/go/arvados/api.go
+++ b/sdk/go/arvados/api.go
@@ -5,8 +5,13 @@
 package arvados
 
 import (
+	"bufio"
 	"context"
 	"encoding/json"
+	"io"
+	"net"
+
+	"github.com/sirupsen/logrus"
 )
 
 type APIEndpoint struct {
@@ -41,6 +46,22 @@ var (
 	EndpointContainerDelete               = APIEndpoint{"DELETE", "arvados/v1/containers/{uuid}", ""}
 	EndpointContainerLock                 = APIEndpoint{"POST", "arvados/v1/containers/{uuid}/lock", ""}
 	EndpointContainerUnlock               = APIEndpoint{"POST", "arvados/v1/containers/{uuid}/unlock", ""}
+	EndpointContainerSSH                  = APIEndpoint{"GET", "arvados/v1/connect/{uuid}/ssh", ""} // move to /containers after #17014 fixes routing
+	EndpointContainerRequestCreate        = APIEndpoint{"POST", "arvados/v1/container_requests", "container_request"}
+	EndpointContainerRequestUpdate        = APIEndpoint{"PATCH", "arvados/v1/container_requests/{uuid}", "container_request"}
+	EndpointContainerRequestGet           = APIEndpoint{"GET", "arvados/v1/container_requests/{uuid}", ""}
+	EndpointContainerRequestList          = APIEndpoint{"GET", "arvados/v1/container_requests", ""}
+	EndpointContainerRequestDelete        = APIEndpoint{"DELETE", "arvados/v1/container_requests/{uuid}", ""}
+	EndpointGroupCreate                   = APIEndpoint{"POST", "arvados/v1/groups", "group"}
+	EndpointGroupUpdate                   = APIEndpoint{"PATCH", "arvados/v1/groups/{uuid}", "group"}
+	EndpointGroupGet                      = APIEndpoint{"GET", "arvados/v1/groups/{uuid}", ""}
+	EndpointGroupList                     = APIEndpoint{"GET", "arvados/v1/groups", ""}
+	EndpointGroupContents                 = APIEndpoint{"GET", "arvados/v1/groups/contents", ""}
+	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"}
 	EndpointUserCurrent                   = APIEndpoint{"GET", "arvados/v1/users/current", ""}
@@ -60,6 +81,18 @@ var (
 	EndpointAPIClientAuthorizationCurrent = APIEndpoint{"GET", "arvados/v1/api_client_authorizations/current", ""}
 )
 
+type ContainerSSHOptions struct {
+	UUID          string `json:"uuid"`
+	DetachKeys    string `json:"detach_keys"`
+	LoginUsername string `json:"login_username"`
+}
+
+type ContainerSSHConnection struct {
+	Conn   net.Conn           `json:"-"`
+	Bufrw  *bufio.ReadWriter  `json:"-"`
+	Logger logrus.FieldLogger `json:"-"`
+}
+
 type GetOptions struct {
 	UUID         string   `json:"uuid,omitempty"`
 	Select       []string `json:"select"`
@@ -86,7 +119,8 @@ type ListOptions struct {
 	IncludeTrash       bool                   `json:"include_trash"`
 	IncludeOldVersions bool                   `json:"include_old_versions"`
 	BypassFederation   bool                   `json:"bypass_federation"`
-	ForwardedFor string   `json:"forwarded_for,omitempty"`
+	ForwardedFor       string                 `json:"forwarded_for,omitempty"`
+	Include            string                 `json:"include"`
 }
 
 type CreateOptions struct {
@@ -99,9 +133,27 @@ type CreateOptions struct {
 type UpdateOptions struct {
 	UUID             string                 `json:"uuid"`
 	Attrs            map[string]interface{} `json:"attrs"`
+	Select           []string               `json:"select"`
 	BypassFederation bool                   `json:"bypass_federation"`
 }
 
+type GroupContentsOptions struct {
+	ClusterID          string   `json:"cluster_id"`
+	UUID               string   `json:"uuid,omitempty"`
+	Select             []string `json:"select"`
+	Filters            []Filter `json:"filters"`
+	Limit              int64    `json:"limit"`
+	Offset             int64    `json:"offset"`
+	Order              []string `json:"order"`
+	Distinct           bool     `json:"distinct"`
+	Count              string   `json:"count"`
+	Include            string   `json:"include"`
+	Recursive          bool     `json:"recursive"`
+	IncludeTrash       bool     `json:"include_trash"`
+	IncludeOldVersions bool     `json:"include_old_versions"`
+	ExcludeHomeProject bool     `json:"exclude_home_project"`
+}
+
 type UpdateUUIDOptions struct {
 	UUID    string `json:"uuid"`
 	NewUUID string `json:"new_uuid"`
@@ -155,6 +207,22 @@ type LogoutOptions struct {
 	ReturnTo string `json:"return_to"` // Redirect to this URL after logging out
 }
 
+type BlockWriteOptions struct {
+	Hash           string
+	Data           []byte
+	Reader         io.Reader
+	DataSize       int // Must be set if Data is nil.
+	RequestID      string
+	StorageClasses []string
+	Replicas       int
+	Attempts       int
+}
+
+type BlockWriteResponse struct {
+	Locator  string
+	Replicas int
+}
+
 type API interface {
 	ConfigGet(ctx context.Context) (json.RawMessage, error)
 	Login(ctx context.Context, options LoginOptions) (LoginResponse, error)
@@ -175,6 +243,21 @@ type API interface {
 	ContainerDelete(ctx context.Context, options DeleteOptions) (Container, error)
 	ContainerLock(ctx context.Context, options GetOptions) (Container, error)
 	ContainerUnlock(ctx context.Context, options GetOptions) (Container, error)
+	ContainerSSH(ctx context.Context, options ContainerSSHOptions) (ContainerSSHConnection, error)
+	ContainerRequestCreate(ctx context.Context, options CreateOptions) (ContainerRequest, error)
+	ContainerRequestUpdate(ctx context.Context, options UpdateOptions) (ContainerRequest, error)
+	ContainerRequestGet(ctx context.Context, options GetOptions) (ContainerRequest, error)
+	ContainerRequestList(ctx context.Context, options ListOptions) (ContainerRequestList, error)
+	ContainerRequestDelete(ctx context.Context, options DeleteOptions) (ContainerRequest, error)
+	GroupCreate(ctx context.Context, options CreateOptions) (Group, error)
+	GroupUpdate(ctx context.Context, options UpdateOptions) (Group, error)
+	GroupGet(ctx context.Context, options GetOptions) (Group, error)
+	GroupList(ctx context.Context, options ListOptions) (GroupList, error)
+	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)
 	SpecimenGet(ctx context.Context, options GetOptions) (Specimen, error)