Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for forwarded hostnames for core tools in Limelight #3654

Closed
wants to merge 1 commit into from
Closed

Support for forwarded hostnames for core tools in Limelight #3654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/Azure.Functions.Cli/Common/Constants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,9 @@ internal static class Constants
public const string LocalSettingsJsonFileName = "local.settings.json";
public const string EnableWorkerIndexEnvironmentVariableName = "FunctionsHostingConfig__WORKER_INDEXING_ENABLED";
public const string Dotnet = "dotnet";


public const string AzureDevSessionsRemoteHostName = "AzureDevSessionsRemoteHostName";
// Sample format https://n05gbs6t-<port>.asse.devtunnels.ms/


public static string CliVersion => typeof(Constants).GetTypeInfo().Assembly.GetName().Version.ToString(3);

Expand Down
25 changes: 23 additions & 2 deletions src/Azure.Functions.Cli/FunctionsLocalServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
using System;
using System.IO;
using System.Linq;
using System.Net.Http;
using System.Threading.Tasks;
using System.Text.RegularExpressions;
using Azure.Functions.Cli.Common;
using Azure.Functions.Cli.Extensions;
using Azure.Functions.Cli.Helpers;
Expand All @@ -22,6 +24,7 @@ internal class FunctionsLocalServer : IFunctionsLocalServer
private readonly IProcessManager _processManager;
private readonly ISettings _settings;
private readonly ISecretsManager _secretsManager;
private static readonly Regex regex = new Regex("<port>");

public FunctionsLocalServer(IProcessManager processManager, ISettings settings, ISecretsManager secretesManager)
{
Expand All @@ -45,17 +48,35 @@ public async Task<HttpClient> ConnectAsync(TimeSpan timeout, bool noInteractive)
private async Task<Uri> DiscoverServer(bool noInteractive)
{
var hostSettings = _secretsManager.GetHostStartSettings();

var hostUri = $"http://localhost:{hostSettings.LocalHttpPort}";

var forwardedHttpUrl = _secretsManager.GetSecrets().FirstOrDefault(
s => s.Key.Equals(Constants.AzureDevSessionsRemoteHostName, StringComparison.OrdinalIgnoreCase)).Value;
if (forwardedHttpUrl != null){
hostUri = regex.Replace(forwardedHttpUrl, "<port>", hostSettings.LocalHttpPort);
}

if (hostSettings.LocalHttpPort != default(int))
{
return new Uri($"http://localhost:{hostSettings.LocalHttpPort}");
return new Uri($"{hostUri}");
}

return await RecursiveDiscoverServer(0, noInteractive);
}

private async Task<Uri> RecursiveDiscoverServer(int iteration, bool noInteractive)
{
var server = new Uri($"http://localhost:{Port + iteration}");
var hostUri = $"http://localhost:{Port + iteration}";

var forwardedHttpUrl = _secretsManager.GetSecrets().FirstOrDefault(
s => s.Key.Equals(Constants.AzureDevSessionsRemoteHostName, StringComparison.OrdinalIgnoreCase)).Value;

if (forwardedHttpUrl != null){
hostUri = regex.Replace(forwardedHttpUrl, "<port>", Port + iteration);
}

var server = new Uri($"{hostUri}");

if (!await server.IsServerRunningAsync())
{
Expand Down
Loading