Merge branch 'devel' into cleanup/diff-unused-param

Author: VedantMadane

ansible_base/lib/workload_identity/base.py

@@ -40,20 +40,24 @@ def generate_sub_claim(cls, workload_claims: dict) -> str:
         """
         Generate a sub claim string from workload claims using the scope's claim mapping.
 
-        Given a dictionary with the claims of a workload, generates a sub claim string with the following format:
-        "job:<job_name>:organization:<organization_name>:project:<project_name>:job_template:<job_template_name>"
+        Constructs a colon-delimited string prefixed with "workload_type:{scope_name}:" followed by
+        the claim names and values specified by the scope's get_target_claim_names_to_sub_stubs()
+        method. The order is determined by the subclass implementation.
 
         Note: The specified claim names are included in the output sub claim value even if they
         are empty. Claim validation is expected to take care of doing these checks before this
         function is called.
 
         :param workload_claims: A dictionary containing the workload claims (claim names to values)
         :type workload_claims: dict
-        :return: A string containing the sub claim
+        :return: A string containing the sub claim prefixed with workload type
         :rtype: str
         """
         target_claim_names_to_sub_stubs = cls.get_target_claim_names_to_sub_stubs()
-        return ":".join([f"{target_claim_names_to_sub_stubs[key]}:{workload_claims.get(key, '')}" for key in target_claim_names_to_sub_stubs.keys()])
+        base_sub = [f"workload_type:{cls.name}"]
+        base_sub.extend([f"{target_claim_names_to_sub_stubs[key]}:{workload_claims.get(key, '')}" for key in target_claim_names_to_sub_stubs.keys()])
+
+        return ":".join(base_sub)
 
     @abstractmethod
     def populate_claims(self, workload_data: dict) -> dict:

ansible_base/lib/workload_identity/controller.py

@@ -47,8 +47,6 @@ def list_claims(cls) -> list[str]:
     @classmethod
     def get_target_claim_names_to_sub_stubs(cls) -> dict[str, str]:
         return {
-            cls.CLAIM_JOB_NAME: "job",
             cls.CLAIM_ORGANIZATION_NAME: "organization",
-            cls.CLAIM_PROJECT_NAME: "project",
             cls.CLAIM_JOB_TEMPLATE_NAME: "job_template",
         }

test_app/tests/lib/workload_identity/test_controller.py

@@ -43,9 +43,7 @@ def test_get_target_claim_names_to_sub_stubs():
     of claim names to their sub claim stubs.
     """
     expected_mapping = {
-        'aap_controller_job_name': 'job',
         'aap_controller_organization_name': 'organization',
-        'aap_controller_project_name': 'project',
         'aap_controller_job_template_name': 'job_template',
     }
 
@@ -71,28 +69,21 @@ def test_get_target_claim_names_to_sub_stubs_keys_are_valid_claims():
     [
         (
             {
-                'aap_controller_job_name': 'my-job',
                 'aap_controller_organization_name': 'my-org',
-                'aap_controller_project_name': 'my-project',
                 'aap_controller_job_template_name': 'my-template',
             },
-            "job:my-job:organization:my-org:project:my-project:job_template:my-template",
+            "workload_type:aap_controller_automation_job:organization:my-org:job_template:my-template",
         ),
         (
             {
-                'aap_controller_job_name': 'my-job',
                 'aap_controller_organization_name': '',
-                'aap_controller_project_name': 'my-project',
                 'aap_controller_job_template_name': '',
             },
-            "job:my-job:organization::project:my-project:job_template:",
+            "workload_type:aap_controller_automation_job:organization::job_template:",
         ),
         (
-            {
-                'aap_controller_job_name': 'my-job',
-                'aap_controller_project_name': 'my-project',
-            },
-            "job:my-job:organization::project:my-project:job_template:",
+            {'aap_controller_job_template_name': 'my-template'},
+            "workload_type:aap_controller_automation_job:organization::job_template:my-template",
         ),
     ],
 )