Fixes #27264: Random error after node-to-relay is applied and other dynamic group and node accepted by API problems

Cargo.toml

@@ -6,14 +6,14 @@ members = ["policies/rudderc",
            "policies/rudder-commons-test",
            "policies/rudder-report",
            "policies/module-types/*",
-           "policies/minifusion",
+           "policies/lib",
            "relay/sources/relayd",
            "relay/sources/rudder-package"]
 resolver = "2"
 
 [workspace.package]
 authors = ["Rudder developers <[email protected]>"]
-edition = "2021"
+edition = "2024"
 homepage = "https://www.rudder.io"
 license = "GPL-3.0-or-later"
 repository = "https://github.com/Normation/rudder"

Jenkinsfile-security

@@ -1,10 +1,9 @@
 
 
-def version = "8.2"
+def version = "8.3"
 def slackResponse = null
 
 def errors = []
-def running = []
 
 def changeUrl = env.CHANGE_URL
 
@@ -32,9 +31,6 @@ pipeline {
                 NVD_API_KEY = credentials('NVD_API_KEY')
             }
             steps {
-                script {
-                    running.add("webapp")
-                }
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                     dir('webapp/sources') {
                         sh script: 'mvn --batch-mode -DnvdApiKey=$NVD_API_KEY -DfailBuildOnCVSS=7 -DcveValidForHours=48 -DsuppressionFiles=dependency-check-suppression.xml -DossindexAnalyzerEnabled=false org.owasp:dependency-check-maven:aggregate', label: "check webapp dependencies"
@@ -52,15 +48,10 @@ pipeline {
                     script {
                         errors.add("webapp")
                         failedBuild = true
-                        slackResponse = updateSlack(errors, running, slackResponse, version, changeUrl)
+                        slackResponse = updateSlack(errors, slackResponse, version, changeUrl, false)
                         slackSend(channel: slackResponse.threadId, message: "Dependency check error on webapp - <${currentBuild.absoluteUrl}console|Console>", color: "#CC3421")
                     }
                 }
-                cleanup {
-                    script {
-                        running.remove("webapp")
-                    }
-                }
             }
         }
 
@@ -76,9 +67,6 @@ pipeline {
                 }
             }
             steps {
-                script {
-                    running.add("npm")
-                }
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                     dir('webapp/sources/rudder/rudder-web/src/main/') {
                         sh script: 'npm_config_loglevel=error npm ci --no-audit', label: "install dependencies"
@@ -91,15 +79,10 @@ pipeline {
                     script {
                         errors.add("npm")
                         failedBuild = true
-                        slackResponse = updateSlack(errors, running, slackResponse, version, changeUrl)
+                        slackResponse = updateSlack(errors, slackResponse, version, changeUrl, false)
                         slackSend(channel: slackResponse.threadId, message: "Dependency check error on npm - <${currentBuild.absoluteUrl}console|Console>", color: "#CC3421")
                     }
                 }
-                cleanup {
-                    script {
-                        running.remove("npm")
-                    }
-                }
             }
         }
         stage('deps-rust') {
@@ -113,9 +96,6 @@ pipeline {
                 }
             }
             steps {
-                script {
-                    running.add("relay")
-                }
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                     sh script: 'mkdir -p target', label: 'create target directory'
                     sh script: 'cargo deny check', label: 'check relayd dependencies'
@@ -127,16 +107,10 @@ pipeline {
                     script {
                         errors.add("rust")
                         failedBuild = true
-                        slackResponse = updateSlack(errors, running, slackResponse, version, changeUrl)
+                        slackResponse = updateSlack(errors, slackResponse, version, changeUrl, false)
                         slackSend(channel: slackResponse.threadId, message: "Dependency check error on rust projects - <${currentBuild.absoluteUrl}console|Console>", color: "#CC3421")
                     }
                 }
-
-                cleanup {
-                    script {
-                        running.remove("rust")
-                    }
-                }
                 always {
                     archiveArtifacts artifacts: 'target/*-dependencies.txt'
                 }
@@ -145,7 +119,7 @@ pipeline {
         stage('End') {
             steps {
                 script {
-                    updateSlack(errors, running, slackResponse, version, changeUrl)
+                    updateSlack(errors, slackResponse, version, changeUrl, true)
                     if (failedBuild) {
                         error 'End of build'
                     } else {
@@ -157,13 +131,13 @@ pipeline {
     }
 }
 
-def updateSlack(errors, running, slackResponse, version, changeUrl) {
+def updateSlack(errors, slackResponse, version, changeUrl, isEnded) {
   def msg ="*${version} - rudder dependency check* - <"+currentBuild.absoluteUrl+"|Link>"
 
   if (changeUrl == null) {
 
       def fixed = currentBuild.resultIsBetterOrEqualTo("SUCCESS") && currentBuild.previousBuild.resultIsWorseOrEqualTo("UNSTABLE")
-      if (errors.isEmpty() && running.isEmpty() && fixed) {
+      if (errors.isEmpty() && isEnded && fixed) {
         msg +=  " => No security issues found! :white_check_mark:"
         def color = "good"
         slackSend(channel: "ci-security", message: msg, color: color)

README.md

@@ -1,9 +1,9 @@
 <h1 align="center">
     <a href="https://www.rudder.io" target="blank_">
           <picture>
-              <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/Normation/rudder/master/logo/rudder-logo-rect-white.svg">
-              <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/Normation/rudder/master/logo/rudder-logo-rect-black.svg">
-              <img height="100" alt="Rudder logo" src="https://raw.githubusercontent.com/Normation/rudder/master/logo/rudder-logo-rect-black.svg">
+              <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/Normation/rudder/master/logo/icons/svg/rudder-logo-rect-white.svg">
+              <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/Normation/rudder/master/logo/icons/svg/rudder-logo-rect-black.svg">
+              <img height="100" alt="Rudder logo" src="https://raw.githubusercontent.com/Normation/rudder/master/logo/icons/svg/rudder-logo-rect-black.svg">
         </picture>
     </a>
     <br>

api-doc/Makefile

@@ -10,7 +10,7 @@ $(API): clean
 	mkdir -p build target/$@
 	cp -r ../$@/sources/api-doc build/$@
 	mkdir -p build/$@/assets
-	cp -r assets/. build/$@/assets
+	cp ../logo/icons/svg/rudder-logo-rect-*.svg build/$@/assets/
 	cp node_modules/rapidoc/dist/rapidoc-min.js build/$@/assets/
 	cp -r rapidoc.html build/$@/
 	./build.py $@ build target