X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/71e992d855a2e26a817b8863e4d0a39ed7955214..56e130608f8977d20b21c54f6ab8973d71e045a0:/sdk/go/arvados/api.go

diff --git a/sdk/go/arvados/api.go b/sdk/go/arvados/api.go
index 6e115a15f6..fa44718048 100644
--- a/sdk/go/arvados/api.go
+++ b/sdk/go/arvados/api.go
@@ -5,8 +5,10 @@
 package arvados
 
 import (
+	"bufio"
 	"context"
 	"encoding/json"
+	"net"
 )
 
 type APIEndpoint struct {
@@ -19,6 +21,7 @@ type APIEndpoint struct {
 var (
 	EndpointConfigGet                     = APIEndpoint{"GET", "arvados/v1/config", ""}
 	EndpointLogin                         = APIEndpoint{"GET", "login", ""}
+	EndpointLogout                        = APIEndpoint{"GET", "logout", ""}
 	EndpointCollectionCreate              = APIEndpoint{"POST", "arvados/v1/collections", "collection"}
 	EndpointCollectionUpdate              = APIEndpoint{"PATCH", "arvados/v1/collections/{uuid}", "collection"}
 	EndpointCollectionGet                 = APIEndpoint{"GET", "arvados/v1/collections/{uuid}", ""}
@@ -40,6 +43,7 @@ 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
 	EndpointUserActivate                  = APIEndpoint{"POST", "arvados/v1/users/{uuid}/activate", ""}
 	EndpointUserCreate                    = APIEndpoint{"POST", "arvados/v1/users", "user"}
 	EndpointUserCurrent                   = APIEndpoint{"GET", "arvados/v1/users/current", ""}
@@ -54,14 +58,27 @@ var (
 	EndpointUserUnsetup                   = APIEndpoint{"POST", "arvados/v1/users/{uuid}/unsetup", ""}
 	EndpointUserUpdate                    = APIEndpoint{"PATCH", "arvados/v1/users/{uuid}", "user"}
 	EndpointUserUpdateUUID                = APIEndpoint{"POST", "arvados/v1/users/{uuid}/update_uuid", ""}
-	EndpointUserBatchUpdate               = APIEndpoint{"PATCH", "arvados/v1/users/batch", ""}
+	EndpointUserBatchUpdate               = APIEndpoint{"PATCH", "arvados/v1/users/batch_update", ""}
+	EndpointUserAuthenticate              = APIEndpoint{"POST", "arvados/v1/users/authenticate", ""}
 	EndpointAPIClientAuthorizationCurrent = APIEndpoint{"GET", "arvados/v1/api_client_authorizations/current", ""}
 )
 
+type ContainerSSHOptions struct {
+	UUID       string `json:"uuid"`
+	DetachKeys string `json:"detach_keys"`
+}
+
+type ContainerSSHConnection struct {
+	Conn  net.Conn          `json:"-"`
+	Bufrw *bufio.ReadWriter `json:"-"`
+}
+
 type GetOptions struct {
-	UUID         string   `json:"uuid"`
+	UUID         string   `json:"uuid,omitempty"`
 	Select       []string `json:"select"`
 	IncludeTrash bool     `json:"include_trash"`
+	ForwardedFor string   `json:"forwarded_for,omitempty"`
+	Remote       string   `json:"remote,omitempty"`
 }
 
 type UntrashOptions struct {
@@ -74,13 +91,15 @@ type ListOptions struct {
 	Select             []string               `json:"select"`
 	Filters            []Filter               `json:"filters"`
 	Where              map[string]interface{} `json:"where"`
-	Limit              int                    `json:"limit"`
-	Offset             int                    `json:"offset"`
+	Limit              int64                  `json:"limit"`
+	Offset             int64                  `json:"offset"`
 	Order              []string               `json:"order"`
 	Distinct           bool                   `json:"distinct"`
 	Count              string                 `json:"count"`
 	IncludeTrash       bool                   `json:"include_trash"`
 	IncludeOldVersions bool                   `json:"include_old_versions"`
+	BypassFederation   bool                   `json:"bypass_federation"`
+	ForwardedFor       string                 `json:"forwarded_for,omitempty"`
 }
 
 type CreateOptions struct {
@@ -91,8 +110,9 @@ type CreateOptions struct {
 }
 
 type UpdateOptions struct {
-	UUID  string                 `json:"uuid"`
-	Attrs map[string]interface{} `json:"attrs"`
+	UUID             string                 `json:"uuid"`
+	Attrs            map[string]interface{} `json:"attrs"`
+	BypassFederation bool                   `json:"bypass_federation"`
 }
 
 type UpdateUUIDOptions struct {
@@ -139,9 +159,19 @@ type LoginOptions struct {
 	State    string `json:"state,omitempty"`  // OAuth2 callback state
 }
 
+type UserAuthenticateOptions struct {
+	Username string `json:"username,omitempty"` // PAM username
+	Password string `json:"password,omitempty"` // PAM password
+}
+
+type LogoutOptions struct {
+	ReturnTo string `json:"return_to"` // Redirect to this URL after logging out
+}
+
 type API interface {
 	ConfigGet(ctx context.Context) (json.RawMessage, error)
 	Login(ctx context.Context, options LoginOptions) (LoginResponse, error)
+	Logout(ctx context.Context, options LogoutOptions) (LogoutResponse, error)
 	CollectionCreate(ctx context.Context, options CreateOptions) (Collection, error)
 	CollectionUpdate(ctx context.Context, options UpdateOptions) (Collection, error)
 	CollectionGet(ctx context.Context, options GetOptions) (Collection, error)
@@ -158,6 +188,7 @@ 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)
 	SpecimenCreate(ctx context.Context, options CreateOptions) (Specimen, error)
 	SpecimenUpdate(ctx context.Context, options UpdateOptions) (Specimen, error)
 	SpecimenGet(ctx context.Context, options GetOptions) (Specimen, error)
@@ -176,5 +207,6 @@ type API interface {
 	UserList(ctx context.Context, options ListOptions) (UserList, error)
 	UserDelete(ctx context.Context, options DeleteOptions) (User, error)
 	UserBatchUpdate(context.Context, UserBatchUpdateOptions) (UserList, error)
+	UserAuthenticate(ctx context.Context, options UserAuthenticateOptions) (APIClientAuthorization, error)
 	APIClientAuthorizationCurrent(ctx context.Context, options GetOptions) (APIClientAuthorization, error)
 }