[OCI]: Storage: support buckets from different region

docs/source/reference/storage.rst

@@ -290,7 +290,7 @@ Storage YAML reference
             - https://<azure_storage_account>.blob.core.windows.net/<container_name>
             - r2://<bucket_name>
             - cos://<region_name>/<bucket_name>
-            - oci://<bucket_name>
+            - oci://<bucket_name>@<region>
 
           If the source is local, data is uploaded to the cloud to an appropriate
           bucket (s3, gcs, azure, r2, oci, or ibm). If source is bucket URI,

examples/oci/dataset-mount.yaml

@@ -11,7 +11,7 @@ resources:
 file_mounts:
   # Mount an existing oci bucket
   /datasets-storage:
-    source: oci://skybucket
+    source: oci://skybucket@us-sanjose-1
     mode: MOUNT  # Either MOUNT or COPY. Optional.
 
 # Working directory (optional) containing the project codebase.

sky/data/storage.py

@@ -3980,13 +3980,28 @@ def __init__(self,
         self.compartment: str
         self.namespace: str
 
-        # Bucket region should be consistence with the OCI config file
-        region = oci.get_oci_config()['region']
+        # Region is from the specified name in <bucket>@<region> format
+        if name is not None and '@' in name:
+            self._validate_bucket_expr(name)
+            name, region = name.split('@')
+        # Region is from the specified source in oci://<bucket>@<region> format
+        if source is not None and '@' in source:
+            self._validate_bucket_expr(source)
+            source, region = source.split('@')
+        # Default region set to what specified in oci config.
+        if region is None:
+            region = oci.get_oci_config()['region']
 
         super().__init__(name, source, region, is_sky_managed,
                          sync_on_reconstruction, _bucket_sub_path)
         # TODO(zpoint): add _bucket_sub_path to the sync/mount/delete commands
 
+    def _validate_bucket_expr(self, bucket_expr: str):
+        pattern = r'^(\w+://)?[A-Za-z0-9-._]+(@\w{2}-\w+-\d{1})$'
+        assert re.match(pattern, bucket_expr), (
+            'The format for the bucket portion is <bucket>@<region> '
+            'when specify a region with a bucket.')
+
     def _validate(self):
         if self.source is not None and isinstance(self.source, str):
             if self.source.startswith('oci://'):
@@ -4137,7 +4152,8 @@ def get_file_sync_command(base_dir_path, file_names):
             sync_command = (
                 'oci os object bulk-upload --no-follow-symlinks --overwrite '
                 f'--bucket-name {self.name} --namespace-name {self.namespace} '
-                f'--src-dir "{base_dir_path}" {includes}')
+                f'--region {self.region} --src-dir "{base_dir_path}" '
+                f'{includes}')
 
             return sync_command
 
@@ -4157,8 +4173,8 @@ def get_dir_sync_command(src_dir_path, dest_dir_name):
             sync_command = (
                 'oci os object bulk-upload --no-follow-symlinks --overwrite '
                 f'--bucket-name {self.name} --namespace-name {self.namespace} '
-                f'--object-prefix "{dest_dir_name}" --src-dir "{src_dir_path}" '
-                f'{excludes} ')
+                f'--region {self.region} --object-prefix "{dest_dir_name}" '
+                f'--src-dir "{src_dir_path}" {excludes}')
 
             return sync_command
 
@@ -4289,7 +4305,8 @@ def _download_file(self, remote_path: str, local_path: str) -> None:
         def get_file_download_command(remote_path, local_path):
             download_command = (f'oci os object get --bucket-name {self.name} '
                                 f'--namespace-name {self.namespace} '
-                                f'--name {remote_path} --file {local_path}')
+                                f'--region {self.region} --name {remote_path} '
+                                f'--file {local_path}')
 
             return download_command
 
@@ -4346,6 +4363,7 @@ def _delete_oci_bucket(self, bucket_name: str) -> bool:
         @oci.with_oci_env
         def get_bucket_delete_command(bucket_name):
             remove_command = (f'oci os bucket delete --bucket-name '
+                              f'--region {self.region} '
                               f'{bucket_name} --empty --force')
 
             return remove_command