feat: Add custom-tags support for customer-provided tags

Add custom_tags parameter to all module settings and app.py files
so that customer-provided tags flow through from capability deployment
to CDK resources. This matches the pattern used by Data Foundations
solution kit.

Affected modules:
- sagemaker-templates
- sagemaker-studio
- sagemaker-notebook
- sagemaker-ground-truth-labeling
- sagemaker-model-monitoring
- ray-operator
- ray-cluster
- ray-orchestrator

Author: newman911

modules/eks/ray-cluster/app.py

@@ -50,6 +50,10 @@
     for tag_key, tag_value in app_settings.parameters.tags.items():
         Tags.of(app).add(tag_key, tag_value)
 
+if app_settings.parameters.custom_tags:
+    for tag_key, tag_value in app_settings.parameters.custom_tags.items():
+        Tags.of(app).add(tag_key, tag_value)
+
 Tags.of(app).add("SeedFarmerDeploymentName", app_settings.settings.deployment_name)
 Tags.of(app).add("SeedFarmerModuleName", app_settings.settings.module_name)
 Tags.of(app).add("SeedFarmerProjectName", app_settings.settings.project_name)

modules/eks/ray-cluster/settings.py

@@ -62,6 +62,7 @@ class SeedFarmerParameters(CdkBaseSettings):
     worker_labels: Dict[str, str] = Field(default={})
     permissions_boundary_name: Optional[str] = Field(default=None)
     tags: Optional[Dict[str, str]] = Field(default=None)
+    custom_tags: Optional[Dict[str, str]] = Field(default=None)
 
 
 class SeedFarmerSettings(CdkBaseSettings):

modules/eks/ray-operator/app.py

@@ -55,6 +55,10 @@
     for tag_key, tag_value in app_settings.parameters.tags.items():
         Tags.of(app).add(tag_key, tag_value)
 
+if app_settings.parameters.custom_tags:
+    for tag_key, tag_value in app_settings.parameters.custom_tags.items():
+        Tags.of(app).add(tag_key, tag_value)
+
 Tags.of(app).add("SeedFarmerDeploymentName", app_settings.settings.deployment_name)
 Tags.of(app).add("SeedFarmerModuleName", app_settings.settings.module_name)
 Tags.of(app).add("SeedFarmerProjectName", app_settings.settings.project_name)

modules/eks/ray-operator/settings.py

@@ -38,6 +38,7 @@ class SeedFarmerParameters(CdkBaseSettings):
     data_bucket_name: Optional[str] = Field(default=None)
     permissions_boundary_name: Optional[str] = Field(default=None)
     tags: Optional[Dict[str, str]] = Field(default=None)
+    custom_tags: Optional[Dict[str, str]] = Field(default=None)
 
 
 class SeedFarmerSettings(CdkBaseSettings):

modules/eks/ray-orchestrator/app.py

@@ -56,6 +56,10 @@
     for tag_key, tag_value in app_settings.parameters.tags.items():
         Tags.of(app).add(tag_key, tag_value)
 
+if app_settings.parameters.custom_tags:
+    for tag_key, tag_value in app_settings.parameters.custom_tags.items():
+        Tags.of(app).add(tag_key, tag_value)
+
 Tags.of(app).add("SeedFarmerDeploymentName", app_settings.settings.deployment_name)
 Tags.of(app).add("SeedFarmerModuleName", app_settings.settings.module_name)
 Tags.of(app).add("SeedFarmerProjectName", app_settings.settings.project_name)

modules/eks/ray-orchestrator/settings.py

@@ -40,6 +40,7 @@ class SeedFarmerParameters(CdkBaseSettings):
     dra_export_path: str = Field(default="/ray/export/")
     permissions_boundary_name: Optional[str] = Field(default=None)
     tags: Optional[Dict[str, str]] = Field(default=None)
+    custom_tags: Optional[Dict[str, str]] = Field(default=None)
 
 
 class SeedFarmerSettings(CdkBaseSettings):

modules/sagemaker/sagemaker-ground-truth-labeling/app.py

@@ -65,6 +65,14 @@
 
 aws_cdk.Aspects.of(app).add(cdk_nag.AwsSolutionsChecks(log_ignores=True))
 
+if app_settings.module_settings.tags:
+    for tag_key, tag_value in app_settings.module_settings.tags.items():
+        aws_cdk.Tags.of(app).add(tag_key, tag_value)
+
+if app_settings.module_settings.custom_tags:
+    for tag_key, tag_value in app_settings.module_settings.custom_tags.items():
+        aws_cdk.Tags.of(app).add(tag_key, tag_value)
+
 aws_cdk.Tags.of(app).add("SeedFarmerDeploymentName", app_settings.seedfarmer_settings.deployment_name)
 aws_cdk.Tags.of(app).add("SeedFarmerModuleName", app_settings.seedfarmer_settings.module_name)
 aws_cdk.Tags.of(app).add("SeedFarmerProjectName", app_settings.seedfarmer_settings.project_name)

modules/sagemaker/sagemaker-ground-truth-labeling/settings.py

@@ -60,6 +60,8 @@ class ModuleSettings(CdkBaseSettings):
     verification_task_price: Dict[str, Dict[str, int]] = Field(default={})
     labeling_workflow_schedule: str = Field(default="cron(0 12 * * ? *)")
     permissions_boundary_name: Optional[str] = Field(default=None)
+    tags: Optional[Dict[str, str]] = Field(default=None)
+    custom_tags: Optional[Dict[str, str]] = Field(default=None)
 
 
 class SeedFarmerSettings(CdkBaseSettings):

modules/sagemaker/sagemaker-model-monitoring/app.py

@@ -31,6 +31,10 @@
     for tag_key, tag_value in app_settings.module_settings.tags.items():
         aws_cdk.Tags.of(app).add(tag_key, tag_value)
 
+if app_settings.module_settings.custom_tags:
+    for tag_key, tag_value in app_settings.module_settings.custom_tags.items():
+        aws_cdk.Tags.of(app).add(tag_key, tag_value)
+
 aws_cdk.Tags.of(app).add("SeedFarmerDeploymentName", app_settings.seedfarmer_settings.deployment_name)
 aws_cdk.Tags.of(app).add("SeedFarmerModuleName", app_settings.seedfarmer_settings.module_name)
 aws_cdk.Tags.of(app).add("SeedFarmerProjectName", app_settings.seedfarmer_settings.project_name)

modules/sagemaker/sagemaker-model-monitoring/sagemaker_model_monitoring/settings.py

@@ -102,6 +102,7 @@ class ModuleSettings(CdkBaseSettings):
 
     permissions_boundary_name: Optional[str] = Field(default=None)
     tags: Optional[Dict[str, str]] = Field(default=None)
+    custom_tags: Optional[Dict[str, str]] = Field(default=None)
 
 
 class SeedFarmerSettings(CdkBaseSettings):