17119: fix field type on legacy objects.
authorWard Vandewege <ward@curii.com>
Tue, 23 Feb 2021 22:35:51 +0000 (17:35 -0500)
committerWard Vandewege <ward@curii.com>
Wed, 24 Feb 2021 18:45:00 +0000 (13:45 -0500)
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

sdk/go/arvados/job.go
sdk/go/arvados/pipeline_instance.go
sdk/go/arvados/pipeline_template.go
sdk/go/arvados/trait.go

index 18c84b10850a58be2fcc65999960dbbe906155af..ccf752ce7cdf528a41e0a4f1ec88ace85460864d 100644 (file)
@@ -8,39 +8,39 @@ import "time"
 
 // Job is an arvados#job record
 type Job struct {
-       UUID                   string    `json:"uuid"`
-       Etag                   string    `json:"etag"`
-       OwnerUUID              string    `json:"owner_uuid"`
-       ModifiedByClientUUID   string    `json:"modified_by_client_uuid"`
-       ModifiedByUserUUID     string    `json:"modified_by_user_uuid"`
-       ModifiedAt             time.Time `json:"modified_at"`
-       SubmitID               string    `json:"submit_id"`
-       Script                 string    `json:"script"`
-       CancelledByClientUUID  string    `json:"cancelled_by_client_uuid"`
-       CancelledByUserUUID    string    `json:"cancelled_by_user_uuid"`
-       CancelledAt            time.Time `json:"cancelled_at"`
-       StartedAt              time.Time `json:"started_at"`
-       FinishedAt             time.Time `json:"finished_at"`
-       Running                bool      `json:"running"`
-       Success                bool      `json:"success"`
-       Output                 string    `json:"output"`
-       CreatedAt              time.Time `json:"created_at"`
-       UpdatedAt              time.Time `json:"updated_at"`
-       IsLockedByUUID         string    `json:"is_locked_by_uuid"`
-       Log                    string    `json:"log"`
-       TasksSummary           string    `json:"tasks_summary"`
-       RuntimeConstraints     string    `json:"runtime_constraints"`
-       Nondeterministic       bool      `json:"nondeterministic"`
-       Repository             string    `json:"repository"`
-       SuppliedScriptVersion  string    `json:"supplied_script_version"`
-       DockerImageLocator     string    `json:"docker_image_locator"`
-       Priority               int       `json:"priority"`
-       Description            string    `json:"description"`
-       State                  string    `json:"state"`
-       ArvadosSDKVersion      string    `json:"arvados_sdk_version"`
-       Components             string    `json:"components"`
-       ScriptParametersDigest string    `json:"script_parameters_digest"`
-       WritableBy             []string  `json:"writable_by,omitempty"`
+       UUID                   string                 `json:"uuid"`
+       Etag                   string                 `json:"etag"`
+       OwnerUUID              string                 `json:"owner_uuid"`
+       ModifiedByClientUUID   string                 `json:"modified_by_client_uuid"`
+       ModifiedByUserUUID     string                 `json:"modified_by_user_uuid"`
+       ModifiedAt             time.Time              `json:"modified_at"`
+       SubmitID               string                 `json:"submit_id"`
+       Script                 string                 `json:"script"`
+       CancelledByClientUUID  string                 `json:"cancelled_by_client_uuid"`
+       CancelledByUserUUID    string                 `json:"cancelled_by_user_uuid"`
+       CancelledAt            time.Time              `json:"cancelled_at"`
+       StartedAt              time.Time              `json:"started_at"`
+       FinishedAt             time.Time              `json:"finished_at"`
+       Running                bool                   `json:"running"`
+       Success                bool                   `json:"success"`
+       Output                 string                 `json:"output"`
+       CreatedAt              time.Time              `json:"created_at"`
+       UpdatedAt              time.Time              `json:"updated_at"`
+       IsLockedByUUID         string                 `json:"is_locked_by_uuid"`
+       Log                    string                 `json:"log"`
+       TasksSummary           map[string]interface{} `json:"tasks_summary"`
+       RuntimeConstraints     map[string]interface{} `json:"runtime_constraints"`
+       Nondeterministic       bool                   `json:"nondeterministic"`
+       Repository             string                 `json:"repository"`
+       SuppliedScriptVersion  string                 `json:"supplied_script_version"`
+       DockerImageLocator     string                 `json:"docker_image_locator"`
+       Priority               int                    `json:"priority"`
+       Description            string                 `json:"description"`
+       State                  string                 `json:"state"`
+       ArvadosSDKVersion      string                 `json:"arvados_sdk_version"`
+       Components             map[string]interface{} `json:"components"`
+       ScriptParametersDigest string                 `json:"script_parameters_digest"`
+       WritableBy             []string               `json:"writable_by,omitempty"`
 }
 
 func (g Job) resourceName() string {
index c3645fd709214f2edbf6e23d5a589e59b4f4cfc5..ace1826850677edcc0b3fb823ac5365e7368a12f 100644 (file)
@@ -8,24 +8,24 @@ import "time"
 
 // PipelineInstance is an arvados#pipelineInstance record
 type PipelineInstance struct {
-       UUID                 string    `json:"uuid"`
-       Etag                 string    `json:"etag"`
-       OwnerUUID            string    `json:"owner_uuid"`
-       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"`
-       PipelineTemplateUUID string    `json:"pipeline_template_uuid"`
-       Name                 string    `json:"name"`
-       Components           string    `json:"components"`
-       UpdatedAt            time.Time `json:"updated_at"`
-       Properties           string    `json:"properties"`
-       State                string    `json:"state"`
-       ComponentsSummary    string    `json:"components_summary"`
-       StartedAt            time.Time `json:"started_at"`
-       FinishedAt           time.Time `json:"finished_at"`
-       Description          string    `json:"description"`
-       WritableBy           []string  `json:"writable_by,omitempty"`
+       UUID                 string                 `json:"uuid"`
+       Etag                 string                 `json:"etag"`
+       OwnerUUID            string                 `json:"owner_uuid"`
+       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"`
+       PipelineTemplateUUID string                 `json:"pipeline_template_uuid"`
+       Name                 string                 `json:"name"`
+       Components           map[string]interface{} `json:"components"`
+       UpdatedAt            time.Time              `json:"updated_at"`
+       Properties           map[string]interface{} `json:"properties"`
+       State                string                 `json:"state"`
+       ComponentsSummary    map[string]interface{} `json:"components_summary"`
+       StartedAt            time.Time              `json:"started_at"`
+       FinishedAt           time.Time              `json:"finished_at"`
+       Description          string                 `json:"description"`
+       WritableBy           []string               `json:"writable_by,omitempty"`
 }
 
 func (g PipelineInstance) resourceName() string {
index 85fec1c126c4718487727aa8bb50c0145daa076d..31d9e8b2fea261b1f4d6e6d95c627584f728f083 100644 (file)
@@ -8,18 +8,18 @@ import "time"
 
 // PipelineTemplate is an arvados#pipelineTemplate record
 type PipelineTemplate struct {
-       UUID                 string    `json:"uuid"`
-       Etag                 string    `json:"etag"`
-       OwnerUUID            string    `json:"owner_uuid"`
-       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"`
-       Name                 string    `json:"name"`
-       Components           string    `json:"components"`
-       UpdatedAt            time.Time `json:"updated_at"`
-       Description          string    `json:"description"`
-       WritableBy           []string  `json:"writable_by,omitempty"`
+       UUID                 string                 `json:"uuid"`
+       Etag                 string                 `json:"etag"`
+       OwnerUUID            string                 `json:"owner_uuid"`
+       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"`
+       Name                 string                 `json:"name"`
+       Components           map[string]interface{} `json:"components"`
+       UpdatedAt            time.Time              `json:"updated_at"`
+       Description          string                 `json:"description"`
+       WritableBy           []string               `json:"writable_by,omitempty"`
 }
 
 func (g PipelineTemplate) resourceName() string {
index 9a2e3cf6716bfd3e0516ed18094be48794a78713..fb0e799b6be7ad1bb9dc22e15eeeabef58121e94 100644 (file)
@@ -8,17 +8,17 @@ import "time"
 
 // Trait is an arvados#trait record
 type Trait struct {
-       UUID                 string    `json:"uuid"`
-       Etag                 string    `json:"etag"`
-       OwnerUUID            string    `json:"owner_uuid"`
-       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"`
-       Name                 string    `json:"name"`
-       Properties           string    `json:"properties"`
-       UpdatedAt            time.Time `json:"updated_at"`
-       WritableBy           []string  `json:"writable_by,omitempty"`
+       UUID                 string                 `json:"uuid"`
+       Etag                 string                 `json:"etag"`
+       OwnerUUID            string                 `json:"owner_uuid"`
+       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"`
+       Name                 string                 `json:"name"`
+       Properties           map[string]interface{} `json:"properties"`
+       UpdatedAt            time.Time              `json:"updated_at"`
+       WritableBy           []string               `json:"writable_by,omitempty"`
 }
 
 func (g Trait) resourceName() string {