8000 Correct template folder casing (2) (#1966) · andreikop/botbuilder-python@d02f0c4 · GitHub
[go: up one dir, main page]
Skip to content

Commit d02f0c4

Browse files
tracyboehrerTracy Boehrer
tracyboehrer
and
Tracy Boehrer
authored
Correct template folder casing (2) (microsoft#1966)
Co-authored-by: Tracy Boehrer <trboehre@microsoft.com>
1 parent 2f8f592 commit d02f0c4

30 files changed

+2328
-0
lines changed

‎generators/app/templates/core/{{cookiecutter.bot_name}}/deploymentTemplates/deployUseExistResourceGroup/parameters-for-template-AzureBot-with-rg.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
3+
"contentVersion": "1.0.0.0",
4+
"parameters": {
5+
"azureBotId": {
6+
"value": ""
7+
},
8+
"azureBotSku": {
9+
"value": "S1"
10+
},
11+
"azureBotRegion": {
12+
"value": "global"
13+
},
14+
"botEndpoint": {
15+
"value": ""
16+
},
17+
"appId": {
18+
"value": ""
19+
}
20+
}
21+
}

‎generators/app/templates/core/{{cookiecutter.bot_name}}/deploymentTemplates/deployUseExistResourceGroup/parameters-for-template-BotApp-with-rg.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
3+
"contentVersion": "1.0.0.0",
4+
"parameters": {
5+
"appServiceName": {
6+
"value": ""
7+
},
8+
"existingAppServicePlanName": {
9+
"value": ""
10+
},
11+
"existingAppServicePlanLocation": {
12+
"value": ""
13+
},
14+
"newAppServicePlanName": {
15+
"value": ""
16+
},
17+
"newAppServicePlanLocation": {
18+
"value": ""
19+
},
20+
"newAppServicePlanSku": {
21+
"value": {
22+
"name": "S1",
23+
"tier": "Standard",
24+
"size": "S1",
25+
"family": "S",
26+
"capacity": 1
27+
}
28+
},
29+
"appId": {
30+
"value": ""
31+
},
32+
"appSecret": {
33+
"value": ""
34+
}
35+
}
36+
}

‎generators/app/templates/core/{{cookiecutter.bot_name}}/deploymentTemplates/deployUseExistResourceGroup/readme.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
Need deploy BotAppService before AzureBot
2+
---
3+
az login
4+
az deployment group create --resource-group <group-name> --template-file <template-file> --parameters @<parameters-file>
5+
---
6+
7+
# parameters-for-template-BotApp-with-rg:
8+
9+
**appServiceName**:(required) The Name of the Bot App Service.
10+
11+
(choose an existingAppServicePlan or create a new AppServicePlan)
12+
**existingAppServicePlanName**: The name of the App Service Plan.
13+
**existingAppServicePlanLocation**: The location of the App Service Plan.
14+
**newAppServicePlanName**: The name of the App Service Plan.
15+
**newAppServicePlanLocation**: The location of the App Service Plan.
16+
**newAppServicePlanSku**: The SKU of the App Service Plan. Defaults to Standard values.
17+
18+
**appId**:(required) Active Directory App ID or User-Assigned Managed Identity Client ID, set as MicrosoftAppId in the Web App's Application Settings.
19+
**appSecret**:(required) Active Directory App Password, set as MicrosoftAppPassword in the Web App's Application Settings.
20+
21+
# parameters-for-template-AzureBot-with-rg:
22+
23+
**azureBotId**:(required) The globally unique and immutable bot ID.
24+
**azureBotSku**: The pricing tier of the Bot Service Registration. **Allowed values are: F0, S1(default)**.
25+
**azureBotRegion**: Specifies the location of the new AzureBot. **Allowed values are: global(default), westeurope**.
26+
**botEndpoint**: Use to handle client messages, Such as https://<botappServiceName>.azurewebsites.net/api/messages.
27+
28+
**appId**:(required) Active Directory App ID or User-Assigned Managed Identity Client ID, set as MicrosoftAppId in the Web App's Application Settings.

‎generators/app/templates/core/{{cookiecutter.bot_name}}/deploymentTemplates/deployUseExistResourceGroup/template-AzureBot-with-rg.json

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
{
2+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
3+
"contentVersion": "1.0.0.0",
4+
"parameters": {
5+
"azureBotId": {
6+
"type": "string",
7+
"metadata": {
8+
"description": "The globally unique and immutable bot ID."
9+
}
10+
},
11+
"azureBotSku": {
12+
"defaultValue": "S1",
13+
"type": "string",
14+
"metadata": {
15+
"description": "The pricing tier of the Bot Service Registration. Allowed values are: F0, S1(default)."
16+
}
17+
},
18+
"azureBotRegion": {
19+
"type": "string",
20+
"defaultValue": "global",
21+
"metadata": {
22+
"description": "Specifies the location of the new AzureBot. Allowed values are: global(default), westeurope."
23+
}
24+
},
25+
"botEndpoint": {
26+
"type": "string",
27+
"metadata": {
28+
"description": "Use to handle client messages, Such as https://<botappServiceName>.azurewebsites.net/api/messages."
29+
}
30+
},
31+
"appId": {
32+
"type": "string",
33+
"metadata": {
34+
"description": "Active Directory App ID or User-Assigned Managed Identity Client ID, set as MicrosoftAppId in the Web App's Application Settings."
35+
}
36+
}
37+
},
38+
"resources": [
39+
{
40+
"apiVersion": "2021-05-01-preview",
41+
"type": "Microsoft.BotService/botServices",
42+
"name": "[parameters('azureBotId')]",
43+
"location": "[parameters('azureBotRegion')]",
44+
"kind": "azurebot",
45+
"sku": {
46+
"name": "[parameters('azureBotSku')]"
47+
},
48+
"properties": {
49+
"name": "[parameters('azureBotId')]",
50+
"displayName": "[parameters('azureBotId')]",
51+
"iconUrl": "https://docs.botframework.com/static/devportal/client/images/bot-framework-default.png",
52+
"endpoint": "[parameters('botEndpoint')]",
53+
"msaAppId": "[parameters('appId')]",
54+
"luisAppIds": [],
55+
"schemaTransformationVersion": "1.3",
56+
"isCmekEnabled": false,
57+
"isIsolated": false
58+
}
59+
}
60+
]
61+
}

‎generators/app/templates/core/{{cookiecutter.bot_name}}/deploymentTemplates/deployUseExistResourceGroup/template-BotApp-with-rg.json

Lines changed: 209 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,209 @@
1+
{
2+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
3+
"contentVersion": "1.0.0.0",
4+
"parameters": {
5+
"appServiceName": {
6+
"type": "string",
7+
"defaultValue": "",
8+
"metadata": {
9+
"description": "The globally unique name of the Web App."
10+
}
11+
},
12+
"existingAppServicePlanName": {
13+
"type": "string",
14+
"defaultValue": "",
15+
"metadata": {
16+
"description": "Name of the existing App Service Plan used to create the Web App for the bot."
17+
}
18+
},
19+
"existingAppServicePlanLocation": {
20+
"type": "string",
21+
"metadata": {
22+
"description": "The location of the App Service Plan."
23+
}
24+
},
25+
"newAppServicePlanName": {
26+
"type": "string",
27+
"metadata": {
28+
"description": "The name of the new App Service Plan."
29+
}
30+
},
31+
"newAppServicePlanLocation": {
32+
"type": "string",
33+
"metadata": {
34+
"description": "The location of the App Service Plan."
35+
}
36+
},
37+
"newAppServicePlanSku": {
38+
"type": "object",
39+
"defaultValue": {
40+
"name": "S1",
41+
"tier": "Standard",
42+
"size": "S1",
43+
"family": "S",
44+
"capacity": 1
45+
},
46+
"metadata": {
47+
"description": "The SKU of the App Service Plan. Defaults to Standard values."
48+
}
49+
},
50+
"appId": {
51+
"type": "string",
52+
"metadata": {
53+
"description": "Active Directory App ID or User-Assigned Managed Identity Client ID, set as MicrosoftAppId in the Web App's Application Settings."
54+
}
55+
},
56+
"appSecret": {
57+
"type": "string",
58+
"defaultValue": "",
59+
"metadata": {
60+
"description": "Active Directory App Password, set as MicrosoftAppPassword in the Web App's Application Settings. Required for MultiTenant and SingleTenant app types. Defaults to \"\"."
61+
}
62+
}
63+
},
64+
"variables": {
65+
"defaultAppServicePlanName": "[if(empty(parameters('existingAppServicePlanName')), 'createNewAppServicePlan', parameters('existingAppServicePlanName'))]",
66+
"useExistingServicePlan": "[not(equals(variables('defaultAppServicePlanName'), 'createNewAppServicePlan'))]",
67+
"servicePlanName": "[if(variables('useExistingServicePlan'), parameters('existingAppServicePlanName'), parameters('newAppServicePlanName'))]",
68+
"servicePlanLocation": "[if(variables('useExistingServicePlan'), parameters('existingAppServicePlanLocation'), parameters('newAppServicePlanLocation'))]"
69+
},
70+
"resources": [
71+
{
72+
"comments": "Create a new App Service Plan if no existing App Service Plan name was passed in.",
73+
"type": "Microsoft.Web/serverfarms",
74+
"condition": "[not(variables('useExistingServicePlan'))]",
75+
"name": "[variables('servicePlanName')]",
76+
"apiVersion": "2018-02-01",
77+
"location": "[parameters('newAppServicePlanLocation')]",
78+
"sku": "[parameters('newAppServicePlanSku')]",
79+
"kind": "linux",
80+
"properties": {
81+
"name": "[variables('servicePlanName')]",
82+
"perSiteScaling": false,
83+
"reserved": true,
84+
"targetWorkerCount": 0,
85+
"targetWorkerSizeId": 0
86+
}
87+
},
88+
{
89+
"comments": "Create a Web App using an App Service Plan",
90+
"type": "Microsoft.Web/sites",
91+
"apiVersion": "2015-08-01",
92+
"name": "[parameters('appServiceName')]",
93+
"location": "[variables('servicePlanLocation')]",
94+
"kind": "app,linux",
95+
"dependsOn": [
96+
"[resourceId('Microsoft.Web/serverfarms', variables('servicePlanName'))]"
97+
],
98+
"properties": {
99+
"enabled": true,
100+
"hostNameSslStates": [
101+
{
102+
"name": "[concat(parameters('appServiceName'), '.azurewebsites.net')]",
103+
"sslState": "Disabled",
104+
"hostType": "Standard"
105+
},
106+
{
107+
"name": "[concat(parameters('appServiceName'), '.scm.azurewebsites.net')]",
108+
"sslState": "Disabled",
109+
"hostType": "Repository"
110+
}
111+
],
112+
"serverFarmId": "[resourceId('Microsoft.Web/serverfarms', variables('servicePlanName'))]",
113+
"reserved": true,
114+
"scmSiteAlsoStopped": false,
115+
"clientAffinityEnabled": false,
116+
"clientCertEnabled": false,
117+
"hostNamesDisabled": false,
118+
"containerSize": 0,
119+
"dailyMemoryTimeQuota": 0,
120+
"httpsOnly": false,
121+
"siteConfig": {
122+
"appSettings": [
123+
{
124+
"name": "SCM_DO_BUILD_DURING_DEPLOYMENT",
125+
"value": "true"
126+
},
127+
{
128+
"name": "MicrosoftAppId",
129+
"value": "[parameters('appId')]"
130+
},
131+
{
132+
"name": "MicrosoftAppPassword",
133+
"value": "[parameters('appSecret')]"
134+
}
135+
],
136+
"cors": {
137+
"allowedOrigins": [
138+
"https://botservice.hosting.portal.azure.net",
139+
"https://hosting.onecloud.azure-test.net/"
140+
]
141+
}
142+
}
143+
}
144+
},
145+
{
146+
"type": "Microsoft.Web/sites/config",
147+
"apiVersion": "2016-08-01",
148+
"name": "[concat(parameters('appServiceName'), '/web')]",
149+
"location": "[variables('servicePlanLocation')]",
150+
"dependsOn": [
151+
"[resourceId('Microsoft.Web/sites', parameters('appServiceName'))]"
152+
],
153+
"properties": {
154+
"numberOfWorkers": 1,
155+
"defaultDocuments": [
156+
"Default.htm",
157+
"Default.html",
158+
"Default.asp",
159+
"index.htm",
160+
"index.html",
161+
"iisstart.htm",
162+
"default.aspx",
163+
"index.php",
164+
"hostingstart.html"
165+
],
166+
"netFrameworkVersion": "v4.0",
167+
"phpVersion": "",
168+
"pythonVersion": "",
169+
"nodeVersion": "",
170+
"linuxFxVersion": "PYTHON|3.7",
171+
"requestTracingEnabled": false,
172+
"remoteDebuggingEnabled": false,
173+
"remoteDebuggingVersion": "VS2017",
174+
"httpLoggingEnabled": true,
175+
"logsDirectorySizeLimit": 35,
176+
"detailedErrorLoggingEnabled": false,
177+
"publishingUsername": "[concat('$', parameters('appServiceName'))]",
178+
"scmType": "None",
179+
"use32BitWorkerProcess": true,
180+
"webSocketsEnabled": false,
181+
"alwaysOn": false,
182+
"appCommandLine": "gunicorn --bind 0.0.0.0 --worker-class aiohttp.worker.GunicornWebWorker --timeout 600 app:APP",
183+
"managedPipelineMode": "Integrated",
184+
"virtualApplications": [
185+
{
186+
"virtualPath": "/",
187+
"physicalPath": "site\\wwwroot",
188+
"preloadEnabled": false,
189+
"virtualDirectories": null
190+
}
191+
],
192+
"winAuthAdminState": 0,
193+
"winAuthTenantState": 0,
194+
"customAppPoolIdentityAdminState": false,
195+
"customAppPoolIdentityTenantState": false,
196+
"loadBalancing": "LeastRequests",
197+
"routingRules": [],
198+
"experiments": {
199+
"rampUpRules": []
200+
},
201+
"autoHealEnabled": false,
202+
"vnetName": "",
203+
"minTlsVersion": "1.2",
204+
"ftpsState": "AllAllowed",
205+
"reservedInstanceCount": 0
206+
}
207+
}
208+
]
209+
}

‎generators/app/templates/core/{{cookiecutter.bot_name}}/deploymentTemplates/deployWithNewResourceGroup/parameters-for-template-AzureBot-new-rg.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
3+
"contentVersion": "1.0.0.0",
4+
"parameters": {
5+
"groupName": {
6+
"value": ""
7+
},
8+
"groupLocation": {
9+
"value": ""
10+
},
11+
"azureBotId": {
12+
"value": ""
13+
},
14+
"azureBotSku": {
15+
"value": "S1"
16+
},
17+
"azureBotRegion": {
18+
"value": "global"
19+
},
20+
"botEndpoint": {
21+
"value": ""
22+
},
23+
"appId": {
24+
"value": ""
25+
}
26+
}
27+
}

0 commit comments

Comments
 (0)
0