Add the AZD_TEMPLATE parameter in the configuration. When the value i…

…s enable, azd template logic will be used when configuring SQL Server, otherwise locally logic will be used.
gilseara · Feb 7, 2023 · cdc079a · cdc079a
1 parent 2a67d21
commit cdc079a
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -78,7 +78,7 @@ According to the prompt, enter an `env name`, and select `subscription` and `loc
 **Notes:**
 Considering security, we store its related data (id, password) in the key vault when we create the database, and obtain it from the key vault when we use it. This is different from directly deploying applications locally.
 
-You can also run the sample directly locally, some adjustments are required when configuring SQL Server (See below).
+You can also run the sample directly locally. (See below).
 
 ## Running the sample locally
 Most of the site's functionality works with just the web application running. However, the site's Admin page relies on Blazor WebAssembly running in the browser, and it must communicate with the server using the site's PublicApi web application. You'll need to also run this project. You can configure Visual Studio to start multiple projects, or just go to the PublicApi folder in a terminal window and run `dotnet run` from there. After that from the Web folder you should run `dotnet run --launch-profile Web`. Now you should be able to browse to `https://localhost:5001/`. The admin part in Blazor is accessible to `https://localhost:5001/admin`  
@@ -92,25 +92,6 @@ You can also run the samples in Docker (see below).
 
 ### Configuring the sample to use SQL Server
 
-1. In the `src/Web/Program.cs` file, switch to the `Locally` configuration of SQL Server.
-    ``` csharp
-    // Configure SQL Server (Locally)
-    // Microsoft.eShopWeb.Infrastructure.Dependencies.ConfigureServices(builder.Configuration, builder.Services);
-
-    // Configure SQL Server (Azd template)
-    var credential = new ChainedTokenCredential(new AzureDeveloperCliCredential(), new DefaultAzureCredential());
-    builder.Configuration.AddAzureKeyVault(new Uri(builder.Configuration["AZURE_KEY_VAULT_ENDPOINT"]), credential);
-    builder.Services.AddDbContext<CatalogContext>(c =>
-    {
-        var connectionString = builder.Configuration[builder.Configuration["AZURE_SQL_CATALOG_CONNECTION_STRING_KEY"]];
-        c.UseSqlServer(connectionString, sqlOptions => sqlOptions.EnableRetryOnFailure());
-    });
-    builder.Services.AddDbContext<AppIdentityDbContext>(options =>
-    {
-        var connectionString = builder.Configuration[builder.Configuration["AZURE_SQL_IDENTITY_CONNECTION_STRING_KEY"]];
-        options.UseSqlServer(connectionString, sqlOptions => sqlOptions.EnableRetryOnFailure());
-    });
-    ```
 1. By default, the project uses a real database. If you want an in memory database, you can add in `appsettings.json`
 
     ```json

diff --git a/infra/main.bicep b/infra/main.bicep
@@ -60,6 +60,7 @@ module web './core/host/appservice.bicep' = {
       AZURE_SQL_CATALOG_CONNECTION_STRING_KEY: 'AZURE-SQL-CATALOG-CONNECTION-STRING'
       AZURE_SQL_IDENTITY_CONNECTION_STRING_KEY: 'AZURE-SQL-IDENTITY-CONNECTION-STRING'
       AZURE_KEY_VAULT_ENDPOINT: keyVault.outputs.endpoint
+      AZD_TEMPLATE: 'enable'
     }
   }
 }

diff --git a/src/Web/Program.cs b/src/Web/Program.cs
@@ -23,22 +23,41 @@
 
 builder.Logging.AddConsole();
 
+var azdTemplate= builder.Configuration["AZD_TEMPLATE"];
+
+if (azdTemplate == "enable"){
+    var credential = new ChainedTokenCredential(new AzureDeveloperCliCredential(), new DefaultAzureCredential());
+    builder.Configuration.AddAzureKeyVault(new Uri(builder.Configuration["AZURE_KEY_VAULT_ENDPOINT"]), credential);
+    builder.Services.AddDbContext<CatalogContext>(c =>
+    {
+        var connectionString = builder.Configuration[builder.Configuration["AZURE_SQL_CATALOG_CONNECTION_STRING_KEY"]];
+        c.UseSqlServer(connectionString, sqlOptions => sqlOptions.EnableRetryOnFailure());
+    });
+    builder.Services.AddDbContext<AppIdentityDbContext>(options =>
+    {
+        var connectionString = builder.Configuration[builder.Configuration["AZURE_SQL_IDENTITY_CONNECTION_STRING_KEY"]];
+        options.UseSqlServer(connectionString, sqlOptions => sqlOptions.EnableRetryOnFailure());
+    });
+}
+else{
+    Microsoft.eShopWeb.Infrastructure.Dependencies.ConfigureServices(builder.Configuration, builder.Services);
+}
 // Configure SQL Server (Locally)
 // Microsoft.eShopWeb.Infrastructure.Dependencies.ConfigureServices(builder.Configuration, builder.Services);
 
 // Configure SQL Server (Azd template)
-var credential = new ChainedTokenCredential(new AzureDeveloperCliCredential(), new DefaultAzureCredential());
-builder.Configuration.AddAzureKeyVault(new Uri(builder.Configuration["AZURE_KEY_VAULT_ENDPOINT"]), credential);
-builder.Services.AddDbContext<CatalogContext>(c =>
-{
-    var connectionString = builder.Configuration[builder.Configuration["AZURE_SQL_CATALOG_CONNECTION_STRING_KEY"]];
-    c.UseSqlServer(connectionString, sqlOptions => sqlOptions.EnableRetryOnFailure());
-});
-builder.Services.AddDbContext<AppIdentityDbContext>(options =>
-{
-    var connectionString = builder.Configuration[builder.Configuration["AZURE_SQL_IDENTITY_CONNECTION_STRING_KEY"]];
-    options.UseSqlServer(connectionString, sqlOptions => sqlOptions.EnableRetryOnFailure());
-});
+// var credential = new ChainedTokenCredential(new AzureDeveloperCliCredential(), new DefaultAzureCredential());
+// builder.Configuration.AddAzureKeyVault(new Uri(builder.Configuration["AZURE_KEY_VAULT_ENDPOINT"]), credential);
+// builder.Services.AddDbContext<CatalogContext>(c =>
+// {
+//     var connectionString = builder.Configuration[builder.Configuration["AZURE_SQL_CATALOG_CONNECTION_STRING_KEY"]];
+//     c.UseSqlServer(connectionString, sqlOptions => sqlOptions.EnableRetryOnFailure());
+// });
+// builder.Services.AddDbContext<AppIdentityDbContext>(options =>
+// {
+//     var connectionString = builder.Configuration[builder.Configuration["AZURE_SQL_IDENTITY_CONNECTION_STRING_KEY"]];
+//     options.UseSqlServer(connectionString, sqlOptions => sqlOptions.EnableRetryOnFailure());
+// });
 
 builder.Services.AddCookieSettings();