Merge branch '16265-security-updates' into dependabot/bundler/services/api/rake-13.0.1

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

diff --git a/sdk/go/arvados/container.go b/sdk/go/arvados/container.go
index 2622c137030aada559bfc47f5768e7d918b6d816..a7edddaa337137fe4c0dc87b3acb9db3fdaf7194 100644 (file)
--- a/sdk/go/arvados/container.go
+++ b/sdk/go/arvados/container.go
@@ -8,20 +8,26 @@ import "time"
 
 // Container is an arvados#container resource.
 type Container struct {
-       UUID                 string               `json:"uuid"`
-       CreatedAt            time.Time            `json:"created_at"`
-       Command              []string             `json:"command"`
-       ContainerImage       string               `json:"container_image"`
-       Cwd                  string               `json:"cwd"`
-       Environment          map[string]string    `json:"environment"`
-       LockedByUUID         string               `json:"locked_by_uuid"`
-       Mounts               map[string]Mount     `json:"mounts"`
-       Output               string               `json:"output"`
-       OutputPath           string               `json:"output_path"`
-       Priority             int                  `json:"priority"`
-       RuntimeConstraints   RuntimeConstraints   `json:"runtime_constraints"`
-       State                ContainerState       `json:"state"`
-       SchedulingParameters SchedulingParameters `json:"scheduling_parameters"`
+       UUID                 string                 `json:"uuid"`
+       Etag                 string                 `json:"etag"`
+       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"`
+       Command              []string               `json:"command"`
+       ContainerImage       string                 `json:"container_image"`
+       Cwd                  string                 `json:"cwd"`
+       Environment          map[string]string      `json:"environment"`
+       LockedByUUID         string                 `json:"locked_by_uuid"`
+       Mounts               map[string]Mount       `json:"mounts"`
+       Output               string                 `json:"output"`
+       OutputPath           string                 `json:"output_path"`
+       Priority             int64                  `json:"priority"`
+       RuntimeConstraints   RuntimeConstraints     `json:"runtime_constraints"`
+       State                ContainerState         `json:"state"`
+       SchedulingParameters SchedulingParameters   `json:"scheduling_parameters"`
+       ExitCode             int                    `json:"exit_code"`
+       RuntimeStatus        map[string]interface{} `json:"runtime_status"`
 }
 
 // Container is an arvados#container resource.
@@ -56,6 +62,7 @@ type ContainerRequest struct {
        UseExisting             bool                   `json:"use_existing"`
        LogUUID                 string                 `json:"log_uuid"`
        OutputUUID              string                 `json:"output_uuid"`
+       RuntimeToken            string                 `json:"runtime_token"`
 }
 
 // Mount is special behavior to attach to a filesystem path or device.
@@ -114,7 +121,7 @@ const (
 type ContainerRequestState string
 
 const (
-       ContainerRequestStateUncomitted = ContainerState("Uncommitted")
-       ContainerRequestStateCommitted  = ContainerState("Committed")
-       ContainerRequestStateFinal      = ContainerState("Final")
+       ContainerRequestStateUncomitted = ContainerRequestState("Uncommitted")
+       ContainerRequestStateCommitted  = ContainerRequestState("Committed")
+       ContainerRequestStateFinal      = ContainerRequestState("Final")
 )