Rename variables

Author: liammclennan

src/SeqCli/Forwarder/Channel/ApiKeyForwardingChannelWrapper.cs

@@ -25,7 +25,7 @@ void LoadChannels()
     {
         foreach (var directoryPath in Directory.EnumerateDirectories(BufferPath))
         {
-            if (directoryPath.Equals(GetStorePath(SeqCliConnectionChannelName)))
+            if (directoryPath.Equals(GetStorePath(SeqCliConnectionChannelId)))
             {
                 // data was stored when not using API key forwarding
                 continue;
@@ -59,7 +59,7 @@ public override ForwardingChannel GetForwardingChannel(string? requestApiKey)
                 return channel;
             }
 
-            var channelId = ApiKeyToName(requestApiKey);
+            var channelId = ApiKeyToId(requestApiKey);
             var created = OpenOrCreateChannel(channelId, requestApiKey);
             var store = new SystemStoreDirectory(GetStorePath(channelId));
             store.WriteApiKey(Config, requestApiKey ?? "");
@@ -68,7 +68,7 @@ public override ForwardingChannel GetForwardingChannel(string? requestApiKey)
         }
     }
 
-    string ApiKeyToName(string? apiKey)
+    string ApiKeyToId(string? apiKey)
     {
         return string.IsNullOrEmpty(apiKey) ? EmptyApiKeyChannelId : Guid.NewGuid().ToString();
     }

src/SeqCli/Forwarder/Channel/ForwardingChannelWrapper.cs

@@ -11,17 +11,17 @@ namespace SeqCli.Forwarder.Channel;
 
 internal abstract class ForwardingChannelWrapper(string bufferPath, SeqConnection connection, SeqCliConfig config)
 {
-    protected const string SeqCliConnectionChannelName = "SeqCliConnection";
+    protected const string SeqCliConnectionChannelId = "SeqCliConnection";
     protected readonly string BufferPath = bufferPath;
     protected readonly SeqCliConfig Config = config;
     protected readonly CancellationTokenSource ShutdownTokenSource = new();
     protected readonly Lock ChannelsSync = new();
 
-    // <param name="name">The name used for the channel storage on the file system and in memory.</param>
+    // <param name="id">The id used for the channel storage on the file system.</param>
     // <param name="apiKey">The apiKey that will be used to connect to the downstream Seq instance.</param>
-    protected ForwardingChannel OpenOrCreateChannel(string name, string? apiKey)
+    protected ForwardingChannel OpenOrCreateChannel(string id, string? apiKey)
     {
-        var storePath = GetStorePath(name);
+        var storePath = GetStorePath(id);
         var store = new SystemStoreDirectory(storePath);
 
         Log.ForContext<ForwardingChannelWrapper>().Information("Opening local buffer in {StorePath}", storePath);
@@ -42,8 +42,8 @@ protected ForwardingChannel OpenOrCreateChannel(string name, string? apiKey)
 
     public abstract Task StopAsync();
 
-    protected string GetStorePath(string name)
+    protected string GetStorePath(string id)
     {
-        return Path.Combine(BufferPath, name);
+        return Path.Combine(BufferPath, id);
     }
 }

src/SeqCli/Forwarder/Channel/SeqCliConnectionForwardingChannelWrapper.cs

@@ -12,7 +12,7 @@ class SeqCliConnectionForwardingChannelWrapper: ForwardingChannelWrapper
 
     public SeqCliConnectionForwardingChannelWrapper(string bufferPath, SeqConnection connection, SeqCliConfig config, string? seqCliApiKey): base(bufferPath, connection, config)
     {
-        _seqCliConnectionChannel = OpenOrCreateChannel(SeqCliConnectionChannelName, seqCliApiKey);
+        _seqCliConnectionChannel = OpenOrCreateChannel(SeqCliConnectionChannelId, seqCliApiKey);
     }
 
     public override ForwardingChannel GetForwardingChannel(string? _)