nemerosa/ontrack#1343 Support for auto-versioning additional paths

nemerosa · Sep 6, 2024 · a57a28a · a57a28a
1 parent 29126f1
commit a57a28a
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 1 deletion.
diff --git a/src/net/nemerosa/ontrack/jenkins/pipeline/autoversioning/AutoVersioningContext.groovy b/src/net/nemerosa/ontrack/jenkins/pipeline/autoversioning/AutoVersioningContext.groovy
@@ -105,6 +105,21 @@ class AutoVersioningContext {
             }
         }
 
+        List<AutoVersioningDependencyPath> additionalPaths = null
+        def additionalPathsArray = params.additionalPaths
+        if (additionalPathsArray) {
+            additionalPaths = additionalPathsArray.collect {
+                new AutoVersioningDependencyPath(
+                        it.path as String,
+                        it.regex as String,
+                        it.property as String,
+                        it.propertyRegex as String,
+                        it.propertyType as String,
+                        it.versionSource as String,
+                )
+            }
+        }
+
         String postProcessing = params.postProcessing
         def postProcessingConfig = params.postProcessingConfig as Map<String, ?> ?: [:]
 
@@ -131,6 +146,7 @@ class AutoVersioningContext {
                 prBodyTemplateFormat,
                 reviewers,
                 notifications,
+                additionalPaths,
         )
 
         // Adding this configuration to the list

diff --git a/src/net/nemerosa/ontrack/jenkins/pipeline/autoversioning/AutoVersioningDependency.groovy b/src/net/nemerosa/ontrack/jenkins/pipeline/autoversioning/AutoVersioningDependency.groovy
@@ -23,8 +23,9 @@ class AutoVersioningDependency {
     private final String prBodyTemplateFormat
     private final List<String> reviewers
     private final List<AutoVersioningNotification> notifications
+    private final List<AutoVersioningDependencyPath> additionalPaths
 
-    AutoVersioningDependency(String sourceProject, String sourceBranch, String sourcePromotion, String targetPath, String targetRegex, String targetProperty, String targetPropertyRegex, String targetPropertyType, Boolean autoApproval, String upgradeBranchPattern, String validationStamp, String postProcessing, Map<String, ?> postProcessingConfig, String autoApprovalMode, String qualifier, String versionSource, String prTitleTemplate, String prBodyTemplate, String prBodyTemplateFormat, List<String> reviewers, List<AutoVersioningNotification> notifications) {
+    AutoVersioningDependency(String sourceProject, String sourceBranch, String sourcePromotion, String targetPath, String targetRegex, String targetProperty, String targetPropertyRegex, String targetPropertyType, Boolean autoApproval, String upgradeBranchPattern, String validationStamp, String postProcessing, Map<String, ?> postProcessingConfig, String autoApprovalMode, String qualifier, String versionSource, String prTitleTemplate, String prBodyTemplate, String prBodyTemplateFormat, List<String> reviewers, List<AutoVersioningNotification> notifications, List<AutoVersioningDependencyPath> additionalPaths) {
         this.sourceProject = sourceProject
         this.sourceBranch = sourceBranch
         this.sourcePromotion = sourcePromotion
@@ -46,6 +47,7 @@ class AutoVersioningDependency {
         this.prBodyTemplateFormat = prBodyTemplateFormat
         this.reviewers = reviewers
         this.notifications = notifications
+        this.additionalPaths = additionalPaths
     }
 
     String getSourceProject() {
@@ -132,6 +134,10 @@ class AutoVersioningDependency {
         return notifications
     }
 
+    List<AutoVersioningDependencyPath> getAdditionalPaths() {
+        return additionalPaths
+    }
+
     Map<String, ?> toMap() {
         return [
                 sourceProject       : sourceProject,
@@ -155,6 +161,7 @@ class AutoVersioningDependency {
                 prBodyTemplateFormat: prBodyTemplateFormat,
                 reviewers           : reviewers,
                 notifications       : notifications?.collect { it.toMap() },
+                additionalPaths     : additionalPaths?.collect { it.toMap() },
         ]
     }
 

diff --git a/src/net/nemerosa/ontrack/jenkins/pipeline/autoversioning/AutoVersioningDependencyPath.groovy b/src/net/nemerosa/ontrack/jenkins/pipeline/autoversioning/AutoVersioningDependencyPath.groovy
@@ -0,0 +1,55 @@
+package net.nemerosa.ontrack.jenkins.pipeline.autoversioning
+
+class AutoVersioningDependencyPath {
+
+    private final String path
+    private final String regex
+    private final String property
+    private final String propertyRegex
+    private final String propertyType
+    private final String versionSource
+
+    AutoVersioningDependencyPath(String path, String regex, String property, String propertyRegex, String propertyType, String versionSource) {
+        this.path = path
+        this.regex = regex
+        this.property = property
+        this.propertyRegex = propertyRegex
+        this.propertyType = propertyType
+        this.versionSource = versionSource
+    }
+
+    String getPath() {
+        return path
+    }
+
+    String getRegex() {
+        return regex
+    }
+
+    String getProperty() {
+        return property
+    }
+
+    String getPropertyRegex() {
+        return propertyRegex
+    }
+
+    String getPropertyType() {
+        return propertyType
+    }
+
+    String getVersionSource() {
+        return versionSource
+    }
+
+    Map<String, ?> toMap() {
+        return [
+                path         : path,
+                regex        : regex,
+                property     : property,
+                propertyRegex: propertyRegex,
+                propertyType : propertyType,
+                versionSource: versionSource,
+        ]
+    }
+}