hbacrule: Use IPAAnsibleModule class

ipaadmin_variables are handled by IPAAnsibleModule,
ansible_module.params_get is used to get the parameters and
ansible_module.ipa_connect is used to simplify the module.

plugins/modules/ipahbacrule.py

@@ -31,13 +31,9 @@ DOCUMENTATION = """
 module: ipahbacrule
 short description: Manage FreeIPA HBAC rules
 description: Manage FreeIPA HBAC rules
+extends_documentation_fragment:
+  - ipamodule_base_docs
 options:
-  ipaadmin_principal:
-    description: The admin principal
-    default: admin
-  ipaadmin_password:
-    description: The admin password
-    required: false
   name:
     description: The hbacrule name
     required: true
@@ -156,11 +152,9 @@ EXAMPLES = """
 RETURN = """
 """
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_freeipa_module import temp_kinit, \
-    temp_kdestroy, valid_creds, api_connect, api_command, compare_args_ipa, \
-    module_params_get, gen_add_del_lists, gen_add_list, \
-    gen_intersection_list, api_get_domain, ensure_fqdn
+from ansible.module_utils.ansible_freeipa_module import \
+    IPAAnsibleModule, compare_args_ipa, gen_add_del_lists, gen_add_list, \
+    gen_intersection_list, ensure_fqdn
 
 
 def find_hbacrule(module, name):
@@ -169,7 +163,7 @@ def find_hbacrule(module, name):
         "cn": name,
     }
 
-    _result = api_command(module, "hbacrule_find", name, _args)
+    _result = module.ipa_command("hbacrule_find", name, _args)
 
     if len(_result["result"]) > 1:
         module.fail_json(
@@ -198,12 +192,9 @@ def gen_args(description, usercategory, hostcategory, servicecategory,
 
 
 def main():
-    ansible_module = AnsibleModule(
+    ansible_module = IPAAnsibleModule(
         argument_spec=dict(
             # general
-            ipaadmin_principal=dict(type="str", default="admin"),
-            ipaadmin_password=dict(type="str", required=False, no_log=True),
-
             name=dict(type="list", aliases=["cn"], default=None,
                       required=True),
             # present
@@ -236,26 +227,23 @@ def main():
     # Get parameters
 
     # general
-    ipaadmin_principal = module_params_get(ansible_module,
-                                           "ipaadmin_principal")
-    ipaadmin_password = module_params_get(ansible_module, "ipaadmin_password")
-    names = module_params_get(ansible_module, "name")
+    names = ansible_module.params_get("name")
 
     # present
-    description = module_params_get(ansible_module, "description")
-    usercategory = module_params_get(ansible_module, "usercategory")
-    hostcategory = module_params_get(ansible_module, "hostcategory")
-    servicecategory = module_params_get(ansible_module, "servicecategory")
-    nomembers = module_params_get(ansible_module, "nomembers")
-    host = module_params_get(ansible_module, "host")
-    hostgroup = module_params_get(ansible_module, "hostgroup")
-    hbacsvc = module_params_get(ansible_module, "hbacsvc")
-    hbacsvcgroup = module_params_get(ansible_module, "hbacsvcgroup")
-    user = module_params_get(ansible_module, "user")
-    group = module_params_get(ansible_module, "group")
-    action = module_params_get(ansible_module, "action")
+    description = ansible_module.params_get("description")
+    usercategory = ansible_module.params_get("usercategory")
+    hostcategory = ansible_module.params_get("hostcategory")
+    servicecategory = ansible_module.params_get("servicecategory")
+    nomembers = ansible_module.params_get("nomembers")
+    host = ansible_module.params_get("host")
+    hostgroup = ansible_module.params_get("hostgroup")
+    hbacsvc = ansible_module.params_get("hbacsvc")
+    hbacsvcgroup = ansible_module.params_get("hbacsvcgroup")
+    user = ansible_module.params_get("user")
+    group = ansible_module.params_get("group")
+    action = ansible_module.params_get("action")
     # state
-    state = module_params_get(ansible_module, "state")
+    state = ansible_module.params_get("state")
 
     # Check parameters
 
@@ -318,16 +306,12 @@ def main():
 
     changed = False
     exit_args = {}
-    ccache_dir = None
-    ccache_name = None
-    try:
-        if not valid_creds(ansible_module, ipaadmin_principal):
-            ccache_dir, ccache_name = temp_kinit(ipaadmin_principal,
-                                                 ipaadmin_password)
-        api_connect()
+
+    # Connect to IPA API
+    with ansible_module.ipa_connect():
 
         # Get default domain
-        default_domain = api_get_domain()
+        default_domain = ansible_module.ipa_get_domain()
 
         # Ensure fqdn host names, use default domain for simple names
         if host is not None:
@@ -620,8 +604,7 @@ def main():
         errors = []
         for name, command, args in commands:
             try:
-                result = api_command(ansible_module, command, name,
-                                     args)
+                result = ansible_module.ipa_command(command, name, args)
                 if "completed" in result:
                     if result["completed"] > 0:
                         changed = True
@@ -642,12 +625,6 @@ def main():
         if len(errors) > 0:
             ansible_module.fail_json(msg=", ".join(errors))
 
-    except Exception as e:
-        ansible_module.fail_json(msg=str(e))
-
-    finally:
-        temp_kdestroy(ccache_dir, ccache_name)
-
     # Done
 
     ansible_module.exit_json(changed=changed, **exit_args)