7.0.0

library/decort_bservice.py

@@ -13,8 +13,9 @@ from ansible.module_utils.decort_utils import *
 
 
 class decort_bservice(DecortController):
-    def __init__(self,arg_amodule):
-        super(decort_bservice, self).__init__(arg_amodule)
+    def __init__(self):
+        super(decort_bservice, self).__init__(AnsibleModule(**self.amodule_init_args))
+        arg_amodule = self.amodule
 
         validated_acc_id = 0
         validated_rg_id = 0
@@ -147,70 +148,66 @@ class decort_bservice(DecortController):
         ret_dict['account_id'] = self.bservice_info['accountId']
         ret_dict['groups'] = self.bservice_info['groups']
         return ret_dict
-    @staticmethod
-    def build_parameters():
-        return dict(
-            account_id=dict(type='int', required=False),
-            account_name=dict(type='str', required=False, default=''),
-            app_id=dict(type='str',
-                        required=False,
-                        fallback=(env_fallback, ['DECORT_APP_ID'])),
-            app_secret=dict(type='str',
-                            required=False,
-                            fallback=(env_fallback, ['DECORT_APP_SECRET']),
-                            no_log=True),
-            authenticator=dict(type='str',
-                            required=True,
-                            choices=['legacy', 'oauth2', 'jwt']),
-            controller_url=dict(type='str', required=True),
-            jwt=dict(type='str',
-                    required=False,
-                    fallback=(env_fallback, ['DECORT_JWT']),
-                    no_log=True),
-            oauth2_url=dict(type='str',
-                            required=False,
-                            fallback=(env_fallback, ['DECORT_OAUTH2_URL'])),
-            password=dict(type='str',
-                        required=False,
-                        fallback=(env_fallback, ['DECORT_PASSWORD']),
-                        no_log=True),
-            state=dict(type='str',
+
+    @property
+    def amodule_init_args(self) -> dict:
+        return self.pack_amodule_init_args(
+            argument_spec=dict(
+                account_id=dict(
+                    type='int',
+                ),
+                account_name=dict(
+                    type='str',
+                    default='',
+                ),
+                state=dict(
+                    type='str',
                     default='present',
-                    choices=['absent', 'disabled', 'enabled', 'present','check']),
-            started=dict(type='bool', required=False, default=True),
-            user=dict(type='str',
-                    required=False,
-                    fallback=(env_fallback, ['DECORT_USER'])),
-            name=dict(type='str', required=False, default=''),
-            sshuser=dict(type='str', required=False,default=None),
-            sshkey=dict(type='str', required=False,default=None),
-            id=dict(type='int', required=False, default=0),
-            rg_id=dict(type='int', default=0),
-            rg_name=dict(type='str',default=""),
-            verify_ssl=dict(type='bool', required=False, default=True),
-            workflow_callback=dict(type='str', required=False),
-            workflow_context=dict(type='str', required=False),)
+                    choices=[
+                        'absent',
+                        'disabled',
+                        'enabled',
+                        'present',
+                        'check',
+                    ],
+                ),
+                started=dict(
+                    type='bool',
+                    default=True,
+                ),
+                name=dict(
+                    type='str',
+                    default='',
+                ),
+                sshuser=dict(
+                    type='str',
+                ),
+                sshkey=dict(
+                    type='str',
+                ),
+                id=dict(
+                    type='int',
+                    default=0,
+                ),
+                rg_id=dict(
+                    type='int',
+                    default=0,
+                ),
+                rg_name=dict(
+                    type='str',
+                    default='',
+                ),
+            ),
+            supports_check_mode=True,
+            required_one_of=[
+                ('id', 'name'),
+                ('rg_id', 'rg_name'),
+            ],
+        )
+
 def main():
-    module_parameters = decort_bservice.build_parameters()
-
-    amodule = AnsibleModule(argument_spec=module_parameters,
-                            supports_check_mode=True,
-                            mutually_exclusive=[
-                                ['oauth2', 'password'],
-                                ['password', 'jwt'],
-                                ['jwt', 'oauth2'],
-                            ],
-                            required_together=[
-                                ['app_id', 'app_secret'],
-                                ['user', 'password'],
-                            ],
-                            required_one_of=[
-                                ['id', 'name'],
-                                ['rg_id','rg_name']
-                            ],
-                            )
-
-    subj = decort_bservice(amodule)
+    subj = decort_bservice()
+    amodule = subj.amodule
     
     if amodule.params['state'] == 'check':
         subj.result['changed'] = False