microsoft · jfullerton44 · Oct 11, 2023 · Sep 25, 2023 · Sep 25, 2023 · Sep 25, 2023
diff --git a/cs/src/Connections/TunnelRelayTunnelHost.cs b/cs/src/Connections/TunnelRelayTunnelHost.cs
@@ -50,6 +50,7 @@ public class TunnelRelayTunnelHost : TunnelHost, IRelayClient
 
     private SshClientSession? hostSession;
     private Uri? relayUri;
+    private string endpointId { get { return hostId + "-relay"; } }
 
     /// <summary>
     /// Creates a new instance of a host that connects to a tunnel via a tunnel relay.
@@ -92,7 +93,7 @@ public override async ValueTask DisposeAsync()
 
         if (Tunnel != null)
         {
-            tasks.Add(ManagementClient!.DeleteTunnelEndpointsAsync(Tunnel, this.hostId, TunnelConnectionMode.TunnelRelay));
+            tasks.Add(ManagementClient!.DeleteTunnelEndpointsAsync(Tunnel, endpointId));
         }
 
         foreach (RemotePortForwarder forwarder in RemoteForwarders.Values)
@@ -123,6 +124,7 @@ protected override async Task<ITunnelConnector> CreateTunnelConnectorAsync(Cance
         var endpoint = new TunnelRelayTunnelEndpoint
         {
             HostId = this.hostId,
+            Id = this.endpointId,
             HostPublicKeys = hostPublicKeys,
         };
         List<KeyValuePair<string, string>>? additionalQueryParams = null;

diff --git a/cs/src/Contracts/Tunnel.cs b/cs/src/Contracts/Tunnel.cs
@@ -37,8 +37,8 @@ public Tunnel()
     /// Gets or sets the generated ID of the tunnel, unique within the cluster.
     /// </summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [RegularExpression(OldTunnelIdPattern)]
-    [StringLength(OldTunnelIdLength, MinimumLength = OldTunnelIdLength)]
+    [RegularExpression(NewTunnelIdPattern)]
+    [StringLength(NewTunnelIdMaxLength, MinimumLength = NewTunnelIdMinLength)]
     public string? TunnelId { get; set; }
 
     /// <summary>
@@ -61,13 +61,13 @@ public Tunnel()
     public string? Description { get; set; }
 
     /// <summary>
-    /// Gets or sets the tags of the tunnel.
+    /// Gets or sets the labels of the tunnel.
     /// </summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [MaxLength(MaxTags)]
-    [ArrayStringLength(TagMaxLength, MinimumLength = TagMinLength)]
-    [ArrayRegularExpression(TagPattern)]
-    public string[]? Tags { get; set; }
+    [MaxLength(MaxLabels)]
+    [ArrayStringLength(LabelMaxLength, MinimumLength = LabelMinLength)]
+    [ArrayRegularExpression(LabelPattern)]
+    public string[]? Labels { get; set; }
 
     /// <summary>
     /// Gets or sets the optional parent domain of the tunnel, if it is not using

diff --git a/cs/src/Contracts/TunnelConstraints.cs b/cs/src/Contracts/TunnelConstraints.cs
@@ -72,23 +72,23 @@ public static class TunnelConstraints
     /// <summary>
     /// Min length of a single tunnel or port tag.
     /// </summary>
-    /// <seealso cref="Tunnel.Tags"/>
-    /// <seealso cref="TunnelPort.Tags"/>
-    public const int TagMinLength = 1;
+    /// <seealso cref="Tunnel.Labels"/>
+    /// <seealso cref="TunnelPort.Labels"/>
+    public const int LabelMinLength = 1;
 
     /// <summary>
     /// Max length of a single tunnel or port tag.
     /// </summary>
-    /// <seealso cref="Tunnel.Tags"/>
-    /// <seealso cref="TunnelPort.Tags"/>
-    public const int TagMaxLength = 50;
+    /// <seealso cref="Tunnel.Labels"/>
+    /// <seealso cref="TunnelPort.Labels"/>
+    public const int LabelMaxLength = 50;
 
     /// <summary>
-    /// Maximum number of tags that can be applied to a tunnel or port.
+    /// Maximum number of labels that can be applied to a tunnel or port.
     /// </summary>
-    /// <seealso cref="Tunnel.Tags"/>
-    /// <seealso cref="TunnelPort.Tags"/>
-    public const int MaxTags = 100;
+    /// <seealso cref="Tunnel.Labels"/>
+    /// <seealso cref="TunnelPort.Labels"/>
+    public const int MaxLabels = 100;
 
     /// <summary>
     /// Min length of a tunnel domain.
@@ -265,17 +265,17 @@ public static class TunnelConstraints
     public static Regex TunnelNameRegex { get; } = new Regex(TunnelNamePattern);
 
     /// <summary>
-    /// Regular expression that can match or validate tunnel or port tags.
+    /// Regular expression that can match or validate tunnel or port labels.
     /// </summary>
-    /// <seealso cref="TunnelPort.Tags"/>
-    public const string TagPattern = "[\\w-=]{1,50}";
+    /// <seealso cref="TunnelPort.Labels"/>
+    public const string LabelPattern = "[\\w-=]{1,50}";
 
     /// <summary>
-    /// Regular expression that can match or validate tunnel or port tags.
+    /// Regular expression that can match or validate tunnel or port labels.
     /// </summary>
-    /// <seealso cref="Tunnel.Tags"/>
-    /// <seealso cref="TunnelPort.Tags"/>
-    public static Regex TagRegex { get; } = new Regex(TagPattern);
+    /// <seealso cref="Tunnel.Labels"/>
+    /// <seealso cref="TunnelPort.Labels"/>
+    public static Regex LabelRegex { get; } = new Regex(LabelPattern);
 
     /// <summary>
     /// Regular expression that can match or validate tunnel domains.
@@ -422,7 +422,7 @@ public static bool IsValidTag(string tag)
             return false;
         }
 
-        var m = TagRegex.Match(tag);
+        var m = LabelRegex.Match(tag);
         return m.Index == 0 && m.Length == tag.Length;
     }
 

diff --git a/cs/src/Contracts/TunnelListByRegion.cs b/cs/src/Contracts/TunnelListByRegion.cs
@@ -29,7 +29,7 @@ public  class TunnelListByRegion
     /// List of tunnels.
     /// </summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public TunnelV2[]? Value { get; set; }
+    public Tunnel[]? Value { get; set; }
 
     /// <summary>
     /// Error detail if getting list of tunnels in the region failed.

diff --git a/cs/src/Contracts/TunnelListResponse.cs b/cs/src/Contracts/TunnelListResponse.cs
diff --git a/cs/src/Contracts/TunnelPort.cs b/cs/src/Contracts/TunnelPort.cs
@@ -36,8 +36,8 @@ public TunnelPort()
     /// Gets or sets the generated ID of the tunnel, unique within the cluster.
     /// </summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [RegularExpression(OldTunnelIdPattern)]
-    [StringLength(OldTunnelIdLength, MinimumLength = OldTunnelIdLength)]
+    [RegularExpression(NewTunnelIdPattern)]
+    [StringLength(NewTunnelIdMaxLength, MinimumLength = NewTunnelIdMinLength)]
     public string? TunnelId { get; set; }
 
     /// <summary>
@@ -64,13 +64,13 @@ public TunnelPort()
     public string? Description { get; set; }
 
     /// <summary>
-    /// Gets or sets the tags of the port.
+    /// Gets or sets the labels of the port.
     /// </summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    [MaxLength(MaxTags)]
-    [ArrayStringLength(TagMaxLength, MinimumLength = TagMinLength)]
-    [ArrayRegularExpression(TagPattern)]
-    public string[]? Tags { get; set; }
+    [MaxLength(MaxLabels)]
+    [ArrayStringLength(LabelMaxLength, MinimumLength = LabelMinLength)]
+    [ArrayRegularExpression(LabelPattern)]
+    public string[]? Labels { get; set; }
 
     /// <summary>
     /// Gets or sets the protocol of the tunnel port.

diff --git a/cs/src/Contracts/TunnelPortListResponse.cs b/cs/src/Contracts/TunnelPortListResponse.cs
@@ -19,14 +19,14 @@ public class TunnelPortListResponse
     /// </summary>
     public TunnelPortListResponse()
     {
-        Value = Array.Empty<TunnelPortV2>();
+        Value = Array.Empty<TunnelPort>();
     }
 
     /// <summary>
     /// List of tunnels
     /// </summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public TunnelPortV2[] Value { get; set; }
+    public TunnelPort[] Value { get; set; }
 
     /// <summary>
     /// Link to get next page of results

diff --git a/cs/src/Contracts/TunnelPortV2.cs b/cs/src/Contracts/TunnelPortV2.cs