Merge branch 'main' into mehak/ts-cli

Author: MehakBindra

packages/cli/configs/atk/oauth/python/env/.env.dev

@@ -0,0 +1,16 @@
+# Built-in environment variables
+TEAMSFX_ENV=dev
+APP_NAME_SUFFIX=dev
+
+# Updating AZURE_SUBSCRIPTION_ID or AZURE_RESOURCE_GROUP_NAME after provision may also require an update to RESOURCE_SUFFIX, because some services require a globally unique name across subscriptions/resource groups.
+AZURE_SUBSCRIPTION_ID=
+AZURE_RESOURCE_GROUP_NAME=
+RESOURCE_SUFFIX=
+
+TEAMS_APP_ID=
+TEAMS_APP_TENANT_ID=
+BOT_ID=
+AAD_APP_OBJECT_ID=
+AAD_APP_TENANT_ID=
+BOT_AZURE_APP_SERVICE_RESOURCE_ID=
+BOT_DOMAIN=

packages/cli/configs/atk/oauth/python/infra/azure.bicep

@@ -0,0 +1,89 @@
+@maxLength(20)
+@minLength(4)
+@description('Used to generate names for all resources in this file')
+param resourceBaseName string
+
+@description('Required when create Azure Bot service')
+param botAadAppClientId string
+
+@secure()
+@description('Required by Bot Framework package in your bot project')
+param botAadAppClientSecret string
+
+@maxLength(42)
+param botDisplayName string
+
+param webAppSKU string
+param linuxFxVersion string
+param oauthConnectionName string
+param tenantId string
+
+param serverfarmsName string = resourceBaseName
+param webAppName string = resourceBaseName
+param location string = resourceGroup().location
+param pythonVersion string = linuxFxVersion
+
+// Compute resources for your Web App
+resource serverfarm 'Microsoft.Web/serverfarms@2021-02-01' = {
+  kind: 'app,linux'
+  location: location
+  name: serverfarmsName
+  sku: {
+    name: webAppSKU
+  }
+  properties:{
+    reserved: true
+  }
+}
+
+// Web App that hosts your agent
+// Web App that hosts your bot
+resource webApp 'Microsoft.Web/sites@2021-02-01' = {
+  kind: 'app,linux'
+  location: location
+  name: webAppName
+  properties: {
+    serverFarmId: serverfarm.id
+    siteConfig: {
+      alwaysOn: true
+      appCommandLine: 'python main.py'
+      linuxFxVersion: pythonVersion
+      appSettings: [
+        {
+          name: 'SCM_DO_BUILD_DURING_DEPLOYMENT'
+          value: 'true'
+        }
+        {
+          name: 'CLIENT_ID'
+          value: botAadAppClientId
+        }
+        {
+          name: 'CLIENT_SECRET'
+          value: botAadAppClientSecret
+        }
+        {
+          name: 'TENANT_ID'
+          value: tenantId
+        }
+      ]
+      ftpsState: 'FtpsOnly'
+    }
+  }
+}
+
+// Register your web service as a bot with the Bot Framework
+module azureBotRegistration './botRegistration/azurebot.bicep' = {
+  name: 'Azure-Bot-registration'
+  params: {
+    resourceBaseName: resourceBaseName
+    botAadAppClientId: botAadAppClientId
+    botAddAppClientSecret: botAadAppClientSecret
+    botAppDomain: webApp.properties.defaultHostName
+    botDisplayName: botDisplayName
+    oauthConnectionName: oauthConnectionName
+    tenantId: tenantId
+  }
+}
+
+output BOT_AZURE_APP_SERVICE_RESOURCE_ID string = webApp.id
+output BOT_DOMAIN string = webApp.properties.defaultHostName

packages/cli/configs/atk/oauth/python/infra/azure.parameters.json.hbs

@@ -0,0 +1,31 @@
+{
+  "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "resourceBaseName": {
+      "value": "bot-$\{{RESOURCE_SUFFIX}}-$\{{TEAMSFX_ENV}}"
+    },
+    "webAppSKU": {
+      "value": "B1"
+    },
+    "botAadAppClientId": {
+      "value": "$\{{BOT_ID}}"
+    },
+    "botAadAppClientSecret": {
+      "value": "$\{{SECRET_BOT_PASSWORD}}"
+    },
+    "oauthConnectionName": {
+      "value": "$\{{OAUTH_CONNECTION_NAME}}"
+    },
+    "tenantId": {
+      "value": "$\{{AAD_APP_TENANT_ID}}"
+    },
+    "linuxFxVersion": {
+      "value": "PYTHON|3.12"
+    },
+    "botDisplayName": {
+      "value": "{{ toPascalCase name }}Infra"
+    }
+
+  }
+}

packages/cli/configs/atk/oauth/python/teamsapp.yml.hbs

@@ -103,9 +103,14 @@ provision:
 
 deploy:
   # Deploy to an Azure App Service using the zip file created in the provision step.
+  - uses: script
+    with:
+      run: |
+        uv sync
+        uv export --no-hashes -o src/requirements.txt
   - uses: azureAppService/zipDeploy
     with:
-      artifactFolder: .
+      artifactFolder: src
       ignoreFile: .webappignore
       # This example uses the env var thats generated by the arm/deploy action.
       # You can replace it with an existing Azure Resource ID or other