very slight optimization on ansible param converters

Author: mschuchard

plugins/module_utils/faas.py

@@ -114,7 +114,7 @@ def global_args_to_cmd(args: dict = {}) -> list[str]:
     return command
 
 
-def ansible_to_faas(args: dict) -> dict[str, list[str]]:
+def ansible_to_faas(args: dict) -> None:
     """converts ansible types and syntax to faas types and formatting for arguments only"""
     # in this function args dict is mutable pseudo-reference and also returned
     # iterate through ansible module argument
@@ -123,5 +123,3 @@ def ansible_to_faas(args: dict) -> dict[str, list[str]]:
             # transform dict[str, str] to list of '--arg' 'key=value' '--arg' 'key2=value2' strings
             case 'annotation' | 'label':
                 args[arg] = ' '.join([f'--{arg} {key}={value}' for key, value in arg_value.items()]).split()
-
-    return args

plugins/module_utils/packer.py

@@ -88,7 +88,7 @@ def cmd(action: str, flags: set[str] = set(), args: dict[str, str | int | list[s
     raise RuntimeError(f'Targeted directory or file does not exist: {target_dir}')
 
 
-def ansible_to_packer(args: dict) -> dict[str, str | list[str]]:
+def ansible_to_packer(args: dict) -> None:
     """converts ansible types and syntax to packer types and formatting for arguments only"""
     # in this function args dict is mutable pseudo-reference and also returned
     # iterate through ansible module argument
@@ -108,5 +108,3 @@ def ansible_to_packer(args: dict) -> dict[str, str | list[str]]:
             # int to str
             case 'parallel_builds':
                 args['parallel_builds'] = str(arg_value)
-
-    return args

plugins/module_utils/terraform.py

@@ -146,7 +146,7 @@ def cmd(action: str, flags: set[str] = set(), args: dict[str, str | list[str] |
     return command
 
 
-def ansible_to_terraform(args: dict) -> dict[str, str | list[str]]:
+def ansible_to_terraform(args: dict) -> None:
     """converts ansible types and syntax to terraform types and formatting for arguments only"""
     # in this function args dict is mutable pseudo-reference and also returned
     # iterate through ansible module argument
@@ -209,5 +209,3 @@ def ansible_to_terraform(args: dict) -> dict[str, str | list[str]]:
             case 'var_file':
                 # assign converted value to var_file key
                 args['var_file'] = universal.var_files_converter(arg_value)
-
-    return args

plugins/modules/faas_deploy.py

@@ -157,7 +157,7 @@ def main() -> None:
         args.update({'label': label})
 
     # convert ansible params to faas args
-    args = faas.ansible_to_faas(args)
+    faas.ansible_to_faas(args)
 
     # determine faas command
     command: list[str] = faas.cmd(action='deploy', flags=flags, args=args)

plugins/modules/packer_build.py

@@ -152,10 +152,10 @@ def main() -> None:
     flags_args: tuple[set[str], dict] = universal.params_to_flags_args(module.params, module.argument_spec)
 
     # convert ansible params to packer args
-    args = packer.ansible_to_packer(flags_args[1])
+    packer.ansible_to_packer(flags_args[1])
 
     # determine packer command
-    command: list[str] = packer.cmd(action='build', flags=flags_args[0], args=args, target_dir=config_dir)
+    command: list[str] = packer.cmd(action='build', flags=flags_args[0], args=flags_args[1], target_dir=config_dir)
 
     # exit early for check mode
     if module.check_mode:

plugins/modules/packer_fmt.py

@@ -121,7 +121,7 @@ def main() -> None:
         changed = False
 
     # convert ansible params to packer args
-    args = packer.ansible_to_packer(args)
+    packer.ansible_to_packer(args)
 
     # determine packer command
     command: list[str] = packer.cmd(action='fmt', flags=flags, args=args, target_dir=config_dir)

plugins/modules/packer_validate.py

@@ -145,10 +145,10 @@ def main() -> None:
     flags_args: tuple[set[str], dict] = universal.params_to_flags_args(module.params, module.argument_spec)
 
     # convert ansible params to packer args
-    args = packer.ansible_to_packer(flags_args[1])
+    packer.ansible_to_packer(flags_args[1])
 
     # determine packer command
-    command: list[str] = packer.cmd(action='validate', flags=flags, args=args, target_dir=config_dir)
+    command: list[str] = packer.cmd(action='validate', flags=flags, args=flags_args[1], target_dir=config_dir)
 
     # exit early for check mode
     if module.check_mode:

plugins/modules/terraform_apply.py

@@ -149,7 +149,7 @@ def main() -> None:
             args.update({'var_file': var_file})
 
         # convert ansible params to terraform args
-        args = terraform.ansible_to_terraform(args)
+        terraform.ansible_to_terraform(args)
 
         # determine terraform command
         command: list[str] = terraform.cmd(action='apply', flags=flags, args=args, target_dir=config_dir)

plugins/modules/terraform_fmt.py

@@ -117,7 +117,7 @@ def main() -> None:
         changed = False
 
     # convert ansible params to terraform args
-    args = terraform.ansible_to_terraform(args)
+    terraform.ansible_to_terraform(args)
 
     # determine terraform command
     command: list[str] = terraform.cmd(action='fmt', flags=flags, args=args, target_dir=config_dir)

plugins/modules/terraform_import.py

@@ -113,7 +113,7 @@ def main() -> None:
     args.update({'resource': {address: id}})
 
     # convert ansible params to terraform args
-    args = terraform.ansible_to_terraform(args)
+    terraform.ansible_to_terraform(args)
 
     # determine terraform command
     command: list[str] = terraform.cmd(action='import', args=args, target_dir=config_dir)