Skip to content

Commit 7135622

Browse files
committed
Fix CI: cloud entry in ObjectStoreTypeSpan messages, typed fake provider
ObjectStoreTypeSpan.vue indexes an exhaustive record over the template type enum, so it needs a message for the new cloud type. The paging fake's SimpleNamespace provider gets a cast for mypy - only the result-limit config is consulted by ClientPagedResultList.
1 parent f408220 commit 7135622

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

client/src/components/ObjectStore/ObjectStoreTypeSpan.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const MESSAGES = {
99
"This is a Microsoft Azure Blob based Galaxy storage. More information on Microsoft's Azure Blob Storage can be found at https://azure.microsoft.com/en-us/products/storage/blobs/.",
1010
disk: "This is a simple path based Galaxy storage that assumes the all the relevant paths are already mounted on the Galaxy server and target worker nodes.",
1111
boto3: "This is a Galaxy storage based on the Amazon Simple Storage Service (S3) interface, but likely not stored by Amazon. The AWS interface has become an industry standard and many storage vendors support it and use it to expose object based storage.",
12+
cloud: "This is a Galaxy storage based on the provider-agnostic CloudBridge library, which can store data in Amazon S3, Azure Blob Storage, Google Cloud Storage, or OpenStack Swift.",
1213
generic_s3:
1314
"This is a Galaxy storage based on the Amazon Simple Storage Service (S3) interface, but likely not stored by Amazon. The AWS interface has become an industry standard and many storage vendors support it and use it to expose object based storage.",
1415
onedata: "This is a Galaxy storage based on the Onedata system.",

test/unit/objectstore/test_objectstore.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1095,11 +1095,17 @@ class the AWS provider uses), so code that only consumes the first page
10951095

10961096
def __init__(self, keys, page_size=1):
10971097
from types import SimpleNamespace
1098+
from typing import (
1099+
Any,
1100+
cast,
1101+
)
10981102

10991103
from cloudbridge.base.resources import BasePageableObjectMixin
11001104

11011105
self._keys = keys
1102-
provider = SimpleNamespace(config=SimpleNamespace(default_result_limit=page_size))
1106+
# Duck-typed stand-in for a cloudbridge provider; only the result-limit
1107+
# config is consulted by ClientPagedResultList.
1108+
provider = cast(Any, SimpleNamespace(config=SimpleNamespace(default_result_limit=page_size)))
11031109

11041110
class _Container(BasePageableObjectMixin):
11051111
def list(self, limit=None, marker=None, prefix=None):

0 commit comments

Comments
 (0)