chore: Tracer version increments patch when on "release/v* branch

Author: bric3

…plugin/version/GitDescribeValueSource.kt …/plugin/version/GitCommandValueSource.ktbuildSrc/src/main/kotlin/datadog/gradle/plugin/version/GitDescribeValueSource.kt renamed to buildSrc/src/main/kotlin/datadog/gradle/plugin/version/GitCommandValueSource.kt buildSrc/src/main/kotlin/datadog/gradle/plugin/version/GitDescribeValueSource.kt renamed to buildSrc/src/main/kotlin/datadog/gradle/plugin/version/GitCommandValueSource.kt

@@ -2,52 +2,39 @@ package datadog.gradle.plugin.version
 
 import org.gradle.api.GradleException
 import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.provider.Property
+import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.ValueSource
 import org.gradle.api.provider.ValueSourceParameters
 import org.gradle.process.ExecOperations
-import org.gradle.process.ExecResult
 import java.io.ByteArrayOutputStream
 import java.nio.charset.Charset
 import javax.inject.Inject
 
-abstract class GitDescribeValueSource @Inject constructor(
+abstract class GitCommandValueSource @Inject constructor(
   private val execOperations: ExecOperations
-) : ValueSource<String, GitDescribeValueSource.Parameters> {
+) : ValueSource<String, GitCommandValueSource.Parameters> {
   override fun obtain(): String {
     val workDir = parameters.workingDirectory.get()
-    val tagPrefix = parameters.tagVersionPrefix.get()
-
-    val commandsArray = mutableListOf(
-      "git",
-      "describe",
-      "--abbrev=8",
-      "--tags",
-      "--first-parent",
-      "--match=$tagPrefix[0-9].[0-9]*.[0-9]",
-    )
-    if (parameters.showDirty.get()) {
-      commandsArray.add("--dirty")
-    }
+    val commands = parameters.gitCommand.get()
 
     val outputStream = ByteArrayOutputStream()
     val result = try {
       execOperations.exec {
-        commandLine(commandsArray)
+        commandLine(commands)
         workingDir(workDir)
         standardOutput = outputStream
         errorOutput = outputStream
       }
     } catch (e: Exception) {
-      throw GradleException("Failed to run: ${commandsArray.joinToString(" ")}", e)
+      throw GradleException("Failed to run: ${commands.joinToString(" ")}", e)
     }
 
     val output = outputStream.toString(Charset.defaultCharset().name())
     result.exitValue.let { exitValue ->
       if (exitValue != 0) {
         throw GradleException(
           """
-          Failed to run: ${commandsArray.joinToString(" ")}
+          Failed to run: ${commands.joinToString(" ")}
             (exit code: $exitValue)
           Output:
           $output
@@ -56,12 +43,11 @@ abstract class GitDescribeValueSource @Inject constructor(
       }
     }
 
-    return output
+    return output.trim()
   }
 
   interface Parameters : ValueSourceParameters {
-    val tagVersionPrefix: Property<String>
-    val showDirty: Property<Boolean>
     val workingDirectory: DirectoryProperty
+    val gitCommand: ListProperty<String>
   }
 }

buildSrc/src/main/kotlin/datadog/gradle/plugin/version/TracerVersionPlugin.kt

@@ -7,6 +7,7 @@ import org.gradle.api.logging.Logging
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.ProviderFactory
 import org.gradle.kotlin.dsl.property
+import java.io.File
 import javax.inject.Inject
 
 class TracerVersionPlugin @Inject constructor(
@@ -18,10 +19,10 @@ class TracerVersionPlugin @Inject constructor(
     if (targetProject.rootProject != targetProject) {
       throw IllegalStateException("Only root project can apply plugin")
     }
+    targetProject.extensions.create("tracerVersion", TracerVersionExtension::class.java)
+    val extension = targetProject.extensions.getByType(TracerVersionExtension::class.java)
 
-    val extension = targetProject.extensions.create("tracerVersion", TracerVersionExtension::class.java)
     val versionProvider = versionProvider(targetProject, extension)
-
     targetProject.allprojects {
       version = versionProvider
     }
@@ -31,27 +32,73 @@ class TracerVersionPlugin @Inject constructor(
     targetProject: Project,
     extension: TracerVersionExtension
   ): String {
-    val workingDirectory = targetProject.projectDir
+    val repoWorkingDirectory = targetProject.rootDir
 
-    val buildVersion: String = if (!workingDirectory.resolve(".git").exists()) {
+    val buildVersion: String = if (!repoWorkingDirectory.resolve(".git").exists()) {
+      // Not a git repository
       extension.defaultVersion.get()
     } else {
-      providerFactory.of(GitDescribeValueSource::class.java) {
-        parameters {
-          this.tagVersionPrefix.set(extension.tagVersionPrefix)
-          this.showDirty.set(extension.detectDirty)
-          this.workingDirectory.set(workingDirectory)
+      providerFactory.zip(
+        gitDescribeProvider(extension, repoWorkingDirectory),
+        gitCurrentBranchProvider(repoWorkingDirectory)
+      ) { describeString, currentBranch ->
+        toTracerVersion(describeString, extension) {
+          when {
+            currentBranch.startsWith("release/v") -> {
+              logger.info("Incrementing patch because release branch : $currentBranch")
+              nextPatchVersion()
+            }
+            else -> {
+              logger.info("Incrementing patch")
+              nextMinorVersion()
+            }
+          }
         }
-      }.map {
-        toTracerVersion(it.trim(), extension)
       }.get()
     }
 
     logger.lifecycle("Tracer build version: {}", buildVersion)
     return buildVersion
   }
 
-  private fun toTracerVersion(describeString: String, extension: TracerVersionExtension): String {
+  private fun gitCurrentBranchProvider(
+    repoWorkingDirectory: File
+  ) = providerFactory.of(GitCommandValueSource::class.java) {
+    parameters {
+      gitCommand.addAll(
+        "git",
+        "rev-parse",
+        "--abbrev-ref",
+        "HEAD",
+      )
+      workingDirectory.set(repoWorkingDirectory)
+    }
+  }
+
+  private fun gitDescribeProvider(
+    extension: TracerVersionExtension,
+    repoWorkingDirectory: File
+  ) = providerFactory.of(GitCommandValueSource::class.java) {
+    parameters {
+      val tagPrefix = extension.tagVersionPrefix.get()
+      gitCommand.addAll(
+        "git",
+        "describe",
+        "--abbrev=8",
+        "--tags",
+        "--first-parent",
+        "--match=$tagPrefix[0-9].[0-9]*.[0-9]",
+      )
+
+      if (extension.detectDirty.get()) {
+        gitCommand.add("--dirty")
+      }
+
+      workingDirectory.set(repoWorkingDirectory)
+    }
+  }
+
+  private fun toTracerVersion(describeString: String, extension: TracerVersionExtension, nextVersion: Version.() -> Version): String {
     logger.info("Git describe output: {}", describeString)
 
     val tagPrefix = extension.tagVersionPrefix.get()
@@ -63,7 +110,7 @@ class TracerVersionPlugin @Inject constructor(
     val hasLaterCommits = describeTrailer.isNotBlank()
     val version = Version.parse(lastTagVersion).let {
       if (hasLaterCommits) {
-        it.nextMinorVersion()
+        it.nextVersion()
       } else {
         it
       }