refactor: rename FeatureGroup to FeatureGroupManager

Rename the mlops FeatureGroup class to FeatureGroupManager to
distinguish it from the core FeatureGroup base class. Update all
references in unit and integration lake formation tests. Fix missing
comma in __init__.py __all__ list.
---
X-AI-Prompt: rename FeatureGroup to FeatureGroupManager and update lakeformation tests
X-AI-Tool: kiro-cli

Author: BassemHalim

sagemaker-mlops/src/sagemaker/mlops/feature_store/__init__.py

@@ -3,7 +3,8 @@
 """SageMaker FeatureStore V3 - powered by sagemaker-core."""
 
 # FeatureGroup with Lake Formation support (local subclass)
-from sagemaker.mlops.feature_store.feature_group import FeatureGroup, LakeFormationConfig
+from sagemaker.core.resources import FeatureGroup, FeatureMetadata
+from sagemaker.mlops.feature_store.feature_group_manager import FeatureGroupManager, LakeFormationConfig
 
 # Resources from core
 from sagemaker.core.resources import FeatureMetadata
@@ -76,6 +77,7 @@
 __all__ = [
     # Resources
     "FeatureGroup",
+    "FeatureGroupManager",
     "FeatureMetadata",
     # Shapes
     "DataCatalogConfig",

…ker/mlops/feature_store/feature_group.py …s/feature_store/feature_group_manager.pysagemaker-mlops/src/sagemaker/mlops/feature_store/feature_group.py renamed to sagemaker-mlops/src/sagemaker/mlops/feature_store/feature_group_manager.py sagemaker-mlops/src/sagemaker/mlops/feature_store/feature_group.py renamed to sagemaker-mlops/src/sagemaker/mlops/feature_store/feature_group_manager.py

@@ -8,7 +8,7 @@
 
 import botocore.exceptions
 
-from sagemaker.core.resources import FeatureGroup as CoreFeatureGroup
+from sagemaker.core.resources import FeatureGroup
 from sagemaker.core.resources import Base
 from sagemaker.core.shapes import (
     FeatureDefinition,
@@ -55,11 +55,11 @@ class LakeFormationConfig(Base):
     disable_hybrid_access_mode: bool = True
 
 
-class FeatureGroup(CoreFeatureGroup):
+class FeatureGroupManager(FeatureGroup):
 
     # Inherit parent docstring and append our additions
-    if CoreFeatureGroup.__doc__ and __doc__:
-        __doc__ = CoreFeatureGroup.__doc__
+    if FeatureGroup.__doc__ and __doc__:
+        __doc__ = FeatureGroup.__doc__
 
     @staticmethod
     def _s3_uri_to_arn(s3_uri: str, region: Optional[str] = None) -> str:
@@ -326,7 +326,7 @@ def _revoke_iam_allowed_principal(
                 },
                 Permissions=["ALL"],
             )
-            logger.info(f"Revoked IAMAllowedPrincipal from table: {database_name}.{table_name}")
+            logger.info(f"Disabled Lake Formation hybrid-access mode on table: {database_name}.{table_name}")
             return True
         except botocore.exceptions.ClientError as e:
             # if the Table doesn't have that permission because the user already revoked it
@@ -514,6 +514,21 @@ def enable_lake_formation(
         table_name_str = str(table_name)
         role_arn_str = str(self.role_arn)
 
+        # Determine the actual S3 location to register with Lake Formation.
+        # For Iceberg tables, the Glue table's StorageDescriptor.Location is the parent
+        # path (without /data suffix), while resolved_output_s3_uri always ends with /data.
+        s3_location_to_register = resolved_s3_uri_str
+        if (
+            self.offline_store_config.table_format is not None
+            and str(self.offline_store_config.table_format) == "Iceberg"
+            and resolved_s3_uri_str.endswith("/data")
+        ):
+            s3_location_to_register = resolved_s3_uri_str[: -len("/data")]
+            logger.info(
+                f"Iceberg table format detected. Using parent S3 path for LF registration: "
+                f"{s3_location_to_register}"
+            )
+
         # Execute Lake Formation setup with fail-fast behavior
         results = {
             "s3_registration": False,
@@ -524,7 +539,7 @@ def enable_lake_formation(
         # Phase 1: Register S3 with Lake Formation
         try:
             results["s3_registration"] = self._register_s3_with_lake_formation(
-                resolved_s3_uri_str,
+                s3_location_to_register,
                 session,
                 region,
                 use_service_linked_role=use_service_linked_role,

sagemaker-mlops/tests/integ/test_featureStore_lakeformation.py

@@ -1,5 +1,5 @@
 """
-Integration tests for Lake Formation with FeatureGroup.
+Integration tests for Lake Formation with FeatureGroupManager.
 
 These tests require:
 - AWS credentials with Lake Formation and SageMaker permissions
@@ -18,7 +18,7 @@
 
 from sagemaker.core.helper.session_helper import Session, get_execution_role
 from sagemaker.mlops.feature_store import (
-    FeatureGroup,
+    FeatureGroupManager,
     LakeFormationConfig,
     OfflineStoreConfig,
     OnlineStoreConfig,
@@ -58,7 +58,7 @@ def region():
 @pytest.fixture(scope="module")
 def shared_feature_group_for_negative_tests(s3_uri, role, region):
     """
-    Create a single FeatureGroup for negative tests that only need to verify
+    Create a single FeatureGroupManager for negative tests that only need to verify
     error conditions without modifying the resource.
 
     This fixture is module-scoped to be created once and shared across tests,
@@ -81,12 +81,12 @@ def generate_feature_group_name():
     return f"test-lf-fg-{uuid.uuid4().hex[:8]}"
 
 
-def create_test_feature_group(name: str, s3_uri: str, role_arn: str, region: str) -> FeatureGroup:
-    """Create a FeatureGroup with offline store for testing."""
+def create_test_feature_group(name: str, s3_uri: str, role_arn: str, region: str) -> FeatureGroupManager:
+    """Create a FeatureGroupManager with offline store for testing."""
 
     offline_store_config = OfflineStoreConfig(s3_storage_config=S3StorageConfig(s3_uri=s3_uri))
 
-    fg = FeatureGroup.create(
+    fg = FeatureGroupManager.create(
         feature_group_name=name,
         record_identifier_feature_name="record_id",
         event_time_feature_name="event_time",
@@ -99,12 +99,12 @@ def create_test_feature_group(name: str, s3_uri: str, role_arn: str, region: str
     return fg
 
 
-def cleanup_feature_group(fg: FeatureGroup):
+def cleanup_feature_group(fg: FeatureGroupManager):
     """
-    Delete a FeatureGroup and its associated Glue table.
+    Delete a FeatureGroupManager and its associated Glue table.
 
     Args:
-        fg: The FeatureGroup to delete.
+        fg: The FeatureGroupManager to delete.
     """
     try:
         # Delete the Glue table if it exists
@@ -128,7 +128,7 @@ def cleanup_feature_group(fg: FeatureGroup):
                 # Don't fail cleanup if Glue table deletion fails
                 pass
 
-        # Delete the FeatureGroup
+        # Delete the FeatureGroupManager
         fg.delete()
     except ClientError:
         # Don't fail cleanup if Glue table deletion fails
@@ -139,20 +139,20 @@ def cleanup_feature_group(fg: FeatureGroup):
 @pytest.mark.slow_test
 def test_create_feature_group_and_enable_lake_formation(s3_uri, role, region):
     """
-    Test creating a FeatureGroup and enabling Lake Formation governance.
+    Test creating a FeatureGroupManager and enabling Lake Formation governance.
 
     This test:
-    1. Creates a new FeatureGroup with offline store
+    1. Creates a new FeatureGroupManager with offline store
     2. Waits for it to reach Created status
     3. Enables Lake Formation governance (registers S3, grants permissions, revokes IAM principals)
-    4. Cleans up the FeatureGroup
+    4. Cleans up the FeatureGroupManager
     """
 
     fg_name = generate_feature_group_name()
     fg = None
 
     try:
-        # Create the FeatureGroup
+        # Create the FeatureGroupManager
         fg = create_test_feature_group(fg_name, s3_uri, role, region)
         assert fg is not None
 
@@ -179,26 +179,26 @@ def test_create_feature_group_and_enable_lake_formation(s3_uri, role, region):
 @pytest.mark.slow_test
 def test_create_feature_group_with_lake_formation_enabled(s3_uri, role, region):
     """
-    Test creating a FeatureGroup with lake_formation_config.enabled=True.
+    Test creating a FeatureGroupManager with lake_formation_config.enabled=True.
 
     This test verifies the integrated workflow where Lake Formation is enabled
-    automatically during FeatureGroup creation:
-    1. Creates a new FeatureGroup with lake_formation_config.enabled=True
-    2. Verifies the FeatureGroup is created and Lake Formation is configured
-    3. Cleans up the FeatureGroup
+    automatically during FeatureGroupManager creation:
+    1. Creates a new FeatureGroupManager with lake_formation_config.enabled=True
+    2. Verifies the FeatureGroupManager is created and Lake Formation is configured
+    3. Cleans up the FeatureGroupManager
     """
 
     fg_name = generate_feature_group_name()
     fg = None
 
     try:
-        # Create the FeatureGroup with Lake Formation enabled
+        # Create the FeatureGroupManager with Lake Formation enabled
 
         offline_store_config = OfflineStoreConfig(s3_storage_config=S3StorageConfig(s3_uri=s3_uri))
         lake_formation_config = LakeFormationConfig()
         lake_formation_config.enabled = True
 
-        fg = FeatureGroup.create(
+        fg = FeatureGroupManager.create(
             feature_group_name=fg_name,
             record_identifier_feature_name="record_id",
             event_time_feature_name="event_time",
@@ -208,7 +208,7 @@ def test_create_feature_group_with_lake_formation_enabled(s3_uri, role, region):
             lake_formation_config=lake_formation_config,
         )
 
-        # Verify the FeatureGroup was created
+        # Verify the FeatureGroupManager was created
         assert fg is not None
         assert fg.feature_group_name == fg_name
         assert fg.feature_group_status == "Created"
@@ -226,24 +226,24 @@ def test_create_feature_group_with_lake_formation_enabled(s3_uri, role, region):
 @pytest.mark.serial
 def test_create_feature_group_without_lake_formation(s3_uri, role, region):
     """
-    Test creating a FeatureGroup without Lake Formation enabled.
+    Test creating a FeatureGroupManager without Lake Formation enabled.
 
     This test verifies that when lake_formation_config is not provided or enabled=False,
-    the FeatureGroup is created successfully without any Lake Formation operations:
-    1. Creates a new FeatureGroup without lake_formation_config
-    2. Verifies the FeatureGroup is created successfully
+    the FeatureGroupManager is created successfully without any Lake Formation operations:
+    1. Creates a new FeatureGroupManager without lake_formation_config
+    2. Verifies the FeatureGroupManager is created successfully
     3. Verifies no Lake Formation operations were performed
-    4. Cleans up the FeatureGroup
+    4. Cleans up the FeatureGroupManager
     """
     fg_name = generate_feature_group_name()
     fg = None
 
     try:
-        # Create the FeatureGroup without Lake Formation
+        # Create the FeatureGroupManager without Lake Formation
         offline_store_config = OfflineStoreConfig(s3_storage_config=S3StorageConfig(s3_uri=s3_uri))
 
         # Create without lake_formation_config (default behavior)
-        fg = FeatureGroup.create(
+        fg = FeatureGroupManager.create(
             feature_group_name=fg_name,
             record_identifier_feature_name="record_id",
             event_time_feature_name="event_time",
@@ -252,7 +252,7 @@ def test_create_feature_group_without_lake_formation(s3_uri, role, region):
             role_arn=role,
         )
 
-        # Verify the FeatureGroup was created
+        # Verify the FeatureGroupManager was created
         assert fg is not None
         assert fg.feature_group_name == fg_name
 
@@ -278,7 +278,7 @@ def test_create_feature_group_without_lake_formation(s3_uri, role, region):
 
 def test_create_feature_group_with_lake_formation_fails_without_offline_store(role, region):
     """
-    Test that creating a FeatureGroup with enable_lake_formation=True fails
+    Test that creating a FeatureGroupManager with enable_lake_formation=True fails
     when no offline store is configured.
 
     Expected behavior: ValueError should be raised indicating offline store is required.
@@ -290,7 +290,7 @@ def test_create_feature_group_with_lake_formation_fails_without_offline_store(ro
 
     # Attempt to create without offline store but with Lake Formation enabled
     with pytest.raises(ValueError) as exc_info:
-        FeatureGroup.create(
+        FeatureGroupManager.create(
             feature_group_name=fg_name,
             record_identifier_feature_name="record_id",
             event_time_feature_name="event_time",
@@ -307,7 +307,7 @@ def test_create_feature_group_with_lake_formation_fails_without_offline_store(ro
 
 def test_create_feature_group_with_lake_formation_fails_without_role(s3_uri, region):
     """
-    Test that creating a FeatureGroup with lake_formation_config.enabled=True fails
+    Test that creating a FeatureGroupManager with lake_formation_config.enabled=True fails
     when no role_arn is provided.
 
     Expected behavior: ValueError should be raised indicating role_arn is required.
@@ -320,7 +320,7 @@ def test_create_feature_group_with_lake_formation_fails_without_role(s3_uri, reg
 
     # Attempt to create without role_arn but with Lake Formation enabled
     with pytest.raises(ValueError) as exc_info:
-        FeatureGroup.create(
+        FeatureGroupManager.create(
             feature_group_name=fg_name,
             record_identifier_feature_name="record_id",
             event_time_feature_name="event_time",
@@ -335,20 +335,20 @@ def test_create_feature_group_with_lake_formation_fails_without_role(s3_uri, reg
 
 def test_enable_lake_formation_fails_for_non_created_status(s3_uri, role, region):
     """
-    Test that enable_lake_formation() fails when called on a FeatureGroup
+    Test that enable_lake_formation() fails when called on a FeatureGroupManager
     that is not in 'Created' status.
 
     Expected behavior: ValueError should be raised indicating the Feature Group
     must be in 'Created' status.
 
-    Note: This test creates its own FeatureGroup because it needs to test
+    Note: This test creates its own FeatureGroupManager because it needs to test
     behavior during the 'Creating' status, which requires a fresh resource.
     """
     fg_name = generate_feature_group_name()
     fg = None
 
     try:
-        # Create the FeatureGroup
+        # Create the FeatureGroupManager
         fg = create_test_feature_group(fg_name, s3_uri, role, region)
         assert fg is not None
 
@@ -370,22 +370,22 @@ def test_enable_lake_formation_fails_for_non_created_status(s3_uri, role, region
 
 def test_enable_lake_formation_without_offline_store(role, region):
     """
-    Test that enable_lake_formation() fails when called on a FeatureGroup
+    Test that enable_lake_formation() fails when called on a FeatureGroupManager
     without an offline store configured.
 
     Expected behavior: ValueError should be raised indicating offline store is required.
 
-    Note: This test creates a FeatureGroup with only online store, which is a valid
+    Note: This test creates a FeatureGroupManager with only online store, which is a valid
     configuration, but Lake Formation cannot be enabled for it.
     """
     fg_name = generate_feature_group_name()
     fg = None
 
     try:
-        # Create a FeatureGroup with only online store (no offline store)
+        # Create a FeatureGroupManager with only online store (no offline store)
         online_store_config = OnlineStoreConfig(enable_online_store=True)
 
-        fg = FeatureGroup.create(
+        fg = FeatureGroupManager.create(
             feature_group_name=fg_name,
             record_identifier_feature_name="record_id",
             event_time_feature_name="event_time",
@@ -477,7 +477,7 @@ def test_enable_lake_formation_full_flow_with_policy_output(s3_uri, role, region
     Test the full Lake Formation flow with S3 deny policy output.
 
     This test verifies:
-    1. Creates a FeatureGroup with offline store
+    1. Creates a FeatureGroupManager with offline store
     2. Enables Lake Formation with show_s3_policy=True
     3. Verifies all Lake Formation phases complete successfully
     4. Verifies the S3 deny policy is logged
@@ -489,7 +489,7 @@ def test_enable_lake_formation_full_flow_with_policy_output(s3_uri, role, region
     fg = None
 
     try:
-        # Create the FeatureGroup
+        # Create the FeatureGroupManager
         fg = create_test_feature_group(fg_name, s3_uri, role, region)
         assert fg is not None
 
@@ -553,7 +553,7 @@ def test_enable_lake_formation_no_policy_output_by_default(s3_uri, role, region,
     Test that S3 deny policy is NOT logged when show_s3_policy=False (default).
 
     This test verifies:
-    1. Creates a FeatureGroup with offline store
+    1. Creates a FeatureGroupManager with offline store
     2. Enables Lake Formation without show_s3_policy (defaults to False)
     3. Verifies all Lake Formation phases complete successfully
     4. Verifies the S3 deny policy is NOT logged
@@ -564,7 +564,7 @@ def test_enable_lake_formation_no_policy_output_by_default(s3_uri, role, region,
     fg = None
 
     try:
-        # Create the FeatureGroup
+        # Create the FeatureGroupManager
         fg = create_test_feature_group(fg_name, s3_uri, role, region)
         assert fg is not None
 
@@ -601,7 +601,7 @@ def test_enable_lake_formation_with_custom_role_policy_output(s3_uri, role, regi
     Test the full Lake Formation flow with custom registration role and policy output.
 
     This test verifies:
-    1. Creates a FeatureGroup with offline store
+    1. Creates a FeatureGroupManager with offline store
     2. Enables Lake Formation with use_service_linked_role=False and a custom registration_role_arn
     3. Verifies the S3 deny policy uses the custom role ARN instead of service-linked role
 
@@ -614,7 +614,7 @@ def test_enable_lake_formation_with_custom_role_policy_output(s3_uri, role, regi
     fg = None
 
     try:
-        # Create the FeatureGroup
+        # Create the FeatureGroupManager
         fg = create_test_feature_group(fg_name, s3_uri, role, region)
         assert fg is not None