fix(elasticsearch): canonicalize reindexed index wrappers

Author: niemyjski

src/Foundatio.Repositories.Elasticsearch/Configuration/CompatibilityIndexName.cs

@@ -46,6 +46,16 @@ internal static ReadOnlySpan<char> GetCanonicalNameSpan(string index, string con
 
         ReadOnlySpan<char> indexSpan = index;
         ReadOnlySpan<char> configuredSpan = configuredIndexName;
+        bool hasCompatibilityPrefix = TryRemovePrefix(index, out ReadOnlySpan<char> canonicalName);
+        if (hasCompatibilityPrefix
+            && (canonicalName.Equals(configuredSpan, StringComparison.Ordinal)
+                || (canonicalName.Length > configuredSpan.Length
+                && canonicalName.StartsWith(configuredSpan, StringComparison.Ordinal)
+                && canonicalName[configuredSpan.Length] is '-')))
+        {
+            return canonicalName;
+        }
+
         if (indexSpan.Equals(configuredSpan, StringComparison.Ordinal)
             || (indexSpan.Length > configuredSpan.Length
                 && indexSpan.StartsWith(configuredSpan, StringComparison.Ordinal)
@@ -54,7 +64,7 @@ internal static ReadOnlySpan<char> GetCanonicalNameSpan(string index, string con
             return indexSpan;
         }
 
-        return TryRemovePrefix(index, out ReadOnlySpan<char> canonicalName) ? canonicalName : indexSpan;
+        return hasCompatibilityPrefix ? canonicalName : indexSpan;
     }
 
     internal static bool TryRemovePrefix(string index, out ReadOnlySpan<char> canonicalName)

tests/Foundatio.Repositories.Elasticsearch.Tests/IndexCompatibilityTests.cs

@@ -614,6 +614,19 @@ public void CompatibilityIndexName_ConfiguredPrefixPreservesNaturalChildName(str
         Assert.Equal(expected, canonicalName);
     }
 
+    [Fact]
+    public void CompatibilityIndexName_ConfiguredReindexedName_StripsGeneratedWrapper()
+    {
+        const string configuredName = "reindexed";
+        const string source = "reindexed-v1";
+        const string target = "reindexed-v9-reindexed-v1";
+
+        Assert.Equal(source, CompatibilityIndexName.GetCanonicalName(source, configuredName));
+        Assert.Equal(target, CompatibilityIndexName.Create(source, 9, configuredName));
+        Assert.Equal(source, CompatibilityIndexName.GetCanonicalName(target, configuredName));
+        Assert.Equal("reindexed-v10-reindexed-v1", CompatibilityIndexName.Create(target, 10, configuredName));
+    }
+
     [Theory]
     [InlineData(null, "7.17.19", 7)]
     [InlineData(null, "8.11.0", 8)]