diff --git a/test/E2ETest/TyeRunTests.cs b/test/E2ETest/TyeRunTests.cs index 09c09434..281b4bd1 100644 --- a/test/E2ETest/TyeRunTests.cs +++ b/test/E2ETest/TyeRunTests.cs @@ -1345,6 +1345,41 @@ services: }); } + [ConditionalFact] + [SkipIfDockerNotRunning] + public async Task RunWithDotnetEnvVarsSelectorForAnotherServiceReplacement() + { + using var projectDirectory = CopyTestProjectDirectory("environment-variable-replacement"); + + var projectFile = new FileInfo(Path.Combine(projectDirectory.DirectoryPath, "tye.yaml")); + var outputContext = new OutputContext(_sink, Verbosity.Debug); + var application = await ApplicationFactory.CreateAsync(outputContext, projectFile); + + var handler = new HttpClientHandler + { + ServerCertificateCustomValidationCallback = (a, b, c, d) => true, + AllowAutoRedirect = false + }; + + var client = new HttpClient(new RetryHandler(handler)); + + await RunHostingApplication(application, new HostOptions { Docker = true }, async (app, uri) => + { + var backendUri = await GetServiceUrl(client, uri, "test-project"); + + var backendResponse = await client.GetAsync(backendUri); + Assert.True(backendResponse.IsSuccessStatusCode); + + var response = await backendResponse.Content.ReadAsStringAsync(); + var dict = JsonSerializer.Deserialize>(response); + + Assert.Contains(new KeyValuePair("REDIS_CONNECTIONSTRING", "host.docker.internal:6379:mysupersecureP@ssword"), dict); + Assert.Contains(new KeyValuePair("DOTNET_ENVIRONMENT", "dev"), dict); + Assert.Contains(new KeyValuePair("ASPNETCORE_ENVIRONMENT", "dev"), dict); + }); + } + + private async Task GetServiceUrl(HttpClient client, Uri uri, string serviceName) { var serviceResult = await client.GetStringAsync($"{uri}api/v1/services/{serviceName}"); diff --git a/test/E2ETest/testassets/projects/environment-variable-replacement/single-project.sln b/test/E2ETest/testassets/projects/environment-variable-replacement/single-project.sln new file mode 100644 index 00000000..b6c03cfb --- /dev/null +++ b/test/E2ETest/testassets/projects/environment-variable-replacement/single-project.sln @@ -0,0 +1,34 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test-project", "test-project\test-project.csproj", "{7D3606B2-7B8E-4ABB-BE0A-E0B18285D8F5}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7D3606B2-7B8E-4ABB-BE0A-E0B18285D8F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7D3606B2-7B8E-4ABB-BE0A-E0B18285D8F5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7D3606B2-7B8E-4ABB-BE0A-E0B18285D8F5}.Debug|x64.ActiveCfg = Debug|Any CPU + {7D3606B2-7B8E-4ABB-BE0A-E0B18285D8F5}.Debug|x64.Build.0 = Debug|Any CPU + {7D3606B2-7B8E-4ABB-BE0A-E0B18285D8F5}.Debug|x86.ActiveCfg = Debug|Any CPU + {7D3606B2-7B8E-4ABB-BE0A-E0B18285D8F5}.Debug|x86.Build.0 = Debug|Any CPU + {7D3606B2-7B8E-4ABB-BE0A-E0B18285D8F5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7D3606B2-7B8E-4ABB-BE0A-E0B18285D8F5}.Release|Any CPU.Build.0 = Release|Any CPU + {7D3606B2-7B8E-4ABB-BE0A-E0B18285D8F5}.Release|x64.ActiveCfg = Release|Any CPU + {7D3606B2-7B8E-4ABB-BE0A-E0B18285D8F5}.Release|x64.Build.0 = Release|Any CPU + {7D3606B2-7B8E-4ABB-BE0A-E0B18285D8F5}.Release|x86.ActiveCfg = Release|Any CPU + {7D3606B2-7B8E-4ABB-BE0A-E0B18285D8F5}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal diff --git a/test/E2ETest/testassets/projects/environment-variable-replacement/test-project/Program.cs b/test/E2ETest/testassets/projects/environment-variable-replacement/test-project/Program.cs new file mode 100644 index 00000000..3aefed92 --- /dev/null +++ b/test/E2ETest/testassets/projects/environment-variable-replacement/test-project/Program.cs @@ -0,0 +1,30 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; + +namespace test_project +{ + public class Program + { + public static void Main(string[] args) + { + CreateHostBuilder(args).Build().Run(); + } + + public static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }); + } +} diff --git a/test/E2ETest/testassets/projects/environment-variable-replacement/test-project/Properties/launchSettings.json b/test/E2ETest/testassets/projects/environment-variable-replacement/test-project/Properties/launchSettings.json new file mode 100644 index 00000000..990224ac --- /dev/null +++ b/test/E2ETest/testassets/projects/environment-variable-replacement/test-project/Properties/launchSettings.json @@ -0,0 +1,27 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:18482", + "sslPort": 44344 + } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "test_project": { + "commandName": "Project", + "launchBrowser": true, + "applicationUrl": "https://localhost:5001;http://localhost:5000", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/test/E2ETest/testassets/projects/environment-variable-replacement/test-project/Startup.cs b/test/E2ETest/testassets/projects/environment-variable-replacement/test-project/Startup.cs new file mode 100644 index 00000000..6565092e --- /dev/null +++ b/test/E2ETest/testassets/projects/environment-variable-replacement/test-project/Startup.cs @@ -0,0 +1,47 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; + +namespace test_project +{ + public class Startup + { + // This method gets called by the runtime. Use this method to add services to the container. + // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 + public void ConfigureServices(IServiceCollection services) + { + } + + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. + public void Configure(IApplicationBuilder app, IWebHostEnvironment env) + { + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + } + + app.UseRouting(); + + app.UseEndpoints(endpoints => + { + endpoints.MapGet("/", + () => Results.Json(new Dictionary + { + { "DOTNET_ENVIRONMENT", Environment.GetEnvironmentVariable("DOTNET_ENVIRONMENT") }, + { "ASPNETCORE_ENVIRONMENT", Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") }, + { "REDIS_CONNECTIONSTRING", Environment.GetEnvironmentVariable("REDIS_CONNECTIONSTRING") } + })); + }); + } + } +} diff --git a/test/E2ETest/testassets/projects/environment-variable-replacement/test-project/test-project.csproj b/test/E2ETest/testassets/projects/environment-variable-replacement/test-project/test-project.csproj new file mode 100644 index 00000000..4d2984aa --- /dev/null +++ b/test/E2ETest/testassets/projects/environment-variable-replacement/test-project/test-project.csproj @@ -0,0 +1,8 @@ + + + + net6.0 + test_project + + + diff --git a/test/E2ETest/testassets/projects/environment-variable-replacement/tye.yaml b/test/E2ETest/testassets/projects/environment-variable-replacement/tye.yaml new file mode 100644 index 00000000..e3ec5620 --- /dev/null +++ b/test/E2ETest/testassets/projects/environment-variable-replacement/tye.yaml @@ -0,0 +1,23 @@ +# tye application configuration file +# read all about it at https://github.com/dotnet/tye +name: dotnet-env-replacement +dashboardPort: 8090 +services: +- name: test-project + project: test-project/test-project.csproj + env: + - name: DOTNET_ENVIRONMENT + value: "dev" + - name: ASPNETCORE_ENVIRONMENT + value: "dev" + - name: REDIS_CONNECTIONSTRING + value: "${service:redis:connectionString}" +- name: redis + image: redis + env: + - name: RANDOMPASSWORD + value: "mysupersecureP@ssword" + bindings: + - port: 6379 + connectionString: ${host}:${port}:${env:RANDOMPASSWORD} #I know not a real password, but I just want to prove the relacement +