refactor(aws): migrate AWS handlers + field mappings to machine_type/machine_role

Companion call-site updates for the Template.instance_type -> machine_type
and instance_profile -> machine_role renames: AWS context mixin, HostFactory
field mappings, and the instance-operation service now read the new field
names (Jinja/HF wire keys that operators see are unchanged). Tests updated.

Author: fgogolli

src/orb/infrastructure/scheduler/hostfactory/field_mappings.py

@@ -63,7 +63,7 @@ class HostFactoryFieldMappings:
             "spotFleetRequestExpiry": "spot_fleet_request_expiry",
             "poolsCount": "pools_count",
             # AWS instance configuration
-            "instanceProfile": "instance_profile",
+            "instanceProfile": "machine_role",
             "launchTemplateId": "launch_template_id",
             "userDataScript": "user_data",
         },

src/orb/providers/aws/infrastructure/handlers/shared/base_context_mixin.py

@@ -105,8 +105,8 @@ def _prepare_standard_flags(self, template: AWSTemplate) -> dict[str, Any]:
             # Optional configuration flags
             "has_key_name": hasattr(template, "key_name") and bool(template.key_name),
             "has_user_data": hasattr(template, "user_data") and bool(template.user_data),
-            "has_instance_profile": hasattr(template, "instance_profile")
-            and bool(template.instance_profile),
+            "has_instance_profile": hasattr(template, "machine_role")
+            and bool(template.machine_role),
             "has_ebs_optimized": hasattr(template, "ebs_optimized")
             and template.ebs_optimized is not None,  # type: ignore[attr-defined]
             "has_monitoring": hasattr(template, "monitoring_enabled")

src/orb/providers/aws/scheduler/hostfactory_field_mapping.py

@@ -29,7 +29,7 @@ class AWSFieldMapping:
         "spotFleetRequestExpiry": "spot_fleet_request_expiry",
         "poolsCount": "pools_count",
         # AWS instance configuration
-        "instanceProfile": "instance_profile",
+        "instanceProfile": "machine_role",
         "launchTemplateId": "launch_template_id",
         "userDataScript": "user_data",
     }

src/orb/providers/aws/services/instance_operation_service.py

@@ -68,7 +68,7 @@ async def create_instances(
                 "iops",
                 "fleet_role",
                 "fleet_type",
-                "instance_profile",
+                "machine_role",
                 "key_name",
                 "user_data",
             ]:

tests/providers/aws/mocked/test_run_instances_gaps.py

@@ -89,8 +89,8 @@ def _create_or_update(template: AWSTemplate, request: Any) -> LaunchTemplateResu
             lt_data["UserData"] = base64.b64encode(template.user_data.encode()).decode()
         if template.key_name:
             lt_data["KeyName"] = template.key_name
-        if template.instance_profile:
-            lt_data["IamInstanceProfile"] = {"Arn": template.instance_profile}
+        if template.machine_role:
+            lt_data["IamInstanceProfile"] = {"Arn": template.machine_role}
         try:
             resp = aws_client.ec2_client.create_launch_template(
                 LaunchTemplateName=lt_name,
@@ -287,7 +287,7 @@ def test_acquire_with_iam_instance_profile(
         verify it is present in the launch template version data instead.
         """
         profile_arn = "arn:aws:iam::123456789012:instance-profile/test-profile"
-        template = _run_instances_template(subnet_id, sg_id, instance_profile=profile_arn)
+        template = _run_instances_template(subnet_id, sg_id, machine_role=profile_arn)
         request = _make_request(request_id="req-iam-001")
 
         result = handler.acquire_hosts(request, template)

tests/providers/aws/unit/test_base_context_mixin.py

@@ -194,7 +194,7 @@ def test_prepare_standard_flags(self):
         self.template.machine_types = {"t3.medium": 1, "t3.large": 2}
         self.template.key_name = "my-key"
         self.template.user_data = "#!/bin/bash"
-        self.template.instance_profile = "my-profile"
+        self.template.machine_role = "my-profile"
         self.template.ebs_optimized = True
         self.template.monitoring_enabled = False
 

tests/providers/aws/unit/test_launch_template_manager.py

@@ -193,7 +193,7 @@ def test_create_launch_template_data_user_data(self):
 
     def test_create_launch_template_data_iam_instance_profile(self):
         """Test launch template data creation with IAM instance profile."""
-        self.aws_template.instance_profile = "test-instance-profile"
+        self.aws_template.machine_role = "test-instance-profile"
 
         data = self.manager._create_launch_template_data_legacy(self.aws_template, self.request)