fix(artifacts): Do not further strip version for nuget packages (#4176)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Matt <6519811+mattgogerly@users.noreply.github.com>
spinnaker · Dec 4, 2021 · 6ea175a · 6ea175a
1 parent 94259a7
commit 6ea175a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/util/PackageInfo.java b/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/util/PackageInfo.java
@@ -325,7 +325,7 @@ private String extractPackageVersion(
         fileName.substring(
             fileName.indexOf(filePrefix) + filePrefix.length(),
             fileName.lastIndexOf(fileExtension));
-    if (version.contains(versionDelimiter)) {
+    if (version.contains(versionDelimiter) && !packageType.equals("nupkg")) {
       // further strip in case of _all is in the file name
       version = version.substring(0, version.indexOf(versionDelimiter));
     }

diff --git a/orca-core/src/test/groovy/com/netflix/spinnaker/orca/pipeline/util/PackageInfoSpec.groovy b/orca-core/src/test/groovy/com/netflix/spinnaker/orca/pipeline/util/PackageInfoSpec.groovy
@@ -27,6 +27,7 @@ import java.util.regex.Pattern
 
 import static com.netflix.spinnaker.orca.pipeline.util.PackageType.DEB
 import static com.netflix.spinnaker.orca.pipeline.util.PackageType.RPM
+import static com.netflix.spinnaker.orca.pipeline.util.PackageType.NUPKG
 import static com.netflix.spinnaker.orca.test.model.ExecutionBuilder.pipeline
 import static com.netflix.spinnaker.orca.test.model.ExecutionBuilder.stage
 
@@ -206,6 +207,7 @@ class PackageInfoSpec extends Specification {
     [["fileName": "package_4.11.4-h02.deb"], ["fileName": "package-something_4.11.4-h02.deb"]]               | "package"           | DEB         || "package_4.11.4-h02"
     [["fileName": "package_4.11.4-h02.sha123.deb"], ["fileName": "package-something_4.11.4-h02.deb"]]        | "package-something" | DEB         || "package-something_4.11.4-h02"
     [["fileName": "package_4.11.4-h02.sha123.deb"], ["fileName": "package-something_4.11.4-h02.sha123.deb"]] | "package"           | DEB         || "package_4.11.4-h02.sha123"
+    [["fileName": "Package.1.3.3.7.nupkg"]]                                                                  | "Package"           | NUPKG       || "Package.1.3.3.7"
   }
 
   def "findTargetPackage: bake execution with only a package set and jenkins stage artifacts"() {