From 169195178892851210c57fa924eeb2c4f74cdccd Mon Sep 17 00:00:00 2001 From: Mike Graves Date: Thu, 22 Sep 2022 09:38:20 -0400 Subject: [PATCH] Update for Ansible 2.15 sanity tests (#173) --- .../module_utils/openshift_adm_prune_auth.py | 2 + .../openshift_adm_prune_deployments.py | 2 + .../openshift_adm_prune_images.py | 2 + plugins/module_utils/openshift_builds.py | 2 + plugins/module_utils/openshift_groups.py | 6 +- .../module_utils/openshift_import_image.py | 2 + plugins/module_utils/openshift_ldap.py | 2 +- plugins/module_utils/openshift_process.py | 2 + plugins/module_utils/openshift_registry.py | 3 + ...penshift_adm_migrate_template_instances.py | 2 + plugins/modules/openshift_route.py | 4 +- tests/sanity/ignore-2.15.txt | 103 ++++++++++++++++++ 12 files changed, 128 insertions(+), 4 deletions(-) create mode 100644 tests/sanity/ignore-2.15.txt diff --git a/plugins/module_utils/openshift_adm_prune_auth.py b/plugins/module_utils/openshift_adm_prune_auth.py index e7ef3fd..584a2cb 100644 --- a/plugins/module_utils/openshift_adm_prune_auth.py +++ b/plugins/module_utils/openshift_adm_prune_auth.py @@ -13,6 +13,8 @@ try: get_api_client, ) HAS_KUBERNETES_COLLECTION = True + k8s_collection_import_exception = None + K8S_COLLECTION_ERROR = None except ImportError as e: HAS_KUBERNETES_COLLECTION = False k8s_collection_import_exception = e diff --git a/plugins/module_utils/openshift_adm_prune_deployments.py b/plugins/module_utils/openshift_adm_prune_deployments.py index 8e2cfda..e127985 100644 --- a/plugins/module_utils/openshift_adm_prune_deployments.py +++ b/plugins/module_utils/openshift_adm_prune_deployments.py @@ -14,6 +14,8 @@ try: get_api_client, ) HAS_KUBERNETES_COLLECTION = True + k8s_collection_import_exception = None + K8S_COLLECTION_ERROR = None except ImportError as e: HAS_KUBERNETES_COLLECTION = False k8s_collection_import_exception = e diff --git a/plugins/module_utils/openshift_adm_prune_images.py b/plugins/module_utils/openshift_adm_prune_images.py index 41ac745..f280486 100644 --- a/plugins/module_utils/openshift_adm_prune_images.py +++ b/plugins/module_utils/openshift_adm_prune_images.py @@ -17,6 +17,8 @@ try: get_api_client, ) HAS_KUBERNETES_COLLECTION = True + k8s_collection_import_exception = None + K8S_COLLECTION_ERROR = None except ImportError as e: HAS_KUBERNETES_COLLECTION = False k8s_collection_import_exception = e diff --git a/plugins/module_utils/openshift_builds.py b/plugins/module_utils/openshift_builds.py index cac05ee..741d3c0 100644 --- a/plugins/module_utils/openshift_builds.py +++ b/plugins/module_utils/openshift_builds.py @@ -15,6 +15,8 @@ try: get_api_client, ) HAS_KUBERNETES_COLLECTION = True + k8s_collection_import_exception = None + K8S_COLLECTION_ERROR = None except ImportError as e: HAS_KUBERNETES_COLLECTION = False k8s_collection_import_exception = e diff --git a/plugins/module_utils/openshift_groups.py b/plugins/module_utils/openshift_groups.py index 203651b..2840258 100644 --- a/plugins/module_utils/openshift_groups.py +++ b/plugins/module_utils/openshift_groups.py @@ -26,6 +26,7 @@ from ansible_collections.community.okd.plugins.module_utils.openshift_ldap impor try: import ldap HAS_PYTHON_LDAP = True + PYTHON_LDAP_ERROR = None except ImportError as e: HAS_PYTHON_LDAP = False PYTHON_LDAP_ERROR = e @@ -36,6 +37,8 @@ try: get_api_client, ) HAS_KUBERNETES_COLLECTION = True + k8s_collection_import_exception = None + K8S_COLLECTION_ERROR = None except ImportError as e: HAS_KUBERNETES_COLLECTION = False k8s_collection_import_exception = e @@ -225,12 +228,11 @@ class OpenshiftLDAPGroups(object): name = definition["metadata"]["name"] existing = self.get_group_info(name=name) if not self.module.check_mode: + method = "patch" if existing else "create" try: if existing: - method = 'patch' definition = self.k8s_group_api.patch(definition).to_dict() else: - method = 'create' definition = self.k8s_group_api.create(definition).to_dict() except DynamicApiError as exc: self.module.fail_json(msg="Failed to %s Group '%s' due to: %s" % (method, name, exc.body)) diff --git a/plugins/module_utils/openshift_import_image.py b/plugins/module_utils/openshift_import_image.py index ff079ad..9256fe2 100644 --- a/plugins/module_utils/openshift_import_image.py +++ b/plugins/module_utils/openshift_import_image.py @@ -16,6 +16,8 @@ try: get_api_client, ) HAS_KUBERNETES_COLLECTION = True + k8s_collection_import_exception = None + K8S_COLLECTION_ERROR = None except ImportError as e: HAS_KUBERNETES_COLLECTION = False k8s_collection_import_exception = e diff --git a/plugins/module_utils/openshift_ldap.py b/plugins/module_utils/openshift_ldap.py index 22be2ec..bb9229a 100644 --- a/plugins/module_utils/openshift_ldap.py +++ b/plugins/module_utils/openshift_ldap.py @@ -56,7 +56,7 @@ def validate_ldap_sync_config(config): schemas.append(schema) if len(schemas) == 0: - return "No schema-specific config was provided, should be one of %s" % schema_list + return "No schema-specific config was provided, should be one of %s" % ", ".join(schema_list) if len(schemas) > 1: return "Exactly one schema-specific config is required; found (%d) %s" % (len(schemas), ','.join(schemas)) diff --git a/plugins/module_utils/openshift_process.py b/plugins/module_utils/openshift_process.py index a1e7572..8e675d5 100644 --- a/plugins/module_utils/openshift_process.py +++ b/plugins/module_utils/openshift_process.py @@ -16,6 +16,8 @@ from ansible.module_utils._text import to_native try: from kubernetes.dynamic.exceptions import DynamicApiError, NotFoundError HAS_KUBERNETES_COLLECTION = True + k8s_collection_import_exception = None + K8S_COLLECTION_ERROR = None except ImportError as e: HAS_KUBERNETES_COLLECTION = False k8s_collection_import_exception = e diff --git a/plugins/module_utils/openshift_registry.py b/plugins/module_utils/openshift_registry.py index 315273d..caa3137 100644 --- a/plugins/module_utils/openshift_registry.py +++ b/plugins/module_utils/openshift_registry.py @@ -14,6 +14,8 @@ try: get_api_client, ) HAS_KUBERNETES_COLLECTION = True + k8s_collection_import_exception = None + K8S_COLLECTION_ERROR = None except ImportError as e: HAS_KUBERNETES_COLLECTION = False k8s_collection_import_exception = e @@ -27,6 +29,7 @@ try: from requests import request from requests.auth import HTTPBasicAuth HAS_REQUESTS_MODULE = True + requests_import_exception = None except ImportError as e: HAS_REQUESTS_MODULE = False requests_import_exception = e diff --git a/plugins/modules/openshift_adm_migrate_template_instances.py b/plugins/modules/openshift_adm_migrate_template_instances.py index 2576577..195db5e 100644 --- a/plugins/modules/openshift_adm_migrate_template_instances.py +++ b/plugins/modules/openshift_adm_migrate_template_instances.py @@ -241,6 +241,8 @@ try: from kubernetes.dynamic.exceptions import DynamicApiError HAS_KUBERNETES_COLLECTION = True + k8s_collection_import_exception = None + K8S_COLLECTION_ERROR = None except ImportError as e: HAS_KUBERNETES_COLLECTION = False k8s_collection_import_exception = e diff --git a/plugins/modules/openshift_route.py b/plugins/modules/openshift_route.py index 984c1c2..6201c73 100644 --- a/plugins/modules/openshift_route.py +++ b/plugins/modules/openshift_route.py @@ -321,6 +321,8 @@ try: AUTH_ARG_SPEC, WAIT_ARG_SPEC, COMMON_ARG_SPEC ) HAS_KUBERNETES_COLLECTION = True + k8s_collection_import_exception = None + K8S_COLLECTION_ERROR = None except ImportError as e: HAS_KUBERNETES_COLLECTION = False k8s_collection_import_exception = e @@ -542,7 +544,7 @@ class OpenShiftRoute(K8sAnsibleMixin): def wait_predicate(route): - if not(route.status and route.status.ingress): + if not (route.status and route.status.ingress): return False for ingress in route.status.ingress: match = [x for x in ingress.conditions if x.type == 'Admitted'] diff --git a/tests/sanity/ignore-2.15.txt b/tests/sanity/ignore-2.15.txt new file mode 100644 index 0000000..a54a41f --- /dev/null +++ b/tests/sanity/ignore-2.15.txt @@ -0,0 +1,103 @@ +plugins/modules/k8s.py validate-modules:parameter-type-not-in-doc +plugins/modules/k8s.py validate-modules:return-syntax-error +plugins/modules/openshift_process.py validate-modules:parameter-type-not-in-doc +plugins/modules/openshift_route.py import-2.7!skip +plugins/modules/openshift_route.py import-3.5!skip +plugins/modules/openshift_route.py compile-2.7!skip +plugins/modules/openshift_route.py compile-3.5!skip +plugins/modules/k8s.py import-2.7!skip +plugins/modules/k8s.py import-3.5!skip +plugins/modules/k8s.py compile-2.7!skip +plugins/modules/k8s.py compile-3.5!skip +plugins/modules/openshift_process.py import-2.7!skip +plugins/modules/openshift_process.py import-3.5!skip +plugins/modules/openshift_process.py compile-2.7!skip +plugins/modules/openshift_process.py compile-3.5!skip +plugins/modules/openshift_adm_groups_sync.py import-2.7!skip +plugins/modules/openshift_adm_groups_sync.py import-3.5!skip +plugins/modules/openshift_adm_groups_sync.py compile-2.7!skip +plugins/modules/openshift_adm_groups_sync.py compile-3.5!skip +plugins/modules/openshift_adm_migrate_template_instances.py import-2.7!skip +plugins/modules/openshift_adm_migrate_template_instances.py import-3.5!skip +plugins/modules/openshift_adm_migrate_template_instances.py compile-2.7!skip +plugins/modules/openshift_adm_migrate_template_instances.py compile-3.5!skip +plugins/modules/openshift_adm_prune_auth.py import-2.7!skip +plugins/modules/openshift_adm_prune_auth.py import-3.5!skip +plugins/modules/openshift_adm_prune_auth.py compile-2.7!skip +plugins/modules/openshift_adm_prune_auth.py compile-3.5!skip +plugins/modules/openshift_adm_prune_deployments.py import-2.7!skip +plugins/modules/openshift_adm_prune_deployments.py import-3.5!skip +plugins/modules/openshift_adm_prune_deployments.py compile-2.7!skip +plugins/modules/openshift_adm_prune_deployments.py compile-3.5!skip +plugins/modules/openshift_adm_prune_images.py import-2.7!skip +plugins/modules/openshift_adm_prune_images.py import-3.5!skip +plugins/modules/openshift_adm_prune_images.py compile-2.7!skip +plugins/modules/openshift_adm_prune_images.py compile-3.5!skip +plugins/modules/openshift_auth.py import-2.7!skip +plugins/modules/openshift_auth.py import-3.5!skip +plugins/modules/openshift_auth.py compile-2.7!skip +plugins/modules/openshift_auth.py compile-3.5!skip +plugins/modules/openshift_import_image.py import-2.7!skip +plugins/modules/openshift_import_image.py import-3.5!skip +plugins/modules/openshift_import_image.py compile-2.7!skip +plugins/modules/openshift_import_image.py compile-3.5!skip +plugins/modules/openshift_registry_info.py import-2.7!skip +plugins/modules/openshift_registry_info.py import-3.5!skip +plugins/modules/openshift_registry_info.py compile-2.7!skip +plugins/modules/openshift_registry_info.py compile-3.5!skip +plugins/module_utils/k8s.py import-2.7!skip +plugins/module_utils/k8s.py import-3.5!skip +plugins/module_utils/k8s.py compile-2.7!skip +plugins/module_utils/k8s.py compile-3.5!skip +plugins/module_utils/openshift_process.py import-2.7!skip +plugins/module_utils/openshift_process.py import-3.5!skip +plugins/module_utils/openshift_process.py compile-2.7!skip +plugins/module_utils/openshift_process.py compile-3.5!skip +plugins/module_utils/openshift_adm_prune_auth.py import-2.7!skip +plugins/module_utils/openshift_adm_prune_auth.py import-3.5!skip +plugins/module_utils/openshift_adm_prune_auth.py compile-2.7!skip +plugins/module_utils/openshift_adm_prune_auth.py compile-3.5!skip +plugins/module_utils/openshift_adm_prune_deployments.py import-2.7!skip +plugins/module_utils/openshift_adm_prune_deployments.py import-3.5!skip +plugins/module_utils/openshift_adm_prune_deployments.py compile-2.7!skip +plugins/module_utils/openshift_adm_prune_deployments.py compile-3.5!skip +plugins/module_utils/openshift_ldap.py import-2.7!skip +plugins/module_utils/openshift_ldap.py import-3.5!skip +plugins/module_utils/openshift_ldap.py compile-2.7!skip +plugins/module_utils/openshift_ldap.py compile-3.5!skip +plugins/module_utils/openshift_adm_prune_images.py import-2.7!skip +plugins/module_utils/openshift_adm_prune_images.py import-3.5!skip +plugins/module_utils/openshift_adm_prune_images.py compile-2.7!skip +plugins/module_utils/openshift_adm_prune_images.py compile-3.5!skip +plugins/module_utils/openshift_docker_image.py import-2.7!skip +plugins/module_utils/openshift_docker_image.py import-3.5!skip +plugins/module_utils/openshift_docker_image.py compile-2.7!skip +plugins/module_utils/openshift_docker_image.py compile-3.5!skip +plugins/module_utils/openshift_import_image.py import-2.7!skip +plugins/module_utils/openshift_import_image.py import-3.5!skip +plugins/module_utils/openshift_import_image.py compile-2.7!skip +plugins/module_utils/openshift_import_image.py compile-3.5!skip +plugins/module_utils/openshift_groups.py import-2.7!skip +plugins/module_utils/openshift_groups.py import-3.5!skip +plugins/module_utils/openshift_groups.py compile-2.7!skip +plugins/module_utils/openshift_groups.py compile-3.5!skip +plugins/module_utils/openshift_images_common.py import-2.7!skip +plugins/module_utils/openshift_images_common.py import-3.5!skip +plugins/module_utils/openshift_images_common.py compile-2.7!skip +plugins/module_utils/openshift_images_common.py compile-3.5!skip +plugins/module_utils/openshift_registry.py import-2.7!skip +plugins/module_utils/openshift_registry.py import-3.5!skip +plugins/module_utils/openshift_registry.py compile-2.7!skip +plugins/module_utils/openshift_registry.py compile-3.5!skip +plugins/module_utils/openshift_builds.py import-2.7!skip +plugins/module_utils/openshift_builds.py import-3.5!skip +plugins/module_utils/openshift_builds.py compile-2.7!skip +plugins/module_utils/openshift_builds.py compile-3.5!skip +plugins/modules/openshift_build.py import-2.7!skip +plugins/modules/openshift_build.py import-3.5!skip +plugins/modules/openshift_build.py compile-2.7!skip +plugins/modules/openshift_build.py compile-3.5!skip +plugins/modules/openshift_adm_prune_builds.py import-2.7!skip +plugins/modules/openshift_adm_prune_builds.py import-3.5!skip +plugins/modules/openshift_adm_prune_builds.py compile-2.7!skip +plugins/modules/openshift_adm_prune_builds.py compile-3.5!skip \ No newline at end of file