[CherryPick]: Replace environment variable only for dab start

src/Cli.Tests/EndToEndTests.cs

@@ -33,6 +33,8 @@ public void TestInitialize()
         _cliLogger = loggerFactory.CreateLogger<Program>();
         SetLoggerForCliConfigGenerator(loggerFactory.CreateLogger<ConfigGenerator>());
         SetCliUtilsLogger(loggerFactory.CreateLogger<Utils>());
+
+        Environment.SetEnvironmentVariable($"connection-string", TEST_CONNECTION_STRING);
     }
 
     [TestCleanup]
@@ -50,7 +52,7 @@ public void TestCleanup()
     public Task TestInitForCosmosDBNoSql()
     {
         string[] args = { "init", "-c", TEST_RUNTIME_CONFIG_FILE, "--database-type", "cosmosdb_nosql",
-                          "--connection-string", "localhost:5000", "--cosmosdb_nosql-database",
+                          "--connection-string", TEST_ENV_CONN_STRING, "--cosmosdb_nosql-database",
                           "graphqldb", "--cosmosdb_nosql-container", "planet", "--graphql-schema", TEST_SCHEMA_FILE, "--cors-origin", "localhost:3000,www.nolocalhost.com:80" };
         Program.Execute(args, _cliLogger!, _fileSystem!, _runtimeConfigLoader!);
 
@@ -107,7 +109,10 @@ public void TestInitializingRestAndGraphQLGlobalSettings()
         string[] args = { "init", "-c", TEST_RUNTIME_CONFIG_FILE, "--database-type", "mssql", "--rest.path", "/rest-api", "--rest.disabled", "--graphql.path", "/graphql-api" };
         Program.Execute(args, _cliLogger!, _fileSystem!, _runtimeConfigLoader!);
 
-        Assert.IsTrue(_runtimeConfigLoader!.TryLoadConfig(TEST_RUNTIME_CONFIG_FILE, out RuntimeConfig? runtimeConfig));
+        Assert.IsTrue(_runtimeConfigLoader!.TryLoadConfig(
+            TEST_RUNTIME_CONFIG_FILE,
+            out RuntimeConfig? runtimeConfig,
+            replaceEnvVar: true));
 
         Assert.IsNotNull(runtimeConfig);
         Assert.AreEqual(DatabaseType.MSSQL, runtimeConfig.DataSource.DatabaseType);
@@ -124,7 +129,8 @@ public void TestInitializingRestAndGraphQLGlobalSettings()
     [TestMethod]
     public void TestAddEntity()
     {
-        string[] initArgs = { "init", "-c", TEST_RUNTIME_CONFIG_FILE, "--host-mode", "development", "--database-type", "mssql", "--connection-string", "localhost:5000", "--auth.provider", "StaticWebApps" };
+        string[] initArgs = { "init", "-c", TEST_RUNTIME_CONFIG_FILE, "--host-mode", "development", "--database-type",
+            "mssql", "--connection-string", TEST_ENV_CONN_STRING, "--auth.provider", "StaticWebApps" };
         Program.Execute(initArgs, _cliLogger!, _fileSystem!, _runtimeConfigLoader!);
 
         Assert.IsTrue(_runtimeConfigLoader!.TryLoadConfig(TEST_RUNTIME_CONFIG_FILE, out RuntimeConfig? runtimeConfig));
@@ -140,6 +146,7 @@ public void TestAddEntity()
 
         Assert.IsTrue(_runtimeConfigLoader!.TryLoadConfig(TEST_RUNTIME_CONFIG_FILE, out RuntimeConfig? addRuntimeConfig));
         Assert.IsNotNull(addRuntimeConfig);
+        Assert.AreEqual(TEST_ENV_CONN_STRING, addRuntimeConfig.DataSource.ConnectionString);
         Assert.AreEqual(1, addRuntimeConfig.Entities.Count()); // 1 new entity added
         Assert.IsTrue(addRuntimeConfig.Entities.ContainsKey("todo"));
         Entity entity = addRuntimeConfig.Entities["todo"];
@@ -374,7 +381,7 @@ public Task TestConfigGeneratedAfterAddingEntityWithSourceWithDefaultType()
     public void TestUpdateEntity()
     {
         string[] initArgs = { "init", "-c", TEST_RUNTIME_CONFIG_FILE, "--database-type",
-                              "mssql", "--connection-string", "localhost:5000" };
+                              "mssql", "--connection-string", TEST_ENV_CONN_STRING };
         Program.Execute(initArgs, _cliLogger!, _fileSystem!, _runtimeConfigLoader!);
 
         Assert.IsTrue(_runtimeConfigLoader!.TryLoadConfig(TEST_RUNTIME_CONFIG_FILE, out RuntimeConfig? runtimeConfig));
@@ -416,6 +423,7 @@ public void TestUpdateEntity()
 
         Assert.IsTrue(_runtimeConfigLoader!.TryLoadConfig(TEST_RUNTIME_CONFIG_FILE, out RuntimeConfig? updateRuntimeConfig));
         Assert.IsNotNull(updateRuntimeConfig);
+        Assert.AreEqual(TEST_ENV_CONN_STRING, updateRuntimeConfig.DataSource.ConnectionString);
         Assert.AreEqual(2, updateRuntimeConfig.Entities.Count()); // No new entity added
 
         Assert.IsTrue(updateRuntimeConfig.Entities.ContainsKey("todo"));

src/Cli.Tests/EnvironmentTests.cs

@@ -123,7 +123,8 @@ public void TestSystemEnvironmentVariableIsUsedInAbsenceOfEnvironmentFile()
     [TestMethod]
     public void TestStartWithEnvFileIsSuccessful()
     {
-        BootstrapTestEnvironment("CONN_STRING=test_connection_string");
+        string expectedEnvVarName = "CONN_STRING";
+        BootstrapTestEnvironment(expectedEnvVarName + "=test_connection_string", expectedEnvVarName);
 
         // Trying to start the runtime engine
         using Process process = ExecuteDabCommand(
@@ -148,10 +149,11 @@ public void TestStartWithEnvFileIsSuccessful()
     /// I feel confident that the overarching scenario is covered through other testing
     /// so disabling temporarily while we investigate should be acceptable.
     /// </summary>
-    [TestMethod, Ignore]
+    [TestMethod]
     public async Task FailureToStartEngineWhenEnvVarNamedWrong()
     {
-        BootstrapTestEnvironment("COMM_STRINX=test_connection_string");
+        string expectedEnvVarName = "WRONG_CONN_STRING";
+        BootstrapTestEnvironment("COMM_STRINX=test_connection_string", expectedEnvVarName);
 
         // Trying to start the runtime engine
         using Process process = ExecuteDabCommand(
@@ -160,11 +162,12 @@ public async Task FailureToStartEngineWhenEnvVarNamedWrong()
         );
 
         string? output = await process.StandardError.ReadLineAsync();
-        StringAssert.Contains(output, "Environmental Variable, CONN_STRING, not found.", StringComparison.Ordinal);
+        StringAssert.Contains(output, "Environmental Variable, "
+            + expectedEnvVarName + ", not found.", StringComparison.Ordinal);
         process.Kill();
     }
 
-    private static void BootstrapTestEnvironment(string envFileContents)
+    private static void BootstrapTestEnvironment(string envFileContents, string connStringEnvName)
     {
         // Creating environment variable file
         File.Create(".env").Close();
@@ -174,7 +177,8 @@ private static void BootstrapTestEnvironment(string envFileContents)
             File.Delete(TEST_RUNTIME_CONFIG_FILE);
         }
 
-        string[] initArgs = { "init", "-c", TEST_RUNTIME_CONFIG_FILE, "--database-type", "mssql", "--connection-string", "@env('CONN_STRING')" };
+        string[] initArgs = { "init", "-c", TEST_RUNTIME_CONFIG_FILE, "--database-type", "mssql",
+            "--connection-string", "@env('" + connStringEnvName + "')" };
         Program.Main(initArgs);
     }
 

src/Cli.Tests/TestHelper.cs

@@ -8,6 +8,9 @@ public static class TestHelper
         // Config file name for tests
         public const string TEST_RUNTIME_CONFIG_FILE = "dab-config-test.json";
 
+        public const string TEST_CONNECTION_STRING = "testconnectionstring";
+        public const string TEST_ENV_CONN_STRING = "@env('connection-string')";
+
         // test schema for cosmosDB
         public const string TEST_SCHEMA_FILE = "test-schema.gql";
         public const string DAB_DRAFT_SCHEMA_TEST_PATH = "https://github.com/Azure/data-api-builder/releases/download/vmajor.minor.patch/dab.draft.schema.json";
@@ -39,6 +42,7 @@ public static Process ExecuteDabCommand(string command, string flags)
                 StartInfo =
                 {
                     FileName = @"./Microsoft.DataApiBuilder",
+                    CreateNoWindow = true,
                     Arguments = $"{command} {flags}",
                     WindowStyle = ProcessWindowStyle.Hidden,
                     UseShellExecute = false,

src/Cli/ConfigGenerator.cs

@@ -968,7 +968,8 @@ public static bool TryStartEngineWithOptions(StartOptions options, FileSystemRun
             loader.UpdateBaseConfigFileName(runtimeConfigFile);
 
             // Validates that config file has data and follows the correct json schema
-            if (!loader.TryLoadKnownConfig(out RuntimeConfig? deserializedRuntimeConfig))
+            // Replaces all the environment variables while deserializing when starting DAB.
+            if (!loader.TryLoadKnownConfig(out RuntimeConfig? deserializedRuntimeConfig, replaceEnvVar: true))
             {
                 _logger.LogError("Failed to parse the config file: {configFile}.", runtimeConfigFile);
                 return false;

src/Cli/Exporter.cs

@@ -26,7 +26,10 @@ public static void Export(ExportOptions options, ILogger logger, FileSystemRunti
                 return;
             }
 
-            if (!loader.TryLoadConfig(runtimeConfigFile, out RuntimeConfig? runtimeConfig) || runtimeConfig is null)
+            if (!loader.TryLoadConfig(
+                    runtimeConfigFile,
+                    out RuntimeConfig? runtimeConfig,
+                    replaceEnvVar: true) || runtimeConfig is null)
             {
                 logger.LogError("Failed to read the config file: {runtimeConfigFile}.", runtimeConfigFile);
                 return;