-
Notifications
You must be signed in to change notification settings - Fork 3.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
merging master to this branch (#14294)
* Update to latest CosmosDB client libraray and allow ServerVersion to … (#14235) * Update to latest CosmosDB client libraray and allow ServerVersion to be updated for CosmosDB accounts * Add 4.0 ServerVersion in argument completion * Added ServerVersion change description to ChangeLog.md * Adding backup interval and retention parameters to database account create and update cmdlets * Regenerating test record with the new parameters * PR feedback Co-authored-by: Kalyan Khandrika <kakhandr@microsoft.com> * [BotService] Fix the issue that didn't pack resources files of bot service. (#14221) * Fix the issue that didn't pack resources files of bot service. * Fix the issue that didn't pack resources files of bot service. * Add Debug info for test phase * Add Debug info for test phase * Fix the issue of test project list is empty Co-authored-by: wyunchi-ms <yunwang@microsoft.com> * Remove ContainerService cmdlets and documentation (#14270) * removed CS and changelog * Update ChangeLog.md * Create BreakingChangeIssues.csv Co-authored-by: Theodore Chang <thchan@microsoft.com> * Support deploying Azure resources described with the Bicep language (#14104) * Added support for Azure resources deployment in Bicep language * fix relative path issue * remove bicep support on templateUri * refine codes Co-authored-by: Beisi Zhou <bez@microsoft.com> * Add "[Breaking Change]" (#14276) to changelog.md for Compute * Polish changelog for upcoming release (#14279) Co-authored-by: craigtmc-msft <78387451+craigtmc-msft@users.noreply.github.com> Co-authored-by: Kalyan Khandrika <kakhandr@microsoft.com> Co-authored-by: Yunchi Wang <54880216+wyunchi-ms@users.noreply.github.com> Co-authored-by: wyunchi-ms <yunwang@microsoft.com> Co-authored-by: Adam Sandor <adsandor@microsoft.com> Co-authored-by: Beisi Zhou <zhoubeisi@gmail.com> Co-authored-by: Beisi Zhou <bez@microsoft.com> Co-authored-by: Yabo Hu <yabhu@microsoft.com> Co-authored-by: Dingmeng Xue <dixue@microsoft.com>
- Loading branch information
10 people
authored
Feb 23, 2021
1 parent
2941472
commit 91ed62d
Showing
65 changed files
with
6,230 additions
and
9,453 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- | ||
| This configuration file is required if iisnode is used to run a TypeScript Node.js processes behind | ||
| IIS or IIS Express. For more information, visit: | ||
| https://github.com/tjanczuk/iisnode/blob/master/src/samples/configuration/web.config | ||
| --> | ||
|
|
||
| <configuration> | ||
| <system.webServer> | ||
| <!-- Visit http://blogs.msdn.com/b/windowsazure/archive/2013/11/14/introduction-to-websockets-on-windows-azure-web-sites.aspx for more information on WebSocket support --> | ||
| <webSocket enabled="false" /> | ||
| <handlers> | ||
| <!-- Indicates that the server.js file is a node.js site to be handled by the iisnode module --> | ||
| <add name="iisnode" path="lib/index.js" verb="*" modules="iisnode"/> | ||
| </handlers> | ||
| <rewrite> | ||
| <rules> | ||
| <!-- Do not interfere with requests for node-inspector debugging --> | ||
| <rule name="NodeInspector" patternSyntax="ECMAScript" stopProcessing="true"> | ||
| <match url="^lib/index.js\/debug[\/]?" /> | ||
| </rule> | ||
|
|
||
| <!-- First we consider whether the incoming URL matches a physical file in the /public folder --> | ||
| <rule name="StaticContent"> | ||
| <action type="Rewrite" url="public{REQUEST_URI}"/> | ||
| </rule> | ||
|
|
||
| <!-- All other URLs are mapped to the node.js site entry point --> | ||
| <rule name="DynamicContent"> | ||
| <conditions> | ||
| <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="True"/> | ||
| </conditions> | ||
| <action type="Rewrite" url="lib/index.js"/> | ||
| </rule> | ||
| </rules> | ||
| </rewrite> | ||
|
|
||
| <!-- 'bin' directory has no special meaning in node.js and apps can be placed in it --> | ||
| <security> | ||
| <requestFiltering> | ||
| <hiddenSegments> | ||
| <remove segment="bin"/> | ||
| </hiddenSegments> | ||
| </requestFiltering> | ||
| </security> | ||
|
|
||
| <!-- Make sure error responses are left untouched --> | ||
| <httpErrors existingResponse="PassThrough" /> | ||
|
|
||
| <!-- | ||
| You can control how Node is hosted within IIS using the following options: | ||
| * watchedFiles: semi-colon separated list of files that will be watched for changes to restart the server | ||
| * node_env: will be propagated to node as NODE_ENV environment variable | ||
| * debuggingEnabled - controls whether the built-in debugger is enabled | ||
| See https://github.com/tjanczuk/iisnode/blob/master/src/samples/configuration/web.config for a full list of options | ||
| --> | ||
| <!--<iisnode watchedFiles="web.config;*.js"/>--> | ||
| </system.webServer> | ||
| </configuration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- | ||
| This configuration file is required if iisnode is used to run node processes behind | ||
| IIS or IIS Express. For more information, visit: | ||
| https://github.com/tjanczuk/iisnode/blob/master/src/samples/configuration/web.config | ||
| --> | ||
|
|
||
| <configuration> | ||
| <system.webServer> | ||
| <!-- Visit http://blogs.msdn.com/b/windowsazure/archive/2013/11/14/introduction-to-websockets-on-windows-azure-web-sites.aspx for more information on WebSocket support --> | ||
| <webSocket enabled="false" /> | ||
| <handlers> | ||
| <!-- Indicates that the server.js file is a node.js site to be handled by the iisnode module --> | ||
| <add name="iisnode" path="index.js" verb="*" modules="iisnode"/> | ||
| </handlers> | ||
| <rewrite> | ||
| <rules> | ||
| <!-- Do not interfere with requests for node-inspector debugging --> | ||
| <rule name="NodeInspector" patternSyntax="ECMAScript" stopProcessing="true"> | ||
| <match url="^index.js\/debug[\/]?" /> | ||
| </rule> | ||
|
|
||
| <!-- First we consider whether the incoming URL matches a physical file in the /public folder --> | ||
| <rule name="StaticContent"> | ||
| <action type="Rewrite" url="public{REQUEST_URI}"/> | ||
| </rule> | ||
|
|
||
| <!-- All other URLs are mapped to the node.js site entry point --> | ||
| <rule name="DynamicContent"> | ||
| <conditions> | ||
| <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="True"/> | ||
| </conditions> | ||
| <action type="Rewrite" url="index.js"/> | ||
| </rule> | ||
| </rules> | ||
| </rewrite> | ||
|
|
||
| <!-- 'bin' directory has no special meaning in node.js and apps can be placed in it --> | ||
| <security> | ||
| <requestFiltering> | ||
| <hiddenSegments> | ||
| <remove segment="bin"/> | ||
| </hiddenSegments> | ||
| </requestFiltering> | ||
| </security> | ||
|
|
||
| <!-- Make sure error responses are left untouched --> | ||
| <httpErrors existingResponse="PassThrough" /> | ||
|
|
||
| <!-- | ||
| You can control how Node is hosted within IIS using the following options: | ||
| * watchedFiles: semi-colon separated list of files that will be watched for changes to restart the server | ||
| * node_env: will be propagated to node as NODE_ENV environment variable | ||
| * debuggingEnabled - controls whether the built-in debugger is enabled | ||
| See https://github.com/tjanczuk/iisnode/blob/master/src/samples/configuration/web.config for a full list of options | ||
| --> | ||
| <!--<iisnode watchedFiles="web.config;*.js"/>--> | ||
| </system.webServer> | ||
| </configuration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,183 @@ | ||
| { | ||
| "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", | ||
| "contentVersion": "1.0.0.0", | ||
| "parameters": { | ||
| "botEnv": { | ||
| "type": "string", | ||
| "defaultValue": "prod" | ||
| }, | ||
| "botId": { | ||
| "type": "string" | ||
| }, | ||
| "description": { | ||
| "type": "string", | ||
| "defaultValue": "" | ||
| }, | ||
| "location": { | ||
| "type": "string" | ||
| }, | ||
| "sku": { | ||
| "type": "string" | ||
| }, | ||
| "kind": { | ||
| "type": "string" | ||
| }, | ||
| "siteName": { | ||
| "type": "string" | ||
| }, | ||
| "appId": { | ||
| "type": "string", | ||
| "defaultValue": "1234" | ||
| }, | ||
| "appSecret": { | ||
| "type": "string", | ||
| "defaultValue": "blank" | ||
| }, | ||
| "zipUrl": { | ||
| "type": "string", | ||
| "defaultValue": "" | ||
| }, | ||
| "serverFarmId": { | ||
| "type": "string" | ||
| }, | ||
| "createServerFarm": { | ||
| "type": "bool" | ||
| }, | ||
| "serverFarmLocation": { | ||
| "type": "string", | ||
| "defaultValue": "" | ||
| }, | ||
| "serverFarmSku": { | ||
| "type": "object", | ||
| "defaultValue": { | ||
| "name": "S1", | ||
| "tier": "Standard", | ||
| "size": "S1", | ||
| "family": "S", | ||
| "capacity": 1 | ||
| } | ||
| }, | ||
| "endpoint": { | ||
| "type": "string", | ||
| "defaultValue": "" | ||
| }, | ||
| "botFileEncryptionKey": { | ||
| "type": "string", | ||
| "defaultValue": "" | ||
| } | ||
| }, | ||
| "variables": { | ||
| "serverFarmName": "[last(split(parameters('serverFarmId'), '/'))]", | ||
| "botAppKinds": { | ||
| "sdk": "app", | ||
| "bot": "" | ||
| }, | ||
| "botAppKind": "[variables('botAppKinds')[parameters('kind')]]", | ||
| "siteHost": "[concat(parameters('siteName'), '.azurewebsites.net')]", | ||
| "botEndpointConfig": { | ||
| "bot": "[parameters('endpoint')]", | ||
| "sdk": "[concat('https://', variables('siteHost'), '/api/messages')]" | ||
| }, | ||
| "botEndpoint": "[variables('botEndpointConfig')[parameters('kind')]]" | ||
| }, | ||
| "resources": [ | ||
| { | ||
| "type": "Microsoft.Web/serverfarms", | ||
| "condition": "[parameters('createServerFarm')]", | ||
| "name": "[variables('serverFarmName')]", | ||
| "apiVersion": "2016-09-01", | ||
| "location": "[parameters('serverFarmLocation')]", | ||
| "sku": "[parameters('serverFarmSku')]", | ||
| "properties": { | ||
| "name": "[variables('serverFarmName')]" | ||
| } | ||
| }, | ||
| { | ||
| "name": "[parameters('siteName')]", | ||
| "type": "Microsoft.Web/sites", | ||
| "apiVersion": "2015-08-01", | ||
| "location": "[parameters('location')]", | ||
| "kind": "[variables('botAppKind')]", | ||
| "dependsOn": [ | ||
| "[parameters('serverFarmId')]" | ||
| ], | ||
| "properties": { | ||
| "name": "[parameters('siteName')]", | ||
| "serverFarmId": "[parameters('serverFarmId')]", | ||
| "siteConfig": { | ||
| "appSettings": [ | ||
| { | ||
| "name": "WEBSITE_NODE_DEFAULT_VERSION", | ||
| "value": "10.14.1" | ||
| }, | ||
| { | ||
| "name": "MicrosoftAppId", | ||
| "value": "[parameters('appId')]" | ||
| }, | ||
| { | ||
| "name": "MicrosoftAppPassword", | ||
| "value": "[parameters('appSecret')]" | ||
| } | ||
| ], | ||
| "cors": { | ||
| "allowedOrigins": [ | ||
| "https://botservice.hosting.portal.azure.net", | ||
| "https://hosting.onecloud.azure-test.net/" | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "resources": [ | ||
| { | ||
| "name": "MSDeploy", | ||
| "type": "Extensions", | ||
| "apiVersion": "2015-02-01", | ||
| "condition": "[not(equals(parameters('zipUrl'), ''))]", | ||
| "dependsOn": [ | ||
| "[concat('Microsoft.Web/Sites/', parameters('siteName'))]" | ||
| ], | ||
| "properties": { | ||
| "packageUri": "[parameters('zipUrl')]", | ||
| "dbType": "None", | ||
| "connectionString": "", | ||
| "setParameters": { | ||
| "IIS Web Application Name": "[parameters('siteName')]" | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "apiVersion": "2017-12-01", | ||
| "type": "Microsoft.BotService/botServices", | ||
| "name": "[parameters('botId')]", | ||
| "location": "global", | ||
| "kind": "[parameters('kind')]", | ||
| "sku": { | ||
| "name": "[parameters('sku')]" | ||
| }, | ||
| "properties": { | ||
| "name": "[parameters('botId')]", | ||
| "displayName": "[parameters('botId')]", | ||
| "endpoint": "[variables('botEndpoint')]", | ||
| "msaAppId": "[parameters('appId')]", | ||
| "publishingCredentials": "[list(concat(resourceId('Microsoft.Web/Sites', parameters('siteName')), '/config/publishingcredentials'), '2018-02-01')]", | ||
| "allSettings": { | ||
| "WEBSITE_NODE_DEFAULT_VERSION": "10.14.1", | ||
| "SCM_DO_BUILD_DURING_DEPLOYMENT": "true", | ||
| "BotId": "[parameters('botId')]", | ||
| "MicrosoftAppId": "[parameters('appId')]", | ||
| "MicrosoftAppPassword": "[parameters('appSecret')]", | ||
| "botFilePath": "[concat('./', parameters('botId'), '.bot')]", | ||
| "botFileSecret": "[parameters('botFileEncryptionKey')]", | ||
| "description": "[parameters('description')]" | ||
| } | ||
| }, | ||
| "dependsOn": [ | ||
| "[parameters('serverFarmId')]", | ||
| "[resourceId('Microsoft.Web/sites/', parameters('siteName'))]", | ||
| "MSDeploy" | ||
| ] | ||
| } | ||
| ] | ||
| } |
41 changes: 0 additions & 41 deletions
41
src/Compute/Compute.Test/ScenarioTests/ContainerServiceTests.cs
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.