next port finder made static

dotnet · Dec 2, 2020 · ac1e237 · ac1e237
1 parent abb10b1
commit ac1e237
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/src/Microsoft.Tye.Core/NextPortFinder.cs b/src/Microsoft.Tye.Core/NextPortFinder.cs
@@ -1,17 +1,15 @@
-using System.Net;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Net;
 using System.Net.Sockets;
 
 namespace Microsoft.Tye
 {
     public sealed class NextPortFinder
     {
-        public static NextPortFinder Instance { get; } = new NextPortFinder();
-
-        private NextPortFinder()
-        {
-        }
-
-        public int GetNextPort()
+        public static int GetNextPort()
         {
             // Let the OS assign the next available port. Unless we cycle through all ports
             // on a test run, the OS will always increment the port number when making these calls.

diff --git a/src/Microsoft.Tye.Extensions/Dapr/DaprExtension.cs b/src/Microsoft.Tye.Extensions/Dapr/DaprExtension.cs
@@ -23,7 +23,7 @@ public override Task ProcessAsync(ExtensionContext context, ExtensionConfigurati
                 // default placement port number
                 var daprPlacementImage = "daprio/dapr";
                 var daprPlacementContainerPort = 50005;
-                var daprPlacementPort = NextPortFinder.Instance.GetNextPort();
+                var daprPlacementPort = NextPortFinder.GetNextPort();
                 var isCustomPlacementPortDefined = false;
 
                 // see if a placement port number has been defined

diff --git a/src/Microsoft.Tye.Hosting/PortAssigner.cs b/src/Microsoft.Tye.Hosting/PortAssigner.cs
@@ -35,7 +35,7 @@ public Task StartAsync(Application application)
                     // Auto assign a port
                     if (binding.Port == null)
                     {
-                        binding.Port = NextPortFinder.Instance.GetNextPort();
+                        binding.Port = NextPortFinder.GetNextPort();
                     }
 
                     if (service.Description.Readiness == null && service.Description.Replicas == 1)
@@ -48,7 +48,7 @@ public Task StartAsync(Application application)
                     for (var i = 0; i < service.Description.Replicas; i++)
                     {
                         // Reserve a port for each replica
-                        var port = NextPortFinder.Instance.GetNextPort();
+                        var port = NextPortFinder.GetNextPort();
                         binding.ReplicaPorts.Add(port);
                     }