remove Uuid utils from Vpn.Proto

Author: deansheather

App/ViewModels/TrayWindowViewModel.cs

@@ -169,6 +169,9 @@ private void UpdateFromRpcModel(RpcModel rpcModel)
         List<AgentViewModel> agents = [];
         foreach (var agent in rpcModel.Agents)
         {
+            if (!Uuid.TryFrom(agent.Id.Span, out var uuid))
+                continue;
+
             // Find the FQDN with the least amount of dots and split it into
             // prefix and suffix.
             var fqdn = agent.Fqdn
@@ -195,7 +198,7 @@ private void UpdateFromRpcModel(RpcModel rpcModel)
 
             agents.Add(_agentViewModelFactory.Create(
                 this,
-                agent.ParseId(),
+                uuid,
                 fqdnPrefix,
                 fqdnSuffix,
                 connectionStatus,
@@ -207,18 +210,23 @@ private void UpdateFromRpcModel(RpcModel rpcModel)
         // dummy agent row.
         foreach (var workspace in rpcModel.Workspaces.Where(w =>
                      w.Status == Workspace.Types.Status.Stopped && !workspacesWithAgents.Contains(w.Id)))
+        {
+            if (!Uuid.TryFrom(workspace.Id.Span, out var uuid))
+                continue;
+
             agents.Add(_agentViewModelFactory.Create(
                 this,
                 // Workspace ID is fine as a stand-in here, it shouldn't
                 // conflict with any agent IDs.
-                workspace.ParseId(),
+                uuid,
                 // We assume that it's a single-agent workspace.
                 workspace.Name,
                 // TODO: this needs to get the suffix from the server
                 ".coder",
                 AgentConnectionStatus.Gray,
                 credentialModel.CoderUrl,
                 workspace.Name));
+        }
 
         // Sort by status green, red, gray, then by hostname.
         ModelUpdate.ApplyLists(Agents, agents, (a, b) =>

App/packages.lock.json

@@ -550,7 +550,6 @@
       "Coder.Desktop.Vpn.Proto": {
         "type": "Project",
         "dependencies": {
-          "Coder.Desktop.CoderSdk": "[1.0.0, )",
           "Google.Protobuf": "[3.29.3, )"
         }
       }

Tests.Vpn.Proto/packages.lock.json

@@ -73,13 +73,9 @@
         "resolved": "1.6.0",
         "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ=="
       },
-      "Coder.Desktop.CoderSdk": {
-        "type": "Project"
-      },
       "Coder.Desktop.Vpn.Proto": {
         "type": "Project",
         "dependencies": {
-          "Coder.Desktop.CoderSdk": "[1.0.0, )",
           "Google.Protobuf": "[3.29.3, )"
         }
       }

Tests.Vpn.Service/packages.lock.json

@@ -501,7 +501,6 @@
       "Coder.Desktop.Vpn.Proto": {
         "type": "Project",
         "dependencies": {
-          "Coder.Desktop.CoderSdk": "[1.0.0, )",
           "Google.Protobuf": "[3.29.3, )"
         }
       },

Tests.Vpn/packages.lock.json

@@ -108,9 +108,6 @@
         "resolved": "1.6.0",
         "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ=="
       },
-      "Coder.Desktop.CoderSdk": {
-        "type": "Project"
-      },
       "Coder.Desktop.Vpn": {
         "type": "Project",
         "dependencies": {
@@ -123,7 +120,6 @@
       "Coder.Desktop.Vpn.Proto": {
         "type": "Project",
         "dependencies": {
-          "Coder.Desktop.CoderSdk": "[1.0.0, )",
           "Google.Protobuf": "[3.29.3, )"
         }
       }

Vpn.DebugClient/packages.lock.json

@@ -42,9 +42,6 @@
         "resolved": "9.0.1",
         "contentHash": "uXf5o8eV/gtzDQY4lGROLFMWQvcViKcF8o4Q6KpIOjloAQXrnscQSu6gTxYJMHuNJnh7szIF9AzkaEq+zDLoEg=="
       },
-      "Coder.Desktop.CoderSdk": {
-        "type": "Project"
-      },
       "Coder.Desktop.Vpn": {
         "type": "Project",
         "dependencies": {
@@ -57,7 +54,6 @@
       "Coder.Desktop.Vpn.Proto": {
         "type": "Project",
         "dependencies": {
-          "Coder.Desktop.CoderSdk": "[1.0.0, )",
           "Google.Protobuf": "[3.29.3, )"
         }
       }

Vpn.Proto/Uuid.cs

@@ -21,8 +21,4 @@
         </PackageReference>
     </ItemGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\CoderSdk\CoderSdk.csproj" />
-    </ItemGroup>
-
 </Project>

Vpn.Proto/Vpn.Proto.csproj

@@ -444,7 +444,6 @@
       "Coder.Desktop.Vpn.Proto": {
         "type": "Project",
         "dependencies": {
-          "Coder.Desktop.CoderSdk": "[1.0.0, )",
           "Google.Protobuf": "[3.29.3, )"
         }
       }

Vpn.Service/packages.lock.json

@@ -45,13 +45,9 @@
         "resolved": "9.0.1",
         "contentHash": "bHtTesA4lrSGD1ZUaMIx6frU3wyy0vYtTa/hM6gGQu5QNrydObv8T5COiGUWsisflAfmsaFOe9Xvw5NSO99z0g=="
       },
-      "Coder.Desktop.CoderSdk": {
-        "type": "Project"
-      },
       "Coder.Desktop.Vpn.Proto": {
         "type": "Project",
         "dependencies": {
-          "Coder.Desktop.CoderSdk": "[1.0.0, )",
           "Google.Protobuf": "[3.29.3, )"
         }
       }