From f53804f542c8795386ae51b4e92d1019e6230566 Mon Sep 17 00:00:00 2001 From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com> Date: Fri, 2 Jan 2026 15:02:58 +0100 Subject: [PATCH] [PR #11357/ddf05104 backport][stable-10] Add missing integration test aliases files (#11370) Add missing integration test aliases files (#11357) * Add missing aliases files. * Fix directory name. * Add another missing aliases file. * Adjust test to also work with newer jsonpatch versions. (cherry picked from commit ddf05104f3b39ec97ccb0e31f34535d9c23fb5f7) Co-authored-by: Felix Fontein --- .../targets/filter_from_ini/aliases | 5 +++++ .../targets/filter_json_patch/aliases | 5 +++++ .../targets/filter_json_patch/tasks/main.yml | 18 ++++++++++++------ .../integration/targets/filter_to_ini/aliases | 5 +++++ .../targets/keycloak_client/aliases | 5 +++++ .../targets/keycloak_clientscope_type/aliases | 5 +++++ .../targets/keycloak_clientsecret_info/aliases | 5 +++++ .../keycloak_clientsecret_regenerate/aliases | 5 +++++ .../lookup_github_app_access_token/aliases | 5 +++++ .../files/app-private-key.pem | 0 .../files/app-private-key.pem.license | 0 .../tasks/main.yml | 0 .../vars/main.yml | 0 13 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 tests/integration/targets/filter_from_ini/aliases create mode 100644 tests/integration/targets/filter_json_patch/aliases create mode 100644 tests/integration/targets/filter_to_ini/aliases create mode 100644 tests/integration/targets/keycloak_client/aliases create mode 100644 tests/integration/targets/keycloak_clientscope_type/aliases create mode 100644 tests/integration/targets/keycloak_clientsecret_info/aliases create mode 100644 tests/integration/targets/keycloak_clientsecret_regenerate/aliases create mode 100644 tests/integration/targets/lookup_github_app_access_token/aliases rename tests/integration/targets/{github_app_access_token => lookup_github_app_access_token}/files/app-private-key.pem (100%) rename tests/integration/targets/{github_app_access_token => lookup_github_app_access_token}/files/app-private-key.pem.license (100%) rename tests/integration/targets/{github_app_access_token => lookup_github_app_access_token}/tasks/main.yml (100%) rename tests/integration/targets/{github_app_access_token => lookup_github_app_access_token}/vars/main.yml (100%) diff --git a/tests/integration/targets/filter_from_ini/aliases b/tests/integration/targets/filter_from_ini/aliases new file mode 100644 index 0000000000..afda346c4e --- /dev/null +++ b/tests/integration/targets/filter_from_ini/aliases @@ -0,0 +1,5 @@ +# Copyright (c) Ansible Project +# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +# SPDX-License-Identifier: GPL-3.0-or-later + +azp/posix/1 diff --git a/tests/integration/targets/filter_json_patch/aliases b/tests/integration/targets/filter_json_patch/aliases new file mode 100644 index 0000000000..afda346c4e --- /dev/null +++ b/tests/integration/targets/filter_json_patch/aliases @@ -0,0 +1,5 @@ +# Copyright (c) Ansible Project +# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +# SPDX-License-Identifier: GPL-3.0-or-later + +azp/posix/1 diff --git a/tests/integration/targets/filter_json_patch/tasks/main.yml b/tests/integration/targets/filter_json_patch/tasks/main.yml index 014133acad..d892a55130 100644 --- a/tests/integration/targets/filter_json_patch/tasks/main.yml +++ b/tests/integration/targets/filter_json_patch/tasks/main.yml @@ -126,12 +126,18 @@ input | community.general.json_diff(target) | sort(attribute='path') - == - [ - {"op": "add", "path": "/baq", "value": {"baz": 2}}, - {"op": "remove", "path": "/baw/1"}, - {"op": "replace", "path": "/hello", "value": "night"}, - ] + in [expected_1, expected_2] vars: input: {"foo": 1, "bar":{"baz": 2}, "baw": [1, 2, 3], "hello": "day"} target: {"foo": 1, "bar": {"baz": 2}, "baw": [1, 3], "baq": {"baz": 2}, "hello": "night"} + expected_1: + # Older jsonpatch version + - {"op": "add", "path": "/baq", "value": {"baz": 2}} + - {"op": "remove", "path": "/baw/1"} + - {"op": "replace", "path": "/hello", "value": "night"} + expected_2: + # Newer jsonpatch version + - {"op": "add", "path": "/baq", "value": {"baz": 2}} + - {"op": "remove", "path": "/baw/1"} + - {"op": "move", "path": "/baw/1", "from": "/baw/2"} + - {"op": "replace", "path": "/hello", "value": "night"} diff --git a/tests/integration/targets/filter_to_ini/aliases b/tests/integration/targets/filter_to_ini/aliases new file mode 100644 index 0000000000..afda346c4e --- /dev/null +++ b/tests/integration/targets/filter_to_ini/aliases @@ -0,0 +1,5 @@ +# Copyright (c) Ansible Project +# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +# SPDX-License-Identifier: GPL-3.0-or-later + +azp/posix/1 diff --git a/tests/integration/targets/keycloak_client/aliases b/tests/integration/targets/keycloak_client/aliases new file mode 100644 index 0000000000..3d902b5afd --- /dev/null +++ b/tests/integration/targets/keycloak_client/aliases @@ -0,0 +1,5 @@ +# Copyright (c) Ansible Project +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +# SPDX-License-Identifier: GPL-3.0-or-later + +unsupported diff --git a/tests/integration/targets/keycloak_clientscope_type/aliases b/tests/integration/targets/keycloak_clientscope_type/aliases new file mode 100644 index 0000000000..3d902b5afd --- /dev/null +++ b/tests/integration/targets/keycloak_clientscope_type/aliases @@ -0,0 +1,5 @@ +# Copyright (c) Ansible Project +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +# SPDX-License-Identifier: GPL-3.0-or-later + +unsupported diff --git a/tests/integration/targets/keycloak_clientsecret_info/aliases b/tests/integration/targets/keycloak_clientsecret_info/aliases new file mode 100644 index 0000000000..3d902b5afd --- /dev/null +++ b/tests/integration/targets/keycloak_clientsecret_info/aliases @@ -0,0 +1,5 @@ +# Copyright (c) Ansible Project +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +# SPDX-License-Identifier: GPL-3.0-or-later + +unsupported diff --git a/tests/integration/targets/keycloak_clientsecret_regenerate/aliases b/tests/integration/targets/keycloak_clientsecret_regenerate/aliases new file mode 100644 index 0000000000..3d902b5afd --- /dev/null +++ b/tests/integration/targets/keycloak_clientsecret_regenerate/aliases @@ -0,0 +1,5 @@ +# Copyright (c) Ansible Project +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +# SPDX-License-Identifier: GPL-3.0-or-later + +unsupported diff --git a/tests/integration/targets/lookup_github_app_access_token/aliases b/tests/integration/targets/lookup_github_app_access_token/aliases new file mode 100644 index 0000000000..bd1f024441 --- /dev/null +++ b/tests/integration/targets/lookup_github_app_access_token/aliases @@ -0,0 +1,5 @@ +# Copyright (c) Ansible Project +# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +# SPDX-License-Identifier: GPL-3.0-or-later + +unsupported diff --git a/tests/integration/targets/github_app_access_token/files/app-private-key.pem b/tests/integration/targets/lookup_github_app_access_token/files/app-private-key.pem similarity index 100% rename from tests/integration/targets/github_app_access_token/files/app-private-key.pem rename to tests/integration/targets/lookup_github_app_access_token/files/app-private-key.pem diff --git a/tests/integration/targets/github_app_access_token/files/app-private-key.pem.license b/tests/integration/targets/lookup_github_app_access_token/files/app-private-key.pem.license similarity index 100% rename from tests/integration/targets/github_app_access_token/files/app-private-key.pem.license rename to tests/integration/targets/lookup_github_app_access_token/files/app-private-key.pem.license diff --git a/tests/integration/targets/github_app_access_token/tasks/main.yml b/tests/integration/targets/lookup_github_app_access_token/tasks/main.yml similarity index 100% rename from tests/integration/targets/github_app_access_token/tasks/main.yml rename to tests/integration/targets/lookup_github_app_access_token/tasks/main.yml diff --git a/tests/integration/targets/github_app_access_token/vars/main.yml b/tests/integration/targets/lookup_github_app_access_token/vars/main.yml similarity index 100% rename from tests/integration/targets/github_app_access_token/vars/main.yml rename to tests/integration/targets/lookup_github_app_access_token/vars/main.yml