Fix race condition with slow loading of new repo labels

ecoAPM · Jun 27, 2023 · d6eea78 · d6eea78
1 parent 24ba75e
commit d6eea78
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 3 deletions.
diff --git a/src/GitHubLabelSync.csproj b/src/GitHubLabelSync.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<Version>2.1.1</Version>
+		<Version>2.1.2</Version>
 		<OutputType>Exe</OutputType>
 		<PackAsTool>true</PackAsTool>
 		<ToolCommandName>sync-labels</ToolCommandName>

diff --git a/src/Synchronizer.cs b/src/Synchronizer.cs
@@ -75,10 +75,16 @@ public async Task<IReadOnlyList<Label>> GetAccountLabels(Account account)
 			? await _gitHub.CreateTempRepoForOrganization(account, repoName)
 			: await _gitHub.CreateTempRepoForUser(account, repoName);
 
-		var labels = await _gitHub.GetLabels(repo);
+		var originalLabels = await _gitHub.GetLabels(repo);
+		var latestLabels = await _gitHub.GetLabels(repo);
+		while (originalLabels.Count != latestLabels.Count)
+		{
+			originalLabels = latestLabels;
+			latestLabels = await _gitHub.GetLabels(repo);
+		}
 		await _gitHub.DeleteTempRepo(account, repoName);
 
-		return labels;
+		return latestLabels;
 	}
 
 	private static string LabelNames(IEnumerable<Label> labels)

diff --git a/test/SynchronizerTests.cs b/test/SynchronizerTests.cs
@@ -30,6 +30,7 @@ public class SynchronizerTests
 		};
 
 	private readonly Action<string> _noOp = _ => { };
+	private static readonly Stubs.Label EmptyLabel = new Stubs.Label(string.Empty, string.Empty, string.Empty);
 
 	[Fact]
 	public async Task ValidAccessReturnsSuccess()
@@ -300,6 +301,28 @@ public async Task GettingAccountLabelsDeletesTempRepoForUser()
 		Assert.StartsWith("temp-label-sync-20", tempRepoName);
 	}
 
+	[Fact]
+	public async Task GettingAccountLabelsWaitsUntilAllLabelsHaveBeenCreated()
+	{
+		//arrange
+		var gitHub = Substitute.For<IGitHub>();
+		var sync = new Synchronizer(gitHub, _noOp, _noOp);
+
+		var account = new Stubs.Organization("ecoAPM");
+		gitHub.GetLabels(Arg.Any<Repository>()).Returns(
+			new [] { EmptyLabel },
+			new [] { EmptyLabel, EmptyLabel },
+			new [] { EmptyLabel, EmptyLabel, EmptyLabel },
+			new [] { EmptyLabel, EmptyLabel, EmptyLabel }
+			);
+
+		//act
+		var labels = await sync.GetAccountLabels(account);
+
+		//assert
+		Assert.Equal(3, labels.Count);
+	}
+
 	[Fact]
 	public async Task PerformsCorrectActions()
 	{