Replace FlakeId and Ksuid with recently open sourced Tingle.Extension…

…s.Primitives (#1027)
tinglesoftware · Mar 8, 2024 · 925737c · 925737c
1 parent 2cc118b
commit 925737c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/server/Tingle.Dependabot/AppSetup.cs b/server/Tingle.Dependabot/AppSetup.cs
@@ -3,6 +3,7 @@
 using System.Text.Json;
 using Tingle.Dependabot.Models;
 using Tingle.Dependabot.Workflow;
+using Tingle.Extensions.Primitives;
 
 namespace Tingle.Dependabot;
 
@@ -57,7 +58,7 @@ public static async Task SetupAsync(WebApplication app, CancellationToken cancel
             {
                 project = new Models.Management.Project
                 {
-                    Id = $"prj_{KSUID.Ksuid.Generate()}",
+                    Id = $"prj_{Ksuid.Generate()}",
                     Created = DateTimeOffset.UtcNow,
                     Password = GeneratePassword(32),
                     Url = setup.Url.ToString(),

diff --git a/server/Tingle.Dependabot/Consumers/TriggerUpdateJobsEventConsumer.cs b/server/Tingle.Dependabot/Consumers/TriggerUpdateJobsEventConsumer.cs
@@ -4,6 +4,7 @@
 using Tingle.Dependabot.Models.Management;
 using Tingle.Dependabot.Workflow;
 using Tingle.EventBus;
+using Tingle.Extensions.Primitives;
 
 namespace Tingle.Dependabot.Consumers;
 
@@ -74,7 +75,7 @@ public async Task ConsumeAsync(EventContext<TriggerUpdateJobsEvent> context, Can
                 {
                     // we use this to create azure resources which have name restrictions
                     // alphanumeric, starts with a letter, does not contain "--", up to 32 characters
-                    Id = $"job-{FlakeId.Id.Create()}", // flake is 19 chars, total is 23 chars
+                    Id = $"job-{SequenceNumber.Generate()}", // sequence number is 19 chars, total is 23 chars
 
                     Created = DateTimeOffset.UtcNow,
                     Status = UpdateJobStatus.Scheduled,

diff --git a/server/Tingle.Dependabot/Tingle.Dependabot.csproj b/server/Tingle.Dependabot/Tingle.Dependabot.csproj
@@ -23,8 +23,6 @@
     <PackageReference Include="Azure.Monitor.Query" Version="1.2.0" />
     <PackageReference Include="Azure.ResourceManager.AppContainers" Version="1.1.1" />
     <PackageReference Include="DistributedLock.FileSystem" Version="1.0.1" />
-    <PackageReference Include="FlakeId" Version="1.1.2" /> <!-- TODO: replace with Tingle.Extensions.Primitives -->
-    <PackageReference Include="Ksuid" Version="1.0.0" /> <!-- TODO: replace with Tingle.Extensions.Primitives -->
     <PackageReference Include="Macross.Json.Extensions" Version="3.0.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.1" />
@@ -39,6 +37,7 @@
     <PackageReference Include="Tingle.EventBus.Transports.Azure.ServiceBus" Version="0.21.1" />
     <PackageReference Include="Tingle.EventBus.Transports.InMemory" Version="0.21.1" />
     <PackageReference Include="Tingle.Extensions.DataAnnotations" Version="4.5.0" />
+    <PackageReference Include="Tingle.Extensions.Primitives" Version="4.6.0" />
     <PackageReference Include="Tingle.Extensions.Serilog" Version="4.5.0" />
     <PackageReference Include="Tingle.PeriodicTasks" Version="1.4.0" />
     <PackageReference Include="YamlDotNet" Version="15.1.2" />

diff --git a/server/Tingle.Dependabot/Workflow/Synchronizer.cs b/server/Tingle.Dependabot/Workflow/Synchronizer.cs
@@ -5,6 +5,7 @@
 using Tingle.Dependabot.Models.Dependabot;
 using Tingle.Dependabot.Models.Management;
 using Tingle.EventBus;
+using Tingle.Extensions.Primitives;
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
 
@@ -181,7 +182,7 @@ internal async Task SynchronizeAsync(Project project,
         {
             repository = new Repository
             {
-                Id = $"repo_{KSUID.Ksuid.Generate()}",
+                Id = $"repo_{Ksuid.Generate()}",
                 Created = DateTimeOffset.UtcNow,
                 ProjectId = project.Id,
                 ProviderId = providerInfo.Id,