updated deployment

Author: yorek

.env.sample

@@ -1,3 +1,4 @@
 MSSQL='Server=.database.windows.net;Initial Catalog=;Persist Security Info=False;User ID=session_recommender_app;Password=unEno!h5!&*KP420xds&@P901afb$^M;MultipleActiveResultSets=False;Encrypt=True;Connection Timeout=30;'
 OPENAI_URL='https://.openai.azure.com'
 OPENAI_KEY=''
+OPENAI_MODEL='text-embedding-ada-002'

database/Program.cs

@@ -19,7 +19,7 @@ static int Main(string[] args)
             var connectionString = Env.GetString("MSSQL");
 
             if (string.IsNullOrEmpty(connectionString)) {
-                Console.WriteLine("ERROR: 'ConnectionString' enviroment variable not set or empty.");
+                Console.WriteLine("ERROR: 'MSSQL' enviroment variable not set or empty.");
                 Console.WriteLine("You can create an .env file in parent folder that sets the 'MSSQL' environment variable; then run this app again.");                
                 return 1;
             }
@@ -41,6 +41,7 @@ static int Main(string[] args)
             Dictionary<string, string> variables = new() {
                 {"OPENAI_URL", Env.GetString("OPENAI_URL")},
                 {"OPENAI_KEY", Env.GetString("OPENAI_KEY")}
+                {"OPENAI_MODEL", Env.GetString("OPENAI_MODEL")}
             };
 
             Console.WriteLine("Starting deployment...");

infra/app/sqlserver.bicep

@@ -102,7 +102,6 @@ resource createDBScript2 'Microsoft.Resources/deploymentScripts@2023-08-01' = {
         secureValue: appUserPassword
       }
     ]
-    scriptContent: loadTextContent('../../database/setup-database.ps1')  
   }
 }
 

infra/main.bicep

@@ -45,9 +45,11 @@ param logAnalyticsName string = ''
 @description('Flag to Use keyvault to store and use keys')
 param useKeyVault bool = true
 
+param myTags object = {}
+
 var abbrs = loadJsonContent('./abbreviations.json')
 var resourceToken = toLower(uniqueString(subscription().id, environmentName, location))
-var tags = { 'azd-env-name': environmentName }
+var tags = union({ 'azd-env-name': environmentName }, myTags)
 var rgName = 'rg-${environmentName}'
 
 // Organize resources in a resource group
@@ -126,7 +128,7 @@ module hostingPlan 'core/host/appserviceplan.bicep' = {
     location: location
     name: !empty(hostingPlanName) ? hostingPlanName : '${abbrs.webServerFarms}${resourceToken}'
     sku: {
-      name: 'EP1'
+      name: 'B1'
     }
     kind: 'linux'
   }

infra/main.parameters.json

@@ -18,7 +18,10 @@
       "value": "$(secretOrRandomPassword ${AZURE_KEY_VAULT_NAME} appUserPassword)"
     },
     "useKeyVault": {
-      "value": "${USE_KEY_VAULT=true}"
+      "value": "${USE_KEY_VAULT=false}"
+    },
+    "myTags": {
+      "value": {}
     }
   }
 }