cruseakshay commented on code in PR #64941:
URL: https://github.com/apache/airflow/pull/64941#discussion_r3128835500
##########
providers/common/sql/tests/unit/common/sql/datafusion/test_object_storage_provider.py:
##########
@@ -16,59 +16,111 @@
# under the License.
from __future__ import annotations
-from unittest.mock import patch
+from unittest.mock import MagicMock, patch
import pytest
-from airflow.providers.common.sql.config import ConnectionConfig, StorageType
-from airflow.providers.common.sql.datafusion.exceptions import
ObjectStoreCreationException
+from airflow.providers.common.sql.config import StorageType
from airflow.providers.common.sql.datafusion.object_storage_provider import (
LocalObjectStorageProvider,
- S3ObjectStorageProvider,
get_object_storage_provider,
)
-class TestObjectStorageProvider:
-
@patch("airflow.providers.common.sql.datafusion.object_storage_provider.AmazonS3")
- def test_s3_provider_success(self, mock_s3):
- provider = S3ObjectStorageProvider()
- connection_config = ConnectionConfig(
- conn_id="aws_default",
- credentials={"access_key_id": "fake_key", "secret_access_key":
"fake_secret"},
- )
+class TestLocalObjectStorageProvider:
+ @patch(
+
"airflow.providers.common.sql.datafusion.object_storage_provider.LocalFileSystem",
+ autospec=True,
+ )
+ def test_local_provider(self, mock_local):
+ provider = LocalObjectStorageProvider()
+ assert provider.get_storage_type == StorageType.LOCAL
+ assert provider.get_scheme() == "file://"
+ local_store = provider.create_object_store("file://path")
+ assert local_store == mock_local.return_value
+
- store = provider.create_object_store("s3://demo-data/path",
connection_config)
+class TestGetObjectStorageProvider:
+ def test_returns_local_provider_directly(self):
+ provider = get_object_storage_provider(StorageType.LOCAL)
+ assert isinstance(provider, LocalObjectStorageProvider)
- mock_s3.assert_called_once_with(
- access_key_id="fake_key", secret_access_key="fake_secret",
bucket_name="demo-data"
+
@patch("airflow.providers.common.sql.datafusion.object_storage_provider.import_string",
autospec=True)
+ @patch("airflow.providers_manager.ProvidersManager", autospec=True)
+ def test_resolves_s3_via_registry(self, mock_pm_cls, mock_import_string):
+ mock_provider_cls = MagicMock()
+ mock_import_string.return_value = mock_provider_cls
+
+ mock_pm_cls.return_value.object_storage_providers = {
+ "s3": MagicMock(
+
provider_class_name="airflow.providers.amazon.aws.datafusion.object_storage.S3ObjectStorageProvider",
+ ),
+ }
Review Comment:
Done
##########
providers/amazon/tests/unit/amazon/aws/datafusion/test_object_storage.py:
##########
@@ -0,0 +1,181 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from __future__ import annotations
+
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from airflow.models import Connection
+from airflow.providers.common.sql.config import ConnectionConfig, StorageType
+from airflow.providers.common.sql.datafusion.exceptions import
ObjectStoreCreationException
+
+
+class TestS3ObjectStorageProvider:
+ """Tests for S3ObjectStorageProvider in the amazon provider package."""
+
+ @pytest.fixture(autouse=True)
+ def setup_connections(self, create_connection_without_db):
+ create_connection_without_db(
+ Connection(
+ conn_id="aws_default",
+ conn_type="aws",
+ login="fake_id",
+ password="fake_secret",
+ extra='{"region": "us-east-1"}',
+ )
+ )
+
+ @patch(
+ "airflow.providers.amazon.aws.datafusion.object_storage.AmazonS3",
+ autospec=True,
+ )
+ @patch(
+
"airflow.providers.amazon.aws.datafusion.object_storage.AwsGenericHook",
+ autospec=True,
+ )
+ def test_s3_provider_with_login_password(self, mock_hook_cls, mock_s3):
+ """Login/password on the connection override hook credentials."""
+ from airflow.providers.amazon.aws.datafusion.object_storage import
S3ObjectStorageProvider
+
+ mock_creds = MagicMock()
+ mock_creds.access_key = "hook_key"
+ mock_creds.secret_key = "hook_secret"
+ mock_creds.token = None
+ mock_hook_cls.return_value.get_credentials.return_value = mock_creds
+
+ provider = S3ObjectStorageProvider()
+ config = ConnectionConfig(conn_id="aws_default")
+
+ store = provider.create_object_store("s3://demo-data/path",
connection_config=config)
+
+ mock_s3.assert_called_once_with(
+ access_key_id="fake_id",
+ secret_access_key="fake_secret",
+ region="us-east-1",
+ bucket_name="demo-data",
+ )
+ assert store == mock_s3.return_value
+ assert provider.get_storage_type == StorageType.S3
+ assert provider.get_scheme() == "s3://"
+
+ @patch(
+ "airflow.providers.amazon.aws.datafusion.object_storage.AmazonS3",
+ autospec=True,
+ )
+ @patch(
+
"airflow.providers.amazon.aws.datafusion.object_storage.AwsGenericHook",
+ autospec=True,
+ )
+ def test_s3_provider_falls_back_to_hook_credentials(self, mock_hook_cls,
mock_s3):
+ """When login/password are empty, hook credentials are used."""
+ from airflow.providers.amazon.aws.datafusion.object_storage import
S3ObjectStorageProvider
+
+ mock_creds = MagicMock()
+ mock_creds.access_key = "hook_key"
+ mock_creds.secret_key = "hook_secret"
+ mock_creds.token = "session_tok"
+ mock_hook_cls.return_value.get_credentials.return_value = mock_creds
Review Comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
