cli: update dev tunnel sdk (microsoft#203763)

Author: connor4312

cli/Cargo.lock

@@ -34,7 +34,7 @@ serde_bytes = "0.11.9"
 chrono = { version = "0.4.26", features = ["serde", "std", "clock"], default-features = false }
 gethostname = "0.4.3"
 libc = "0.2.144"
-tunnels = { git = "https://github.com/microsoft/dev-tunnels", rev = "97233d20448e1c3cb0e0fd9114acf68c7e5c0249", default-features = false, features = ["connections"] }
+tunnels = { git = "https://github.com/microsoft/dev-tunnels", rev = "c1bf1424846ce3a1297ed3be7b8401cef6904bee", default-features = false, features = ["connections"] }
 keyring = { version = "2.0.3", default-features = false, features = ["linux-secret-service-rt-tokio-crypto-openssl"] }
 dialoguer = "0.10.4"
 hyper = { version = "0.14.26", features = ["server", "http1", "runtime"] }

cli/Cargo.toml

@@ -409,14 +409,14 @@ impl DevTunnels {
 			}
 		}?;
 
-		let desired_tags = self.get_tags(&name);
-		if is_new || vec_eq_as_set(&full_tunnel.tags, &desired_tags) {
+		let desired_tags = self.get_labels(&name);
+		if is_new || vec_eq_as_set(&full_tunnel.labels, &desired_tags) {
 			return Ok((full_tunnel, persisted));
 		}
 
 		debug!(self.log, "Tunnel name changed, applying updates...");
 
-		full_tunnel.tags = desired_tags;
+		full_tunnel.labels = desired_tags;
 
 		let updated_tunnel = spanf!(
 			self.log,
@@ -531,7 +531,6 @@ impl DevTunnels {
 			let fut = self.client.delete_tunnel_endpoints(
 				&locator,
 				&endpoint.host_id,
-				None,
 				NO_REQUEST_OPTIONS,
 			);
 
@@ -572,52 +571,51 @@ impl DevTunnels {
 				)
 				.map_err(|e| wrap(e, "failed to lookup tunnel"))?
 			}
-			None => {
-				let new_tunnel = Tunnel {
-					tags: self.get_tags(name),
-					..Default::default()
-				};
-
-				loop {
-					let result = spanf!(
-						self.log,
-						self.log.span("dev-tunnel.create"),
-						self.client.create_tunnel(&new_tunnel, options)
-					);
-
-					match result {
-						Err(HttpError::ResponseError(e))
-							if e.status_code == StatusCode::TOO_MANY_REQUESTS =>
-						{
-							if let Some(d) = e.get_details() {
-								let detail = d.detail.unwrap_or_else(|| "unknown".to_string());
-								if detail.contains(TUNNEL_COUNT_LIMIT_NAME)
-									&& self.try_recycle_tunnel().await?
-								{
-									continue;
-								}
-
-								return Err(AnyError::from(TunnelCreationFailed(
-									name.to_string(),
-									detail,
-								)));
+			None => loop {
+				let result = spanf!(
+					self.log,
+					self.log.span("dev-tunnel.create"),
+					self.client.create_tunnel(
+						Tunnel {
+							labels: self.get_labels(name),
+							..Default::default()
+						},
+						options
+					)
+				);
+
+				match result {
+					Err(HttpError::ResponseError(e))
+						if e.status_code == StatusCode::TOO_MANY_REQUESTS =>
+					{
+						if let Some(d) = e.get_details() {
+							let detail = d.detail.unwrap_or_else(|| "unknown".to_string());
+							if detail.contains(TUNNEL_COUNT_LIMIT_NAME)
+								&& self.try_recycle_tunnel().await?
+							{
+								continue;
 							}
 
 							return Err(AnyError::from(TunnelCreationFailed(
 								name.to_string(),
-								"You have exceeded a limit for the port fowarding service. Please remove other machines before trying to add this machine.".to_string(),
+								detail,
 							)));
 						}
-						Err(e) => {
-							return Err(AnyError::from(TunnelCreationFailed(
+
+						return Err(AnyError::from(TunnelCreationFailed(
 								name.to_string(),
-								format!("{:?}", e),
-							)))
-						}
-						Ok(t) => break t,
+								"You have exceeded a limit for the port fowarding service. Please remove other machines before trying to add this machine.".to_string(),
+							)));
 					}
+					Err(e) => {
+						return Err(AnyError::from(TunnelCreationFailed(
+							name.to_string(),
+							format!("{:?}", e),
+						)))
+					}
+					Ok(t) => break t,
 				}
-			}
+			},
 		};
 
 		let pt = PersistedTunnel {
@@ -631,7 +629,7 @@ impl DevTunnels {
 	}
 
 	/// Gets the expected tunnel tags
-	fn get_tags(&self, name: &str) -> Vec<String> {
+	fn get_labels(&self, name: &str) -> Vec<String> {
 		vec![
 			name.to_string(),
 			PROTOCOL_VERSION_TAG.to_string(),
@@ -649,20 +647,20 @@ impl DevTunnels {
 		tunnel: Tunnel,
 		options: &TunnelRequestOptions,
 	) -> Result<Tunnel, AnyError> {
-		let new_tags = self.get_tags(name);
-		if vec_eq_as_set(&tunnel.tags, &new_tags) {
+		let new_labels = self.get_labels(name);
+		if vec_eq_as_set(&tunnel.labels, &new_labels) {
 			return Ok(tunnel);
 		}
 
 		debug!(
 			self.log,
 			"Updating tunnel tags {} -> {}",
-			tunnel.tags.join(", "),
-			new_tags.join(", ")
+			tunnel.labels.join(", "),
+			new_labels.join(", ")
 		);
 
 		let tunnel_update = Tunnel {
-			tags: new_tags,
+			labels: new_labels,
 			tunnel_id: tunnel.tunnel_id.clone(),
 			cluster_id: tunnel.cluster_id.clone(),
 			..Default::default()
@@ -725,7 +723,7 @@ impl DevTunnels {
 			self.log,
 			self.log.span("dev-tunnel.listall"),
 			self.client.list_all_tunnels(&TunnelRequestOptions {
-				tags: tags.iter().map(|t| t.to_string()).collect(),
+				labels: tags.iter().map(|t| t.to_string()).collect(),
 				..Default::default()
 			})
 		)
@@ -739,8 +737,8 @@ impl DevTunnels {
 			self.log,
 			self.log.span("dev-tunnel.rename.search"),
 			self.client.list_all_tunnels(&TunnelRequestOptions {
-				tags: vec![self.tag.to_string(), name.to_string()],
-				require_all_tags: true,
+				labels: vec![self.tag.to_string(), name.to_string()],
+				require_all_labels: true,
 				limit: 1,
 				include_ports: true,
 				token_scopes: vec!["host".to_string()],
@@ -770,7 +768,7 @@ impl DevTunnels {
 				v.status
 					.as_ref()
 					.and_then(|s| s.host_connection_count.as_ref().map(|c| c.get_count()))
-					.unwrap_or(0) > 0 && v.tags.iter().any(|t| t == n)
+					.unwrap_or(0) > 0 && v.labels.iter().any(|t| t == n)
 			})
 		};