Refactor prepend_dist_dir_to_spec_paths in validate_manifest.py for clarity and efficiency; simplify clean_env function in env_cleaner.py by removing unused parameters.

Author: sathiya-nhs

ansible/collections/ansible_collections/nhsd/apigee/plugins/module_utils/models/ansible/validate_manifest.py

@@ -53,18 +53,15 @@ def check_service_name(cls, service_name, values):
     def prepend_dist_dir_to_spec_paths(cls, manifest, values):
         dist_dir = values.get("dist_dir")
         print(dist_dir)
-        if not dist_dir:
-            return manifest
-        changed = False
-        apigee = manifest["apigee"]
-        for env_dict in apigee["environments"]:
-            for spec_dict in env_dict["specs"]:
-                path = spec_dict.get("path")
-                if path is not None:
-                    spec_dict["path"] = os.path.join(dist_dir, path)
-                    changed = True
+        if dist_dir:
+            apigee = manifest["apigee"]
+            for env_dict in apigee["environments"]:
+                for spec_dict in env_dict["specs"]:
+                    path = spec_dict.get("path")
+                    if path is not None:
+                        spec_dict["path"] = os.path.join(dist_dir, path)
 
-        return manifest if changed else manifest
+        return manifest
 
     @pydantic.validator("manifest")
     def check_namespacing(cls, manifest, values):

env_cleaner.py

@@ -88,6 +88,7 @@ def clean_proxies(
     undeploy_only: bool = False,
     respect_prs: bool = False,
 ):
+
     open_prs = set()
     if respect_prs:
         # Get open PRs, if there are any
@@ -153,12 +154,11 @@ def clean_env(
     should_clean_products: bool = False,
     sandboxes_only: bool = False,
     dry_run: bool = False,
-    min_age: Optional[int] = None,
     undeploy_only: bool = False,
     respect_prs: bool = False,
 ):
     if should_clean_specs:
-        clean_specs(client, env, dry_run)
+        clean_specs(client, dry_run)
 
     if should_clean_proxies:
         clean_proxies(
@@ -167,13 +167,12 @@ def clean_env(
             env,
             dry_run,
             sandboxes_only,
-            min_age,
             undeploy_only,
             respect_prs,
         )
 
     if should_clean_products:
-        clean_products(client, env, dry_run)
+        clean_products(client, dry_run)
 
 
 if __name__ == "__main__":