Merge pull request #862 from rabbitmq/lrb-fix-version-parsing

michaelklishin · lukebakken · commit ccc7c33bc835 · 2020-06-10T14:00:26.000-07:00
Fix RabbitMQ version parsing (cherry picked from commit 04bca53)
diff --git a/projects/Unit/TestUpdateSecret.cs b/projects/Unit/TestUpdateSecret.cs
@@ -69,6 +69,13 @@ private bool RabbitMQ380OrHigher()
             if (properties.TryGetValue("version", out object versionVal))
             {
                 string versionStr = Encoding.UTF8.GetString((byte[])versionVal);
+
+                int dashIdx = versionStr.IndexOf('-');
+                if (dashIdx > 0)
+                {
+                    versionStr = versionStr.Remove(dashIdx);
+                }
+
                 if (Version.TryParse(versionStr, out Version version))
                 {
                     return version >= new Version(3, 8);

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,13 @@ private bool RabbitMQ380OrHigher()`
`69`	`69`	`if (properties.TryGetValue("version", out object versionVal))`
`70`	`70`	`{`
`71`	`71`	`string versionStr = Encoding.UTF8.GetString((byte[])versionVal);`
	`72`	`+`
	`73`	`+ int dashIdx = versionStr.IndexOf('-');`
	`74`	`+ if (dashIdx > 0)`
	`75`	`+ {`
	`76`	`+ versionStr = versionStr.Remove(dashIdx);`
	`77`	`+ }`
	`78`	`+`
`72`	`79`	`if (Version.TryParse(versionStr, out Version version))`
`73`	`80`	`{`
`74`	`81`	`return version >= new Version(3, 8);`