Merge branch 'main' into dev/ilbiryuk/addListTunnelByRegionApi

microsoft · Sep 15, 2023 · 0da4815 · 0da4815
2 parents 4ac8e0a + 8faa5c3
commit 0da4815
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/cs/src/Contracts/TunnelPortV2.cs b/cs/src/Contracts/TunnelPortV2.cs
@@ -70,7 +70,7 @@ public TunnelPortV2()
     [MaxLength(MaxTags)]
     [ArrayStringLength(TagMaxLength, MinimumLength = TagMinLength)]
     [ArrayRegularExpression(TagPattern)]
-    public string[]? Tags { get; set; }
+    public string[]? Labels { get; set; }
 
     /// <summary>
     /// Gets or sets the protocol of the tunnel port.

diff --git a/go/tunnels/tunnel_port_v2.go b/go/tunnels/tunnel_port_v2.go
@@ -24,7 +24,7 @@ type TunnelPortV2 struct {
 	Description        string `json:"description,omitempty"`
 
 	// Gets or sets the tags of the port.
-	Tags               []string `json:"tags,omitempty"`
+	Labels             []string `json:"labels,omitempty"`
 
 	// Gets or sets the protocol of the tunnel port.
 	//

diff --git a/java/src/main/java/com/microsoft/tunnels/contracts/TunnelPortV2.java b/java/src/main/java/com/microsoft/tunnels/contracts/TunnelPortV2.java
@@ -47,7 +47,7 @@ public class TunnelPortV2 {
      * Gets or sets the tags of the port.
      */
     @Expose
-    public String[] tags;
+    public String[] labels;
 
     /**
      * Gets or sets the protocol of the tunnel port.

diff --git a/rs/src/contracts/tunnel_port_v2.rs b/rs/src/contracts/tunnel_port_v2.rs
@@ -31,7 +31,7 @@ pub struct TunnelPortV2 {
 
     // Gets or sets the tags of the port.
     #[serde(skip_serializing_if = "Vec::is_empty", default)]
-    pub tags: Vec<String>,
+    pub labels: Vec<String>,
 
     // Gets or sets the protocol of the tunnel port.
     //

diff --git a/ts/src/contracts/tunnelPortV2.ts b/ts/src/contracts/tunnelPortV2.ts
@@ -41,7 +41,7 @@ export interface TunnelPortV2 {
     /**
      * Gets or sets the tags of the port.
      */
-    tags?: string[];
+    labels?: string[];
 
     /**
      * Gets or sets the protocol of the tunnel port.