From ed238c7aff99e466f3ffc7e1e0c0f9a1837a24e3 Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Wed, 16 Oct 2024 18:05:11 +0200 Subject: [PATCH 1/4] Change version of pom.xml to 8.2.0~rc1 --- webapp/sources/ldap-inventory/inventory-api/pom.xml | 2 +- webapp/sources/ldap-inventory/inventory-fusion/pom.xml | 2 +- .../ldap-inventory/inventory-provisioning-core/pom.xml | 2 +- webapp/sources/ldap-inventory/inventory-repository/pom.xml | 2 +- webapp/sources/ldap-inventory/pom.xml | 2 +- webapp/sources/pom.xml | 4 ++-- webapp/sources/rudder/pom.xml | 2 +- webapp/sources/rudder/rudder-core/pom.xml | 2 +- webapp/sources/rudder/rudder-rest/pom.xml | 2 +- webapp/sources/rudder/rudder-templates-cli/pom.xml | 2 +- webapp/sources/rudder/rudder-templates/pom.xml | 2 +- webapp/sources/rudder/rudder-web/pom.xml | 2 +- webapp/sources/scala-ldap/pom.xml | 2 +- webapp/sources/utils/pom.xml | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/webapp/sources/ldap-inventory/inventory-api/pom.xml b/webapp/sources/ldap-inventory/inventory-api/pom.xml index 0c8f382221b..70150731b17 100644 --- a/webapp/sources/ldap-inventory/inventory-api/pom.xml +++ b/webapp/sources/ldap-inventory/inventory-api/pom.xml @@ -34,7 +34,7 @@ along with Rudder. If not, see . com.normation.inventory inventory-parent - 8.2.0~beta2-SNAPSHOT + 8.2.0~rc1 4.0.0 inventory-api diff --git a/webapp/sources/ldap-inventory/inventory-fusion/pom.xml b/webapp/sources/ldap-inventory/inventory-fusion/pom.xml index dcf7af8b7aa..e4f7ac5e104 100644 --- a/webapp/sources/ldap-inventory/inventory-fusion/pom.xml +++ b/webapp/sources/ldap-inventory/inventory-fusion/pom.xml @@ -35,7 +35,7 @@ along with Rudder. If not, see . com.normation.inventory inventory-parent - 8.2.0~beta2-SNAPSHOT + 8.2.0~rc1 inventory-fusion diff --git a/webapp/sources/ldap-inventory/inventory-provisioning-core/pom.xml b/webapp/sources/ldap-inventory/inventory-provisioning-core/pom.xml index bb2238fcb56..0b5cbaacd52 100644 --- a/webapp/sources/ldap-inventory/inventory-provisioning-core/pom.xml +++ b/webapp/sources/ldap-inventory/inventory-provisioning-core/pom.xml @@ -35,7 +35,7 @@ along with Rudder. If not, see . com.normation.inventory inventory-parent - 8.2.0~beta2-SNAPSHOT + 8.2.0~rc1 inventory-provisioning-core diff --git a/webapp/sources/ldap-inventory/inventory-repository/pom.xml b/webapp/sources/ldap-inventory/inventory-repository/pom.xml index 38dc949df55..1554ab5125a 100644 --- a/webapp/sources/ldap-inventory/inventory-repository/pom.xml +++ b/webapp/sources/ldap-inventory/inventory-repository/pom.xml @@ -34,7 +34,7 @@ along with Rudder. If not, see . com.normation.inventory inventory-parent - 8.2.0~beta2-SNAPSHOT + 8.2.0~rc1 4.0.0 inventory-repository diff --git a/webapp/sources/ldap-inventory/pom.xml b/webapp/sources/ldap-inventory/pom.xml index 365ede37227..1c6386e3b38 100644 --- a/webapp/sources/ldap-inventory/pom.xml +++ b/webapp/sources/ldap-inventory/pom.xml @@ -40,7 +40,7 @@ along with Rudder. If not, see . com.normation parent-pom - 8.2.0~beta2-SNAPSHOT + 8.2.0~rc1 diff --git a/webapp/sources/pom.xml b/webapp/sources/pom.xml index 8f23bfa9b5f..18a813eb311 100644 --- a/webapp/sources/pom.xml +++ b/webapp/sources/pom.xml @@ -18,7 +18,7 @@ limitations under the License. com.normation parent-pom - 8.2.0~beta2-SNAPSHOT + 8.2.0~rc1 pom @@ -420,7 +420,7 @@ limitations under the License. 2024 8.2 - 8.2.0~beta2-SNAPSHOT + 8.2.0~rc1 5.0.0 2.13.12 diff --git a/webapp/sources/rudder/pom.xml b/webapp/sources/rudder/pom.xml index 3a95df45009..6af7e3b12d1 100644 --- a/webapp/sources/rudder/pom.xml +++ b/webapp/sources/rudder/pom.xml @@ -39,7 +39,7 @@ along with Rudder. If not, see . com.normation parent-pom - 8.2.0~beta2-SNAPSHOT + 8.2.0~rc1 diff --git a/webapp/sources/rudder/rudder-core/pom.xml b/webapp/sources/rudder/rudder-core/pom.xml index fcd3bbeab44..6e40b12a7c3 100644 --- a/webapp/sources/rudder/rudder-core/pom.xml +++ b/webapp/sources/rudder/rudder-core/pom.xml @@ -37,7 +37,7 @@ along with Rudder. If not, see . com.normation.rudder rudder-parent - 8.2.0~beta2-SNAPSHOT + 8.2.0~rc1 rudder-core diff --git a/webapp/sources/rudder/rudder-rest/pom.xml b/webapp/sources/rudder/rudder-rest/pom.xml index 63ee6364f2b..a5fc5f373a8 100644 --- a/webapp/sources/rudder/rudder-rest/pom.xml +++ b/webapp/sources/rudder/rudder-rest/pom.xml @@ -37,7 +37,7 @@ along with Rudder. If not, see . com.normation.rudder rudder-parent - 8.2.0~beta2-SNAPSHOT + 8.2.0~rc1 diff --git a/webapp/sources/rudder/rudder-templates-cli/pom.xml b/webapp/sources/rudder/rudder-templates-cli/pom.xml index abb875dee19..dfb7bd155df 100644 --- a/webapp/sources/rudder/rudder-templates-cli/pom.xml +++ b/webapp/sources/rudder/rudder-templates-cli/pom.xml @@ -37,7 +37,7 @@ along with Rudder. If not, see . com.normation.rudder rudder-parent - 8.2.0~beta2-SNAPSHOT + 8.2.0~rc1 diff --git a/webapp/sources/rudder/rudder-templates/pom.xml b/webapp/sources/rudder/rudder-templates/pom.xml index fc71a93b35f..8a422fff5a9 100644 --- a/webapp/sources/rudder/rudder-templates/pom.xml +++ b/webapp/sources/rudder/rudder-templates/pom.xml @@ -37,7 +37,7 @@ along with Rudder. If not, see . com.normation.rudder rudder-parent - 8.2.0~beta2-SNAPSHOT + 8.2.0~rc1 diff --git a/webapp/sources/rudder/rudder-web/pom.xml b/webapp/sources/rudder/rudder-web/pom.xml index 3af99415cad..2b54f372221 100644 --- a/webapp/sources/rudder/rudder-web/pom.xml +++ b/webapp/sources/rudder/rudder-web/pom.xml @@ -37,7 +37,7 @@ along with Rudder. If not, see . com.normation.rudder rudder-parent - 8.2.0~beta2-SNAPSHOT + 8.2.0~rc1 diff --git a/webapp/sources/scala-ldap/pom.xml b/webapp/sources/scala-ldap/pom.xml index edb5e3ec8f2..54764f57c45 100644 --- a/webapp/sources/scala-ldap/pom.xml +++ b/webapp/sources/scala-ldap/pom.xml @@ -19,7 +19,7 @@ limitations under the License. com.normation parent-pom - 8.2.0~beta2-SNAPSHOT + 8.2.0~rc1 scala-ldap diff --git a/webapp/sources/utils/pom.xml b/webapp/sources/utils/pom.xml index 4ba64532560..17dc4c63be9 100644 --- a/webapp/sources/utils/pom.xml +++ b/webapp/sources/utils/pom.xml @@ -19,7 +19,7 @@ limitations under the License. com.normation parent-pom - 8.2.0~beta2-SNAPSHOT + 8.2.0~rc1 utils From a192af6efa9deb6ef13c8d344913f770ce89624e Mon Sep 17 00:00:00 2001 From: Jenkins CI Date: Wed, 16 Oct 2024 18:05:12 +0200 Subject: [PATCH 2/4] Change version of pom.xml to 8.2.0~rc2-SNAPSHOT --- webapp/sources/ldap-inventory/inventory-api/pom.xml | 2 +- webapp/sources/ldap-inventory/inventory-fusion/pom.xml | 2 +- .../ldap-inventory/inventory-provisioning-core/pom.xml | 2 +- webapp/sources/ldap-inventory/inventory-repository/pom.xml | 2 +- webapp/sources/ldap-inventory/pom.xml | 2 +- webapp/sources/pom.xml | 4 ++-- webapp/sources/rudder/pom.xml | 2 +- webapp/sources/rudder/rudder-core/pom.xml | 2 +- webapp/sources/rudder/rudder-rest/pom.xml | 2 +- webapp/sources/rudder/rudder-templates-cli/pom.xml | 2 +- webapp/sources/rudder/rudder-templates/pom.xml | 2 +- webapp/sources/rudder/rudder-web/pom.xml | 2 +- webapp/sources/scala-ldap/pom.xml | 2 +- webapp/sources/utils/pom.xml | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/webapp/sources/ldap-inventory/inventory-api/pom.xml b/webapp/sources/ldap-inventory/inventory-api/pom.xml index 70150731b17..3411839b2eb 100644 --- a/webapp/sources/ldap-inventory/inventory-api/pom.xml +++ b/webapp/sources/ldap-inventory/inventory-api/pom.xml @@ -34,7 +34,7 @@ along with Rudder. If not, see . com.normation.inventory inventory-parent - 8.2.0~rc1 + 8.2.0~rc2-SNAPSHOT 4.0.0 inventory-api diff --git a/webapp/sources/ldap-inventory/inventory-fusion/pom.xml b/webapp/sources/ldap-inventory/inventory-fusion/pom.xml index e4f7ac5e104..7064144a86b 100644 --- a/webapp/sources/ldap-inventory/inventory-fusion/pom.xml +++ b/webapp/sources/ldap-inventory/inventory-fusion/pom.xml @@ -35,7 +35,7 @@ along with Rudder. If not, see . com.normation.inventory inventory-parent - 8.2.0~rc1 + 8.2.0~rc2-SNAPSHOT inventory-fusion diff --git a/webapp/sources/ldap-inventory/inventory-provisioning-core/pom.xml b/webapp/sources/ldap-inventory/inventory-provisioning-core/pom.xml index 0b5cbaacd52..e44ad607981 100644 --- a/webapp/sources/ldap-inventory/inventory-provisioning-core/pom.xml +++ b/webapp/sources/ldap-inventory/inventory-provisioning-core/pom.xml @@ -35,7 +35,7 @@ along with Rudder. If not, see . com.normation.inventory inventory-parent - 8.2.0~rc1 + 8.2.0~rc2-SNAPSHOT inventory-provisioning-core diff --git a/webapp/sources/ldap-inventory/inventory-repository/pom.xml b/webapp/sources/ldap-inventory/inventory-repository/pom.xml index 1554ab5125a..5b914af8729 100644 --- a/webapp/sources/ldap-inventory/inventory-repository/pom.xml +++ b/webapp/sources/ldap-inventory/inventory-repository/pom.xml @@ -34,7 +34,7 @@ along with Rudder. If not, see . com.normation.inventory inventory-parent - 8.2.0~rc1 + 8.2.0~rc2-SNAPSHOT 4.0.0 inventory-repository diff --git a/webapp/sources/ldap-inventory/pom.xml b/webapp/sources/ldap-inventory/pom.xml index 1c6386e3b38..ca0f3ebc547 100644 --- a/webapp/sources/ldap-inventory/pom.xml +++ b/webapp/sources/ldap-inventory/pom.xml @@ -40,7 +40,7 @@ along with Rudder. If not, see . com.normation parent-pom - 8.2.0~rc1 + 8.2.0~rc2-SNAPSHOT diff --git a/webapp/sources/pom.xml b/webapp/sources/pom.xml index 18a813eb311..847a63cd047 100644 --- a/webapp/sources/pom.xml +++ b/webapp/sources/pom.xml @@ -18,7 +18,7 @@ limitations under the License. com.normation parent-pom - 8.2.0~rc1 + 8.2.0~rc2-SNAPSHOT pom @@ -420,7 +420,7 @@ limitations under the License. 2024 8.2 - 8.2.0~rc1 + 8.2.0~rc2-SNAPSHOT 5.0.0 2.13.12 diff --git a/webapp/sources/rudder/pom.xml b/webapp/sources/rudder/pom.xml index 6af7e3b12d1..5d412a809ab 100644 --- a/webapp/sources/rudder/pom.xml +++ b/webapp/sources/rudder/pom.xml @@ -39,7 +39,7 @@ along with Rudder. If not, see . com.normation parent-pom - 8.2.0~rc1 + 8.2.0~rc2-SNAPSHOT diff --git a/webapp/sources/rudder/rudder-core/pom.xml b/webapp/sources/rudder/rudder-core/pom.xml index 6e40b12a7c3..8468bac9132 100644 --- a/webapp/sources/rudder/rudder-core/pom.xml +++ b/webapp/sources/rudder/rudder-core/pom.xml @@ -37,7 +37,7 @@ along with Rudder. If not, see . com.normation.rudder rudder-parent - 8.2.0~rc1 + 8.2.0~rc2-SNAPSHOT rudder-core diff --git a/webapp/sources/rudder/rudder-rest/pom.xml b/webapp/sources/rudder/rudder-rest/pom.xml index a5fc5f373a8..4ab37f61ba0 100644 --- a/webapp/sources/rudder/rudder-rest/pom.xml +++ b/webapp/sources/rudder/rudder-rest/pom.xml @@ -37,7 +37,7 @@ along with Rudder. If not, see . com.normation.rudder rudder-parent - 8.2.0~rc1 + 8.2.0~rc2-SNAPSHOT diff --git a/webapp/sources/rudder/rudder-templates-cli/pom.xml b/webapp/sources/rudder/rudder-templates-cli/pom.xml index dfb7bd155df..0200fc4a2c2 100644 --- a/webapp/sources/rudder/rudder-templates-cli/pom.xml +++ b/webapp/sources/rudder/rudder-templates-cli/pom.xml @@ -37,7 +37,7 @@ along with Rudder. If not, see . com.normation.rudder rudder-parent - 8.2.0~rc1 + 8.2.0~rc2-SNAPSHOT diff --git a/webapp/sources/rudder/rudder-templates/pom.xml b/webapp/sources/rudder/rudder-templates/pom.xml index 8a422fff5a9..ff6af80e46e 100644 --- a/webapp/sources/rudder/rudder-templates/pom.xml +++ b/webapp/sources/rudder/rudder-templates/pom.xml @@ -37,7 +37,7 @@ along with Rudder. If not, see . com.normation.rudder rudder-parent - 8.2.0~rc1 + 8.2.0~rc2-SNAPSHOT diff --git a/webapp/sources/rudder/rudder-web/pom.xml b/webapp/sources/rudder/rudder-web/pom.xml index 2b54f372221..24ff614d9fe 100644 --- a/webapp/sources/rudder/rudder-web/pom.xml +++ b/webapp/sources/rudder/rudder-web/pom.xml @@ -37,7 +37,7 @@ along with Rudder. If not, see . com.normation.rudder rudder-parent - 8.2.0~rc1 + 8.2.0~rc2-SNAPSHOT diff --git a/webapp/sources/scala-ldap/pom.xml b/webapp/sources/scala-ldap/pom.xml index 54764f57c45..1b9356a18c4 100644 --- a/webapp/sources/scala-ldap/pom.xml +++ b/webapp/sources/scala-ldap/pom.xml @@ -19,7 +19,7 @@ limitations under the License. com.normation parent-pom - 8.2.0~rc1 + 8.2.0~rc2-SNAPSHOT scala-ldap diff --git a/webapp/sources/utils/pom.xml b/webapp/sources/utils/pom.xml index 17dc4c63be9..ad3bfdcb039 100644 --- a/webapp/sources/utils/pom.xml +++ b/webapp/sources/utils/pom.xml @@ -19,7 +19,7 @@ limitations under the License. com.normation parent-pom - 8.2.0~rc1 + 8.2.0~rc2-SNAPSHOT utils From d0897114ef155c72f637798f208fd9bd53db71d2 Mon Sep 17 00:00:00 2001 From: Alexis Mousset Date: Thu, 17 Oct 2024 23:55:02 +0200 Subject: [PATCH 3/4] Fixes #25693: Software update campaign does not work on SLES 15 --- .../module-types/system-updates/src/package_manager/zypper.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/policies/module-types/system-updates/src/package_manager/zypper.rs b/policies/module-types/system-updates/src/package_manager/zypper.rs index 6acf99502de..3f4a4c547e0 100644 --- a/policies/module-types/system-updates/src/package_manager/zypper.rs +++ b/policies/module-types/system-updates/src/package_manager/zypper.rs @@ -69,7 +69,7 @@ impl LinuxPackageManager for ZypperPackageManager { fn upgrade(&mut self, packages: Vec) -> ResultOutput<()> { let mut c = Command::new("zypper"); - c.arg("--non-interactive").arg("--name").arg("update"); + c.arg("--non-interactive").arg("update"); c.args(packages.into_iter().map(Self::package_spec_as_argument)); let res_update = ResultOutput::command(c); res_update.clear_ok() From bcd9593e513702cbe083db45c96d617c254ffa12 Mon Sep 17 00:00:00 2001 From: Clark Andrianasolo Date: Fri, 18 Oct 2024 17:49:54 +0200 Subject: [PATCH 4/4] Fixes #25709: OpenAPI documentation is invalid with duplicate /nodes/pending endpoints --- api-doc/build.py | 15 ++++++++------- api-doc/redocly.yml | 2 +- webapp/sources/api-doc/openapi.src.yml | 7 ++++--- .../sources/api-doc/paths/nodes/pending-all.yml | 1 - .../api-doc/paths/nodes/pending-update.yml | 1 - 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/api-doc/build.py b/api-doc/build.py index 7719a9d3d8c..50b886a0d3e 100755 --- a/api-doc/build.py +++ b/api-doc/build.py @@ -25,6 +25,13 @@ for template in templates: with open(template, 'r') as content_file: main = yaml.load(content_file.read(), Loader=yaml.FullLoader) + + ################################################################################ + # Lint doc using redocly (on split files to allow correct file reports) + if subprocess.call(['npx', 'redocly', 'lint', template]): + print('Linter failed on %s' % (template)) + exit(1) + version = main['info']['version'] intro_file = main['info']['description'] @@ -40,18 +47,12 @@ # Dump target in target .yml file src_openapi_file = template.replace('.src', '') with open(src_openapi_file, 'w') as file: - documents = yaml.dump(main, file) + yaml.dump(main, file) target = '%s/%s/%s' % (target_dir, api, version) print('Built %s' % (src_openapi_file)) - ################################################################################ - # Lint doc using redocly (on split files to allow correct file reports) - if subprocess.call(['npx', 'redocly', 'lint', src_openapi_file]): - print('Linter failed on %s' % (src_openapi_file)) - exit(1) - ################################################################################ # Build final OpenAPI spec files using redocly for format in ["yml", "json"]: diff --git a/api-doc/redocly.yml b/api-doc/redocly.yml index 03462d46938..c75a0593575 100644 --- a/api-doc/redocly.yml +++ b/api-doc/redocly.yml @@ -17,7 +17,7 @@ rules: no-invalid-media-type-examples: severity: 'error' allowAdditionalProperties: false - no-server-example.com: 'error' + no-server-example.com: 'warn' # we should migrate away from localhost as server url no-unused-components: 'error' theme: diff --git a/webapp/sources/api-doc/openapi.src.yml b/webapp/sources/api-doc/openapi.src.yml index b76e9b85db6..138e1444f44 100644 --- a/webapp/sources/api-doc/openapi.src.yml +++ b/webapp/sources/api-doc/openapi.src.yml @@ -255,9 +255,10 @@ paths: "/nodes/status": $ref: paths/nodes/status.yml "/nodes/pending": - $ref: paths/nodes/pending-all.yml - "/nodes/pending": - $ref: paths/nodes/pending-update.yml + get: + $ref: paths/nodes/pending-all.yml + post: + $ref: paths/nodes/pending-update.yml "/nodes/{nodeId}": $ref: paths/nodes/id.yml "/nodes/pending/{nodeId}": diff --git a/webapp/sources/api-doc/paths/nodes/pending-all.yml b/webapp/sources/api-doc/paths/nodes/pending-all.yml index 4c0793ddd0a..085e3d8cd39 100644 --- a/webapp/sources/api-doc/paths/nodes/pending-all.yml +++ b/webapp/sources/api-doc/paths/nodes/pending-all.yml @@ -1,6 +1,5 @@ # SPDX-License-Identifier: CC-BY-SA-2.0 # SPDX-FileCopyrightText: 2013-2020 Normation SAS -get: summary: List pending nodes description: Get information about the nodes pending acceptation operationId: listPendingNodes diff --git a/webapp/sources/api-doc/paths/nodes/pending-update.yml b/webapp/sources/api-doc/paths/nodes/pending-update.yml index 91090adfa93..743541fa513 100644 --- a/webapp/sources/api-doc/paths/nodes/pending-update.yml +++ b/webapp/sources/api-doc/paths/nodes/pending-update.yml @@ -1,6 +1,5 @@ # SPDX-License-Identifier: CC-BY-SA-2.0 # SPDX-FileCopyrightText: 2013-2024 Normation SAS -post: summary: Update pending nodes status description: Accept or refuse one or many pending nodes operationId: changePendingNodesStatus