From 4a85983eb7d71026ac6beddda4c7da629d673480 Mon Sep 17 00:00:00 2001 From: Alan Rominger Date: Mon, 21 Jun 2021 10:01:52 -0400 Subject: [PATCH] Symlink modules for 2.9 compat (#5103) * Symlink modules for 2.9 compat * Avoid symlinks in completeness tests --- awx_collection/plugins/modules/tower_ad_hoc_command.py | 1 + .../plugins/modules/tower_ad_hoc_command_cancel.py | 1 + awx_collection/plugins/modules/tower_ad_hoc_command_wait.py | 1 + awx_collection/plugins/modules/tower_application.py | 1 + awx_collection/plugins/modules/tower_controller_meta.py | 1 + awx_collection/plugins/modules/tower_credential.py | 1 + .../plugins/modules/tower_credential_input_source.py | 1 + awx_collection/plugins/modules/tower_credential_type.py | 1 + .../plugins/modules/tower_execution_environment.py | 1 + awx_collection/plugins/modules/tower_export.py | 1 + awx_collection/plugins/modules/tower_group.py | 1 + awx_collection/plugins/modules/tower_host.py | 1 + awx_collection/plugins/modules/tower_import.py | 1 + awx_collection/plugins/modules/tower_instance_group.py | 1 + awx_collection/plugins/modules/tower_inventory.py | 1 + awx_collection/plugins/modules/tower_inventory_source.py | 1 + .../plugins/modules/tower_inventory_source_update.py | 1 + awx_collection/plugins/modules/tower_job_cancel.py | 1 + awx_collection/plugins/modules/tower_job_launch.py | 1 + awx_collection/plugins/modules/tower_job_list.py | 1 + awx_collection/plugins/modules/tower_job_template.py | 1 + awx_collection/plugins/modules/tower_job_wait.py | 1 + awx_collection/plugins/modules/tower_label.py | 1 + awx_collection/plugins/modules/tower_license.py | 1 + .../plugins/modules/tower_notification_template.py | 1 + awx_collection/plugins/modules/tower_organization.py | 1 + awx_collection/plugins/modules/tower_project.py | 1 + awx_collection/plugins/modules/tower_project_update.py | 1 + awx_collection/plugins/modules/tower_role.py | 1 + awx_collection/plugins/modules/tower_schedule.py | 1 + awx_collection/plugins/modules/tower_settings.py | 1 + awx_collection/plugins/modules/tower_team.py | 1 + awx_collection/plugins/modules/tower_token.py | 1 + awx_collection/plugins/modules/tower_user.py | 1 + awx_collection/plugins/modules/tower_workflow_approval.py | 1 + .../plugins/modules/tower_workflow_job_template.py | 1 + .../plugins/modules/tower_workflow_job_template_node.py | 1 + awx_collection/plugins/modules/tower_workflow_launch.py | 1 + awx_collection/plugins/modules/tower_workflow_node_wait.py | 1 + awx_collection/test/awx/test_completeness.py | 5 +++-- 40 files changed, 42 insertions(+), 2 deletions(-) create mode 120000 awx_collection/plugins/modules/tower_ad_hoc_command.py create mode 120000 awx_collection/plugins/modules/tower_ad_hoc_command_cancel.py create mode 120000 awx_collection/plugins/modules/tower_ad_hoc_command_wait.py create mode 120000 awx_collection/plugins/modules/tower_application.py create mode 120000 awx_collection/plugins/modules/tower_controller_meta.py create mode 120000 awx_collection/plugins/modules/tower_credential.py create mode 120000 awx_collection/plugins/modules/tower_credential_input_source.py create mode 120000 awx_collection/plugins/modules/tower_credential_type.py create mode 120000 awx_collection/plugins/modules/tower_execution_environment.py create mode 120000 awx_collection/plugins/modules/tower_export.py create mode 120000 awx_collection/plugins/modules/tower_group.py create mode 120000 awx_collection/plugins/modules/tower_host.py create mode 120000 awx_collection/plugins/modules/tower_import.py create mode 120000 awx_collection/plugins/modules/tower_instance_group.py create mode 120000 awx_collection/plugins/modules/tower_inventory.py create mode 120000 awx_collection/plugins/modules/tower_inventory_source.py create mode 120000 awx_collection/plugins/modules/tower_inventory_source_update.py create mode 120000 awx_collection/plugins/modules/tower_job_cancel.py create mode 120000 awx_collection/plugins/modules/tower_job_launch.py create mode 120000 awx_collection/plugins/modules/tower_job_list.py create mode 120000 awx_collection/plugins/modules/tower_job_template.py create mode 120000 awx_collection/plugins/modules/tower_job_wait.py create mode 120000 awx_collection/plugins/modules/tower_label.py create mode 120000 awx_collection/plugins/modules/tower_license.py create mode 120000 awx_collection/plugins/modules/tower_notification_template.py create mode 120000 awx_collection/plugins/modules/tower_organization.py create mode 120000 awx_collection/plugins/modules/tower_project.py create mode 120000 awx_collection/plugins/modules/tower_project_update.py create mode 120000 awx_collection/plugins/modules/tower_role.py create mode 120000 awx_collection/plugins/modules/tower_schedule.py create mode 120000 awx_collection/plugins/modules/tower_settings.py create mode 120000 awx_collection/plugins/modules/tower_team.py create mode 120000 awx_collection/plugins/modules/tower_token.py create mode 120000 awx_collection/plugins/modules/tower_user.py create mode 120000 awx_collection/plugins/modules/tower_workflow_approval.py create mode 120000 awx_collection/plugins/modules/tower_workflow_job_template.py create mode 120000 awx_collection/plugins/modules/tower_workflow_job_template_node.py create mode 120000 awx_collection/plugins/modules/tower_workflow_launch.py create mode 120000 awx_collection/plugins/modules/tower_workflow_node_wait.py diff --git a/awx_collection/plugins/modules/tower_ad_hoc_command.py b/awx_collection/plugins/modules/tower_ad_hoc_command.py new file mode 120000 index 0000000000..1b02428042 --- /dev/null +++ b/awx_collection/plugins/modules/tower_ad_hoc_command.py @@ -0,0 +1 @@ +ad_hoc_command.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_ad_hoc_command_cancel.py b/awx_collection/plugins/modules/tower_ad_hoc_command_cancel.py new file mode 120000 index 0000000000..1d9c64563b --- /dev/null +++ b/awx_collection/plugins/modules/tower_ad_hoc_command_cancel.py @@ -0,0 +1 @@ +ad_hoc_command_cancel.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_ad_hoc_command_wait.py b/awx_collection/plugins/modules/tower_ad_hoc_command_wait.py new file mode 120000 index 0000000000..50cc9f6eab --- /dev/null +++ b/awx_collection/plugins/modules/tower_ad_hoc_command_wait.py @@ -0,0 +1 @@ +ad_hoc_command_wait.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_application.py b/awx_collection/plugins/modules/tower_application.py new file mode 120000 index 0000000000..cc28a46af5 --- /dev/null +++ b/awx_collection/plugins/modules/tower_application.py @@ -0,0 +1 @@ +application.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_controller_meta.py b/awx_collection/plugins/modules/tower_controller_meta.py new file mode 120000 index 0000000000..603f9fa251 --- /dev/null +++ b/awx_collection/plugins/modules/tower_controller_meta.py @@ -0,0 +1 @@ +controller_meta.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_credential.py b/awx_collection/plugins/modules/tower_credential.py new file mode 120000 index 0000000000..76fc468892 --- /dev/null +++ b/awx_collection/plugins/modules/tower_credential.py @@ -0,0 +1 @@ +credential.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_credential_input_source.py b/awx_collection/plugins/modules/tower_credential_input_source.py new file mode 120000 index 0000000000..b6824f7983 --- /dev/null +++ b/awx_collection/plugins/modules/tower_credential_input_source.py @@ -0,0 +1 @@ +credential_input_source.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_credential_type.py b/awx_collection/plugins/modules/tower_credential_type.py new file mode 120000 index 0000000000..3ef2c5aaa1 --- /dev/null +++ b/awx_collection/plugins/modules/tower_credential_type.py @@ -0,0 +1 @@ +credential_type.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_execution_environment.py b/awx_collection/plugins/modules/tower_execution_environment.py new file mode 120000 index 0000000000..0436ddac1d --- /dev/null +++ b/awx_collection/plugins/modules/tower_execution_environment.py @@ -0,0 +1 @@ +execution_environment.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_export.py b/awx_collection/plugins/modules/tower_export.py new file mode 120000 index 0000000000..b9ead459dc --- /dev/null +++ b/awx_collection/plugins/modules/tower_export.py @@ -0,0 +1 @@ +export.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_group.py b/awx_collection/plugins/modules/tower_group.py new file mode 120000 index 0000000000..0d50916a64 --- /dev/null +++ b/awx_collection/plugins/modules/tower_group.py @@ -0,0 +1 @@ +group.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_host.py b/awx_collection/plugins/modules/tower_host.py new file mode 120000 index 0000000000..36a0bc2c59 --- /dev/null +++ b/awx_collection/plugins/modules/tower_host.py @@ -0,0 +1 @@ +host.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_import.py b/awx_collection/plugins/modules/tower_import.py new file mode 120000 index 0000000000..b0354fac74 --- /dev/null +++ b/awx_collection/plugins/modules/tower_import.py @@ -0,0 +1 @@ +import.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_instance_group.py b/awx_collection/plugins/modules/tower_instance_group.py new file mode 120000 index 0000000000..f7f770d778 --- /dev/null +++ b/awx_collection/plugins/modules/tower_instance_group.py @@ -0,0 +1 @@ +instance_group.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_inventory.py b/awx_collection/plugins/modules/tower_inventory.py new file mode 120000 index 0000000000..f3f0a4990c --- /dev/null +++ b/awx_collection/plugins/modules/tower_inventory.py @@ -0,0 +1 @@ +inventory.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_inventory_source.py b/awx_collection/plugins/modules/tower_inventory_source.py new file mode 120000 index 0000000000..462d6066fd --- /dev/null +++ b/awx_collection/plugins/modules/tower_inventory_source.py @@ -0,0 +1 @@ +inventory_source.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_inventory_source_update.py b/awx_collection/plugins/modules/tower_inventory_source_update.py new file mode 120000 index 0000000000..a283dfccb1 --- /dev/null +++ b/awx_collection/plugins/modules/tower_inventory_source_update.py @@ -0,0 +1 @@ +inventory_source_update.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_job_cancel.py b/awx_collection/plugins/modules/tower_job_cancel.py new file mode 120000 index 0000000000..6298f026cb --- /dev/null +++ b/awx_collection/plugins/modules/tower_job_cancel.py @@ -0,0 +1 @@ +job_cancel.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_job_launch.py b/awx_collection/plugins/modules/tower_job_launch.py new file mode 120000 index 0000000000..dbcb7048bc --- /dev/null +++ b/awx_collection/plugins/modules/tower_job_launch.py @@ -0,0 +1 @@ +job_launch.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_job_list.py b/awx_collection/plugins/modules/tower_job_list.py new file mode 120000 index 0000000000..45e0ea6fe4 --- /dev/null +++ b/awx_collection/plugins/modules/tower_job_list.py @@ -0,0 +1 @@ +job_list.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_job_template.py b/awx_collection/plugins/modules/tower_job_template.py new file mode 120000 index 0000000000..4561927af7 --- /dev/null +++ b/awx_collection/plugins/modules/tower_job_template.py @@ -0,0 +1 @@ +job_template.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_job_wait.py b/awx_collection/plugins/modules/tower_job_wait.py new file mode 120000 index 0000000000..488cb4683d --- /dev/null +++ b/awx_collection/plugins/modules/tower_job_wait.py @@ -0,0 +1 @@ +job_wait.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_label.py b/awx_collection/plugins/modules/tower_label.py new file mode 120000 index 0000000000..593aec76b8 --- /dev/null +++ b/awx_collection/plugins/modules/tower_label.py @@ -0,0 +1 @@ +label.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_license.py b/awx_collection/plugins/modules/tower_license.py new file mode 120000 index 0000000000..467811cd59 --- /dev/null +++ b/awx_collection/plugins/modules/tower_license.py @@ -0,0 +1 @@ +license.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_notification_template.py b/awx_collection/plugins/modules/tower_notification_template.py new file mode 120000 index 0000000000..f24d407167 --- /dev/null +++ b/awx_collection/plugins/modules/tower_notification_template.py @@ -0,0 +1 @@ +notification_template.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_organization.py b/awx_collection/plugins/modules/tower_organization.py new file mode 120000 index 0000000000..2da5304b4a --- /dev/null +++ b/awx_collection/plugins/modules/tower_organization.py @@ -0,0 +1 @@ +organization.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_project.py b/awx_collection/plugins/modules/tower_project.py new file mode 120000 index 0000000000..41d1fa306a --- /dev/null +++ b/awx_collection/plugins/modules/tower_project.py @@ -0,0 +1 @@ +project.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_project_update.py b/awx_collection/plugins/modules/tower_project_update.py new file mode 120000 index 0000000000..6f22e2a4b1 --- /dev/null +++ b/awx_collection/plugins/modules/tower_project_update.py @@ -0,0 +1 @@ +project_update.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_role.py b/awx_collection/plugins/modules/tower_role.py new file mode 120000 index 0000000000..0a520b759b --- /dev/null +++ b/awx_collection/plugins/modules/tower_role.py @@ -0,0 +1 @@ +role.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_schedule.py b/awx_collection/plugins/modules/tower_schedule.py new file mode 120000 index 0000000000..a21a88885c --- /dev/null +++ b/awx_collection/plugins/modules/tower_schedule.py @@ -0,0 +1 @@ +schedule.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_settings.py b/awx_collection/plugins/modules/tower_settings.py new file mode 120000 index 0000000000..fff7c2ed4a --- /dev/null +++ b/awx_collection/plugins/modules/tower_settings.py @@ -0,0 +1 @@ +settings.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_team.py b/awx_collection/plugins/modules/tower_team.py new file mode 120000 index 0000000000..320689b4cd --- /dev/null +++ b/awx_collection/plugins/modules/tower_team.py @@ -0,0 +1 @@ +team.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_token.py b/awx_collection/plugins/modules/tower_token.py new file mode 120000 index 0000000000..0c41c0d586 --- /dev/null +++ b/awx_collection/plugins/modules/tower_token.py @@ -0,0 +1 @@ +token.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_user.py b/awx_collection/plugins/modules/tower_user.py new file mode 120000 index 0000000000..576f943a25 --- /dev/null +++ b/awx_collection/plugins/modules/tower_user.py @@ -0,0 +1 @@ +user.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_workflow_approval.py b/awx_collection/plugins/modules/tower_workflow_approval.py new file mode 120000 index 0000000000..76ba8f3be2 --- /dev/null +++ b/awx_collection/plugins/modules/tower_workflow_approval.py @@ -0,0 +1 @@ +workflow_approval.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_workflow_job_template.py b/awx_collection/plugins/modules/tower_workflow_job_template.py new file mode 120000 index 0000000000..914891e32a --- /dev/null +++ b/awx_collection/plugins/modules/tower_workflow_job_template.py @@ -0,0 +1 @@ +workflow_job_template.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_workflow_job_template_node.py b/awx_collection/plugins/modules/tower_workflow_job_template_node.py new file mode 120000 index 0000000000..406b3cec5b --- /dev/null +++ b/awx_collection/plugins/modules/tower_workflow_job_template_node.py @@ -0,0 +1 @@ +workflow_job_template_node.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_workflow_launch.py b/awx_collection/plugins/modules/tower_workflow_launch.py new file mode 120000 index 0000000000..d0a93529d8 --- /dev/null +++ b/awx_collection/plugins/modules/tower_workflow_launch.py @@ -0,0 +1 @@ +workflow_launch.py \ No newline at end of file diff --git a/awx_collection/plugins/modules/tower_workflow_node_wait.py b/awx_collection/plugins/modules/tower_workflow_node_wait.py new file mode 120000 index 0000000000..25bf1d0a87 --- /dev/null +++ b/awx_collection/plugins/modules/tower_workflow_node_wait.py @@ -0,0 +1 @@ +workflow_node_wait.py \ No newline at end of file diff --git a/awx_collection/test/awx/test_completeness.py b/awx_collection/test/awx/test_completeness.py index cb82255ea2..348dc4bae6 100644 --- a/awx_collection/test/awx/test_completeness.py +++ b/awx_collection/test/awx/test_completeness.py @@ -2,9 +2,8 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import pytest from awx.main.tests.functional.conftest import _request -from ansible.module_utils.six import PY2, string_types +from ansible.module_utils.six import string_types import yaml import os import re @@ -169,6 +168,8 @@ def test_completeness(collection_import, request, admin_user, job_template, exec for root, dirs, files in os.walk(module_directory): if root == module_directory: for filename in files: + if os.path.islink(os.path.join(root, filename)): + continue # must begin with a letter a-z, and end in .py if re.match(r'^[a-z].*.py$', filename): module_name = filename[:-3]