[arvados] created: 2.5.0-40-gc573a0ad8
git repository hosting
git at public.arvados.org
Tue Jan 24 14:38:09 UTC 2023
at c573a0ad8fa7d8fe8f5ccc058ecd14fd852deadc (commit)
commit c573a0ad8fa7d8fe8f5ccc058ecd14fd852deadc
Author: Brett Smith <brett.smith at curii.com>
Date: Tue Jan 24 09:06:44 2023 -0500
19960: Fix container_uuid property name for intermediate collections
container_uuid is the name documented in our API reference, and now
expected by vocabulary.go's system tags.
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/sdk/cwl/arvados_cwl/util.py b/sdk/cwl/arvados_cwl/util.py
index a0dfb290c..a0c34ea52 100644
--- a/sdk/cwl/arvados_cwl/util.py
+++ b/sdk/cwl/arvados_cwl/util.py
@@ -18,7 +18,7 @@ def get_intermediate_collection_info(workflow_step_name, current_container, inte
container_uuid = None
props = {"type": "intermediate"}
if current_container:
- props["container"] = current_container['uuid']
+ props["container_uuid"] = current_container['uuid']
return {"name" : name, "trash_at" : trash_time, "properties" : props}
diff --git a/sdk/cwl/tests/test_util.py b/sdk/cwl/tests/test_util.py
index 3ca02c7df..1209b88d8 100644
--- a/sdk/cwl/tests/test_util.py
+++ b/sdk/cwl/tests/test_util.py
@@ -29,7 +29,7 @@ class TestUtil(unittest.TestCase):
self.assertEqual(info["name"], "Intermediate collection for step one")
self.assertEqual(info["trash_at"], datetime.datetime(2018, 1, 1, 0, 2, 0, 0))
- self.assertEqual(info["properties"], {"type" : "intermediate", "container" : "zzzzz-8i9sb-zzzzzzzzzzzzzzz"})
+ self.assertEqual(info["properties"], {"type" : "intermediate", "container_uuid" : "zzzzz-8i9sb-zzzzzzzzzzzzzzz"})
def test_get_current_container_success(self):
api = mock.MagicMock()
commit 5339ad0b20a9fe8084c3d75381aeee6f9151447c
Author: Brett Smith <brett.smith at curii.com>
Date: Tue Jan 24 08:59:05 2023 -0500
19960: Add container_uuid to systemTagKeys
This is set by arvados-cwl-runner, and already documented in our API
reference.
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/sdk/go/arvados/vocabulary.go b/sdk/go/arvados/vocabulary.go
index b14bf59d4..16f80db07 100644
--- a/sdk/go/arvados/vocabulary.go
+++ b/sdk/go/arvados/vocabulary.go
@@ -31,6 +31,7 @@ func (v *Vocabulary) systemTagKeys() map[string]bool {
return map[string]bool{
// Collection keys - set by arvados-cwl-runner
"container_request": true,
+ "container_uuid": true,
"type": true,
// Collection keys - set by arv-keepdocker (on the way out)
"docker-image-repo-tag": true,
diff --git a/sdk/go/arvados/vocabulary_test.go b/sdk/go/arvados/vocabulary_test.go
index c9e9d7b0d..2025f97b3 100644
--- a/sdk/go/arvados/vocabulary_test.go
+++ b/sdk/go/arvados/vocabulary_test.go
@@ -231,6 +231,7 @@ func (s *VocabularySuite) TestNewVocabulary(c *check.C) {
&Vocabulary{
reservedTagKeys: map[string]bool{
"container_request": true,
+ "container_uuid": true,
"cwl_input": true,
"cwl_output": true,
"docker-image-repo-tag": true,
commit 5865e0ce5d98d68b71d1e4e146dcbecd35f1b296
Author: Brett Smith <brett.smith at curii.com>
Date: Tue Jan 24 08:52:52 2023 -0500
19960: Organize systemTagKeys
Note what properties go with what resource types, and why.
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/sdk/go/arvados/vocabulary.go b/sdk/go/arvados/vocabulary.go
index bf60a7702..b14bf59d4 100644
--- a/sdk/go/arvados/vocabulary.go
+++ b/sdk/go/arvados/vocabulary.go
@@ -29,16 +29,21 @@ type VocabularyTag struct {
// Cannot have a constant map in Go, so we have to use a function
func (v *Vocabulary) systemTagKeys() map[string]bool {
return map[string]bool{
- "type": true,
- "template_uuid": true,
- "groups": true,
- "username": true,
- "image_timestamp": true,
+ // Collection keys - set by arvados-cwl-runner
+ "container_request": true,
+ "type": true,
+ // Collection keys - set by arv-keepdocker (on the way out)
"docker-image-repo-tag": true,
- "filters": true,
- "container_request": true,
- "cwl_input": true,
- "cwl_output": true,
+ // Container request keys - set by arvados-cwl-runner
+ "cwl_input": true,
+ "cwl_output": true,
+ "template_uuid": true,
+ // Group keys
+ "filters": true,
+ // Link keys
+ "groups": true,
+ "image_timestamp": true,
+ "username": true,
}
}
diff --git a/sdk/go/arvados/vocabulary_test.go b/sdk/go/arvados/vocabulary_test.go
index f31a4f984..c9e9d7b0d 100644
--- a/sdk/go/arvados/vocabulary_test.go
+++ b/sdk/go/arvados/vocabulary_test.go
@@ -230,16 +230,16 @@ func (s *VocabularySuite) TestNewVocabulary(c *check.C) {
true, "",
&Vocabulary{
reservedTagKeys: map[string]bool{
- "type": true,
- "template_uuid": true,
- "groups": true,
- "username": true,
- "image_timestamp": true,
- "docker-image-repo-tag": true,
- "filters": true,
"container_request": true,
"cwl_input": true,
"cwl_output": true,
+ "docker-image-repo-tag": true,
+ "filters": true,
+ "groups": true,
+ "image_timestamp": true,
+ "template_uuid": true,
+ "type": true,
+ "username": true,
},
StrictTags: false,
Tags: map[string]VocabularyTag{
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list