Fixup functional tests

Author: Porges

src/ApiService/FunctionalTests/1f-api/Node.cs

@@ -24,7 +24,7 @@ public class Node : IFromJsonElement<Node> {
 
     public string State => _e.GetStringProperty("state");
 
-    public Guid? ScalesetId => _e.GetNullableGuidProperty("scaleset_id");
+    public string? ScalesetId => _e.GetNullableStringProperty("scaleset_id");
     public bool ReimageRequested => _e.GetBoolProperty("reimage_requested");
     public bool DeleteRequested => _e.GetBoolProperty("delete_requested");
     public bool DebugKeepNode => _e.GetBoolProperty("debug_keep_node");
@@ -45,7 +45,7 @@ public async Task<BooleanResult> Update(Guid machineId, bool? debugKeepNode = nu
             .AddV("machine_id", machineId);
         return Return<BooleanResult>(await Post(j));
     }
-    public async Task<Result<IEnumerable<Node>, Error>> Get(Guid? machineId = null, IEnumerable<string>? state = null, Guid? scalesetId = null, string? poolName = null) {
+    public async Task<Result<IEnumerable<Node>, Error>> Get(Guid? machineId = null, IEnumerable<string>? state = null, string? scalesetId = null, string? poolName = null) {
         var j = new JsonObject()
             .AddIfNotNullV("machine_id", machineId)
             .AddIfNotNullEnumerableV("state", state)

src/ApiService/FunctionalTests/1f-api/Proxy.cs

@@ -91,7 +91,7 @@ public ProxyApi(Uri endpoint, Microsoft.OneFuzz.Service.Request request, ITestOu
         base(endpoint, "/api/proxy", request, output) {
     }
 
-    public async Task<Result<IEnumerable<Proxy>, Error>> Get(Guid? scalesetId = null, Guid? machineId = null, int? dstPort = null) {
+    public async Task<Result<IEnumerable<Proxy>, Error>> Get(string? scalesetId = null, Guid? machineId = null, int? dstPort = null) {
         var root = new JsonObject()
             .AddIfNotNullV("scaleset_id", scalesetId)
             .AddIfNotNullV("machine_id", machineId)
@@ -101,7 +101,7 @@ public async Task<Result<IEnumerable<Proxy>, Error>> Get(Guid? scalesetId = null
         return IEnumerableResult<Proxy>(r.GetProperty("proxies"));
     }
 
-    public async Task<BooleanResult> Delete(Guid scalesetId, Guid machineId, int? dstPort = null) {
+    public async Task<BooleanResult> Delete(string scalesetId, Guid machineId, int? dstPort = null) {
         var root = new JsonObject()
             .AddV("scaleset_id", scalesetId)
             .AddV("machine_id", machineId)
@@ -115,10 +115,10 @@ public async Task<BooleanResult> Reset(string region) {
         return Return<BooleanResult>(r);
     }
 
-    public async Task<Result<ProxyGetResult, Error>> Create(Guid scalesetId, Guid machineId, int dstPort, int duration) {
+    public async Task<Result<ProxyGetResult, Error>> Create(string scalesetId, Guid machineId, int dstPort, int duration) {
         var root = new JsonObject()
             .AddV("scaleset_id", scalesetId)
-            .AddV("machin_id", machineId)
+            .AddV("machine_id", machineId)
             .AddV("dst_port", dstPort)
             .AddV("duration", duration);
 

src/ApiService/FunctionalTests/1f-api/Scaleset.cs

@@ -23,7 +23,7 @@ public class Scaleset : IFromJsonElement<Scaleset> {
     public Scaleset(JsonElement e) => _e = e;
     public static Scaleset Convert(JsonElement e) => new(e);
 
-    public Guid ScalesetId => _e.GetGuidProperty("scaleset_id");
+    public string ScalesetId => _e.GetStringProperty("scaleset_id");
     public string PoolName => _e.GetStringProperty("pool_name");
     public string State => _e.GetStringProperty("state");
 
@@ -59,7 +59,7 @@ public ScalesetApi(Uri endpoint, Microsoft.OneFuzz.Service.Request request, ITes
         base(endpoint, "/api/Scaleset", request, output) { }
 
 
-    public async Task<Result<IEnumerable<Scaleset>, Error>> Get(Guid? id = null, string? state = null, bool? includeAuth = false) {
+    public async Task<Result<IEnumerable<Scaleset>, Error>> Get(string? id = null, string? state = null, bool? includeAuth = false) {
         var j = new JsonObject()
             .AddIfNotNullV("scaleset_id", id)
             .AddIfNotNullV("state", state)
@@ -84,22 +84,22 @@ public async Task<Result<Scaleset, Error>> Create(string poolName, int size, str
         return Result<Scaleset>(await Post(rootScalesetCreate));
     }
 
-    public async Task<Result<Scaleset, Error>> Patch(Guid id, int size) {
+    public async Task<Result<Scaleset, Error>> Patch(string id, int size) {
         var scalesetPatch = new JsonObject()
             .AddV("scaleset_id", id)
             .AddV("size", size);
         return Result<Scaleset>(await Patch(scalesetPatch));
     }
 
-    public async Task<BooleanResult> Delete(Guid id, bool now) {
+    public async Task<BooleanResult> Delete(string id, bool now) {
         var scalesetDelete = new JsonObject()
             .AddV("scaleset_id", id)
             .AddV("now", now);
         return Return<BooleanResult>(await Delete(scalesetDelete));
     }
 
 
-    public async Task<Scaleset> WaitWhile(Guid id, Func<Scaleset, bool> wait) {
+    public async Task<Scaleset> WaitWhile(string id, Func<Scaleset, bool> wait) {
         var currentState = "";
         Scaleset newScaleset;
         do {