Allow any AWS authentication method in studios (#19336)

Lightning-AI · Jan 24, 2024 · 577bd85 · 577bd85
1 parent 71bfdc3
commit 577bd85
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/src/lightning/data/streaming/client.py b/src/lightning/data/streaming/client.py
@@ -7,8 +7,6 @@
 if _BOTO3_AVAILABLE:
     import boto3
     import botocore
-    from botocore.credentials import InstanceMetadataProvider
-    from botocore.utils import InstanceMetadataFetcher
 
 
 class S3Client:
@@ -31,14 +29,8 @@ def client(self) -> Any:
 
         # Re-generate credentials for EC2
         if self._last_time is None or (time() - self._last_time) > self._refetch_interval:
-            provider = InstanceMetadataProvider(iam_role_fetcher=InstanceMetadataFetcher(timeout=3600, num_attempts=5))
-            credentials = provider.load()
             self._client = boto3.client(
-                "s3",
-                aws_access_key_id=credentials.access_key,
-                aws_secret_access_key=credentials.secret_key,
-                aws_session_token=credentials.token,
-                config=botocore.config.Config(retries={"max_attempts": 1000, "mode": "adaptive"}),
+                "s3", config=botocore.config.Config(retries={"max_attempts": 1000, "mode": "adaptive"})
             )
             self._last_time = time()
 

diff --git a/tests/tests_data/streaming/test_client.py b/tests/tests_data/streaming/test_client.py
@@ -31,12 +31,6 @@ def test_s3_client_with_cloud_space_id(monkeypatch):
     botocore = mock.MagicMock()
     monkeypatch.setattr(client, "botocore", botocore)
 
-    instance_metadata_provider = mock.MagicMock()
-    monkeypatch.setattr(client, "InstanceMetadataProvider", instance_metadata_provider)
-
-    instance_metadata_fetcher = mock.MagicMock()
-    monkeypatch.setattr(client, "InstanceMetadataFetcher", instance_metadata_fetcher)
-
     monkeypatch.setenv("LIGHTNING_CLOUD_SPACE_ID", "dummy")
 
     s3 = client.S3Client(1)