update custom s3 name

Author: pintaoz

doc/cli/cluster_management/cli_cluster_management.md

@@ -358,7 +358,7 @@ The `config.yaml` file supports the following parameters:
 | `create_s3_endpoint_stack` | BOOLEAN | Create S3 Endpoint stack | true |
 | `enable_hp_inference_feature` | BOOLEAN | Enable inference operator | false |
 | `stage` | TEXT | Deployment stage ("gamma" or "prod") | "prod" |
-| `custom_bucket_name` | TEXT | S3 bucket name for templates | "aws-sagemaker-hyperpod-cluster-setup" |
+| `custom_bucket_name` | TEXT | Custom S3 bucket name for templates | "" |
 | `create_life_cycle_script_stack` | BOOLEAN | Create Life Cycle Script Stack | true |
 | `create_s3_bucket_stack` | BOOLEAN | Create S3 Bucket Stack | true |
 | `s3_bucket_name` | TEXT | S3 bucket for cluster lifecycle scripts | "s3-bucket" |

hyperpod-cluster-stack-template/hyperpod_cluster_stack_template/v1_0/model.py

@@ -35,7 +35,7 @@ class ClusterStackBase(BaseModel):
     create_s3_endpoint_stack: Optional[bool] = Field(True, description="Boolean to Create S3 Endpoint stack")
     enable_hp_inference_feature: Optional[bool] = Field(False, description="Boolean to enable inference operator in Hyperpod cluster")
     stage: Optional[str] = Field("prod", description="Deployment stage used in S3 bucket naming for inference operator. Valid values: \"gamma\", \"prod\"")
-    custom_bucket_name: str = Field("aws-sagemaker-hyperpod-cluster-setup", description="S3 bucket name for templates")
+    custom_bucket_name: str = Field("", description="Custom S3 bucket name for templates")
     create_life_cycle_script_stack: Optional[bool] = Field(True, description="Boolean to Create Life Cycle Script Stack")
     create_s3_bucket_stack: Optional[bool] = Field(True, description="Boolean to Create S3 Bucket Stack")
     s3_bucket_name: Optional[str] = Field("s3-bucket", description="The name of the S3 bucket used to store the cluster lifecycle scripts")

hyperpod-cluster-stack-template/hyperpod_cluster_stack_template/v1_0/schema.json

@@ -439,7 +439,7 @@
       "title": "Stage"
     },
     "custom_bucket_name": {
-      "default": "aws-sagemaker-hyperpod-cluster",
+      "default": "",
       "description": "S3 bucket name for templates",
       "title": "Custom Bucket Name",
       "type": "string"

src/sagemaker/hyperpod/cluster_management/hp_cluster_stack.py

@@ -15,8 +15,9 @@
 from sagemaker.hyperpod.common.telemetry.constants import Feature
 
 CAPABILITIES_FOR_STACK_CREATION = [
-'CAPABILITY_IAM',
-'CAPABILITY_NAMED_IAM'
+    'CAPABILITY_AUTO_EXPAND',
+    'CAPABILITY_IAM',
+    'CAPABILITY_NAMED_IAM'
 ]
 log = logging.getLogger()
 
@@ -112,7 +113,7 @@ def create(self,
 
         stack_name = f"HyperpodClusterStack-{str(uuid.uuid4())[:5]}"
         # Use the fixed bucket name from the model
-        bucket_name = self.custom_bucket_name
+        bucket_name = "aws-sagemaker-hyperpod-cluster-setup"
         template_key = f"{template_version}/templates/main-stack-eks-based-template.yaml"
 
         try:

test/unit_tests/cli/test_cluster_stack.py

@@ -337,7 +337,7 @@ def test_create_cluster_stack_success(self, mock_hp_cluster_stack_class, mock_lo
         mock_model_class.assert_called_once_with(**{'key': 'value'})
         mock_model_instance.to_config.assert_called_once_with(region='us-west-2')
         mock_hp_cluster_stack_class.assert_called_once_with(**{'transformed': 'config'})
-        mock_sdk_instance.create.assert_called_once_with('us-west-2')
+        mock_sdk_instance.create.assert_called_once_with('us-west-2', 1)
 
     @patch('os.path.exists')
     def test_create_cluster_stack_file_not_found(self, mock_exists, mock_get_template, mock_read_text):