Cleanup for linter

plugins/lookup/controller_object_diff.py

@@ -76,7 +76,6 @@
     name: infra.controller_configuration.projects
   vars:
     controller_projects: "{{ project_difference }}"
-
 """
 
 RETURN = """

plugins/modules/controller_export_diff.py

@@ -13,7 +13,6 @@
 
 
 DOCUMENTATION = """
----
 module: controller_export_diff
 author: "Sean Sullivan (@sean-m-sullivan)"
 short_description: Compare controller configuration resources with those defined in code.
@@ -192,7 +191,7 @@
           scm_url: https://github.com/ansible/ansible-examples.git
           description: ansible-examples
           organization:
-              name: Satellite
+            name: Satellite
           credential: gitlab-personal-access-token for satqe_auto_droid
           wait: false
     controller_host: https://controller

roles/credentials/tasks/main.yml

@@ -6,7 +6,7 @@
     copy_from:                      "{{ __controller_credentials_item.copy_from | default(omit, true) }}"
     description:                    "{{ __controller_credentials_item.description | default(('' if controller_configuration_credentials_enforce_defaults else omit), true) }}"
     organization:                   "{{ __controller_credentials_item.organization.name | default(__controller_credentials_item.organization | default(('' if controller_configuration_credentials_enforce_defaults else omit), true)) }}"
-    credential_type:                "{{ __controller_credentials_item.credential_type.name | default(__controller_credentials_item.credential_type | mandatory ) }}"
+    credential_type:                "{{ __controller_credentials_item.credential_type.name | default(__controller_credentials_item.credential_type | mandatory) }}"
     inputs:                         "{{ __controller_credentials_item.inputs | default(({} if controller_configuration_credentials_enforce_defaults else omit), true) }}"
     user:                           "{{ __controller_credentials_item.user.username | default(__controller_credentials_item.user | default(('' if controller_configuration_credentials_enforce_defaults else omit), true)) }}"
     team:                           "{{ __controller_credentials_item.team.name | default(__controller_credentials_item.team | default(('' if controller_configuration_credentials_enforce_defaults else omit), true)) }}"

roles/execution_environments/tasks/main.yml

@@ -4,11 +4,11 @@
   execution_environment:
     name:                           "{{ __execution_environments_item.name | mandatory }}"
     new_name:                       "{{ __execution_environments_item.new_name | default(omit, true) }}"
-    description:                    "{{ __execution_environments_item.description | default(( '' if controller_configuration_execution_environments_enforce_defaults else omit), true) }}"
+    description:                    "{{ __execution_environments_item.description | default(('' if controller_configuration_execution_environments_enforce_defaults else omit), true) }"
     image:                          "{{ __execution_environments_item.image | mandatory }}"
-    organization:                   "{{ __execution_environments_item.organization.name | default(__execution_environments_item.organization | default(( '' if controller_configuration_execution_environments_enforce_defaults else omit), true)) }}"
-    credential:                     "{{ __execution_environments_item.credential | default(( '' if controller_configuration_execution_environments_enforce_defaults else omit), true) }}"
-    pull:                           "{{ __execution_environments_item.pull | default(( 'missing' if controller_configuration_execution_environments_enforce_defaults else omit), true) }}"
+    organization:                   "{{ __execution_environments_item.organization.name | default(__execution_environments_item.organization | default(('' if controller_configuration_execution_environments_enforce_defaults else omit), true)) }}"
+    credential:                     "{{ __execution_environments_item.credential | default(('' if controller_configuration_execution_environments_enforce_defaults else omit), true) }}"
+    pull:                           "{{ __execution_environments_item.pull | default(('missing' if controller_configuration_execution_environments_enforce_defaults else omit), true) }}"
     state:                          "{{ __execution_environments_item.state | default(controller_state | default('present')) }}"
 
     # Role specific options

roles/groups/tasks/main.yml

@@ -5,13 +5,13 @@
   group:
     name:                           "{{ controller_groups_item.name | mandatory }}"
     new_name:                       "{{ controller_groups_item.new_name | default(omit, true) }}"
-    description:                    "{{ controller_groups_item.description | default(( '' if controller_configuration_groups_enforce_defaults else omit), true) }}"
+    description:                    "{{ controller_groups_item.description | default(('' if controller_configuration_groups_enforce_defaults else omit), true) }}"
     inventory:                      "{{ controller_groups_item.inventory | mandatory }}"
     variables:                      "{{ controller_groups_item.variables | default(( {} if controller_configuration_groups_enforce_defaults else omit), true) | regex_replace('[ ]{2,}', '') }}"
-    hosts:                          "{{ controller_groups_item.hosts | default(( [] if controller_configuration_groups_enforce_defaults else omit), true) }}"
-    children:                       "{{ controller_groups_item.children | default(( [] if controller_configuration_groups_enforce_defaults else omit), true) }}"
-    preserve_existing_hosts:        "{{ controller_groups_item.preserve_existing_hosts | default(( false if controller_configuration_groups_enforce_defaults else omit)) }}"
-    preserve_existing_children:     "{{ controller_groups_item.preserve_existing_children | default(( false if controller_configuration_groups_enforce_defaults else omit)) }}"
+    hosts:                          "{{ controller_groups_item.hosts | default(([] if controller_configuration_groups_enforce_defaults else omit), true) }}"
+    children:                       "{{ controller_groups_item.children | default(([] if controller_configuration_groups_enforce_defaults else omit), true) }}"
+    preserve_existing_hosts:        "{{ controller_groups_item.preserve_existing_hosts | default((false if controller_configuration_groups_enforce_defaults else omit)) }}"
+    preserve_existing_children:     "{{ controller_groups_item.preserve_existing_children | default((false if controller_configuration_groups_enforce_defaults else omit)) }}"
     state:                          "{{ controller_groups_item.state | default(controller_state | default('present')) }}"
 
     # Role Standard Options