diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst index 074345781e7..297fb4df14b 100644 --- a/src/azure-cli/HISTORY.rst +++ b/src/azure-cli/HISTORY.rst @@ -17,6 +17,10 @@ Release History * Added a required `--type` parameter to command `az acr config retention update` * Param `-n, --name` changed to `-r, --registry` for `az acr config` command group. +**BotService** + +* Added `--icon-url` to `az bot update` + **Compute** * vmss create: Add --terminate-notification-time parameters to support terminate scheduled event configurability. diff --git a/src/azure-cli/azure/cli/command_modules/botservice/_params.py b/src/azure-cli/azure/cli/command_modules/botservice/_params.py index 9c6c2827930..3155ec19384 100644 --- a/src/azure-cli/azure/cli/command_modules/botservice/_params.py +++ b/src/azure-cli/azure/cli/command_modules/botservice/_params.py @@ -63,7 +63,6 @@ def load_arguments(self, _): c.argument('password', options_list=['-p', '--password'], help='The Microsoft account (MSA) password for the bot. Used to authorize messages being sent to the bot.') c.argument('tags', arg_type=tags_type) c.argument('language', options_list=['--lang'], arg_type=get_enum_type(SUPPORTED_LANGUAGES), help='The language to be used to create the bot.', arg_group='Web Bot Specific') - c.argument('version', options_list=['-v', '--version'], help='The Microsoft Bot Builder SDK version to be used to create the bot', arg_type=get_enum_type(['v4']), arg_group='Web Bot Specific') c.argument('deploy_echo', options_list=['--echo'], arg_type=get_three_state_flag(), help='Deploy an Echo Bot template to the newly created v4 Web App Bot.', arg_group='V4 Bot Templates') with self.argument_context('bot publish') as c: @@ -106,6 +105,7 @@ def load_arguments(self, _): arg_group='Bot Analytics/Application Insights', help='Azure Application Insights Application ID used to read bot analytics data. Provide an Id if ' 'you want to view analytics about your bot in the Analytics blade.') + c.argument('icon_url', help='Icon URL for bot avatar. 30K max, png only') with self.argument_context('bot prepare-publish') as c: c.argument('proj_file_path', options_list=['--proj-file-path', c.deprecate(target='--proj-name', diff --git a/src/azure-cli/azure/cli/command_modules/botservice/bot_template_deployer.py b/src/azure-cli/azure/cli/command_modules/botservice/bot_template_deployer.py index 3a10940f2c9..7070d9d5db5 100644 --- a/src/azure-cli/azure/cli/command_modules/botservice/bot_template_deployer.py +++ b/src/azure-cli/azure/cli/command_modules/botservice/bot_template_deployer.py @@ -53,14 +53,13 @@ def deploy_arm_template(cli_ctx, resource_group_name, # pylint: disable=too-man @staticmethod def create_app(cmd, logger, client, resource_group_name, resource_name, description, kind, appid, password, # pylint:disable=too-many-statements - location, sku_name, language, version, bot_template_type): + location, sku_name, language, bot_template_type): kind = 'sdk' if kind == 'webapp' else kind - (zip_url, template_name) = BotTemplateDeployer.__retrieve_bot_template_link(version, - language, + (zip_url, template_name) = BotTemplateDeployer.__retrieve_bot_template_link(language, bot_template_type) - logger.debug('Detected SDK version %s, kind %s and programming language %s. Using the following template: %s.', - version, kind, language, zip_url) + logger.debug('Detected kind %s and programming language %s. Using the following template: %s.', + kind, language, zip_url) site_name = re.sub(r'[^a-z0-9\-]', '', resource_name[:40].lower()) @@ -140,8 +139,8 @@ def _try_parse_json_object(value): return parameters @staticmethod - def __retrieve_bot_template_link(version, language, bot_template_type): - if version == 'v4' and not bot_template_type: + def __retrieve_bot_template_link(language, bot_template_type): + if not bot_template_type: return '', BotTemplateDeployer.v4_webapp_template_name response = requests.get('https://dev.botframework.com/api/misc/bottemplateroot') diff --git a/src/azure-cli/azure/cli/command_modules/botservice/custom.py b/src/azure-cli/azure/cli/command_modules/botservice/custom.py index 8b226d690e1..b35c099e37f 100644 --- a/src/azure-cli/azure/cli/command_modules/botservice/custom.py +++ b/src/azure-cli/azure/cli/command_modules/botservice/custom.py @@ -76,7 +76,7 @@ def __prepare_configuration_file(cmd, resource_group_name, kudu_client, folder_p def create(cmd, client, resource_group_name, resource_name, kind, msa_app_id, password, language=None, # pylint: disable=too-many-locals, too-many-statements description=None, display_name=None, endpoint=None, tags=None, location='Central US', - sku_name='F0', version='v4', deploy_echo=None): + sku_name='F0', deploy_echo=None): # Kind parameter validation kind = kind.lower() registration_kind = 'registration' @@ -153,7 +153,7 @@ def create(cmd, client, resource_group_name, resource_name, kind, msa_app_id, pa creation_results = BotTemplateDeployer.create_app( cmd, logger, client, resource_group_name, resource_name, description, kind, msa_app_id, password, - location, sku_name, language, version, bot_template_type) + location, sku_name, language, bot_template_type) return creation_results @@ -647,7 +647,7 @@ def publish_app(cmd, client, resource_group_name, resource_name, code_dir=None, def update(client, resource_group_name, resource_name, endpoint=None, description=None, display_name=None, tags=None, sku_name=None, app_insights_key=None, - app_insights_api_key=None, app_insights_app_id=None): + app_insights_api_key=None, app_insights_app_id=None, icon_url=None): bot = client.bots.get( resource_group_name=resource_group_name, resource_name=resource_name @@ -658,6 +658,7 @@ def update(client, resource_group_name, resource_name, endpoint=None, descriptio bot_props.description = description if description else bot_props.description bot_props.display_name = display_name if display_name else bot_props.display_name bot_props.endpoint = endpoint if endpoint else bot_props.endpoint + bot_props.icon_url = icon_url if icon_url else bot_props.icon_url bot_props.developer_app_insight_key = app_insights_key if app_insights_key else bot_props.developer_app_insight_key bot_props.developer_app_insights_application_id = app_insights_app_id if app_insights_app_id \ diff --git a/src/azure-cli/azure/cli/command_modules/botservice/tests/latest/recordings/test_botservice_show_on_v4_csharp_webapp_bot.yaml b/src/azure-cli/azure/cli/command_modules/botservice/tests/latest/recordings/test_botservice_show_on_v4_csharp_webapp_bot.yaml index 0ec72b6367f..431f1970eaf 100644 --- a/src/azure-cli/azure/cli/command_modules/botservice/tests/latest/recordings/test_botservice_show_on_v4_csharp_webapp_bot.yaml +++ b/src/azure-cli/azure/cli/command_modules/botservice/tests/latest/recordings/test_botservice_show_on_v4_csharp_webapp_bot.yaml @@ -16,7 +16,7 @@ interactions: - -g -n User-Agent: - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 azure-mgmt-botservice/0.2.0 - Azure-SDK-For-Python AZURECLI/2.0.70 + Azure-SDK-For-Python AZURECLI/2.0.73 accept-language: - en-US method: DELETE @@ -28,7 +28,7 @@ interactions: cache-control: - no-cache date: - - Tue, 06 Aug 2019 21:32:30 GMT + - Fri, 20 Sep 2019 00:04:39 GMT expires: - '-1' pragma: @@ -38,89 +38,10 @@ interactions: x-content-type-options: - nosniff x-ms-ratelimit-remaining-subscription-deletes: - - '14998' + - '14999' status: code: 204 message: No Content -- request: - body: null - headers: - Accept: - - application/json - Accept-Encoding: - - gzip, deflate - CommandName: - - bot delete - Connection: - - keep-alive - ParameterSetName: - - -g -n - User-Agent: - - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 subscriptionclient/2.2.0 - Azure-SDK-For-Python AZURECLI/2.0.70 - accept-language: - - en-US - method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/locations?api-version=2016-06-01 - response: - body: - string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/eastasia","name":"eastasia","displayName":"East - Asia","longitude":"114.188","latitude":"22.267"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/southeastasia","name":"southeastasia","displayName":"Southeast - Asia","longitude":"103.833","latitude":"1.283"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/centralus","name":"centralus","displayName":"Central - US","longitude":"-93.6208","latitude":"41.5908"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/eastus","name":"eastus","displayName":"East - US","longitude":"-79.8164","latitude":"37.3719"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/eastus2","name":"eastus2","displayName":"East - US 2","longitude":"-78.3889","latitude":"36.6681"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/westus","name":"westus","displayName":"West - US","longitude":"-122.417","latitude":"37.783"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/northcentralus","name":"northcentralus","displayName":"North - Central US","longitude":"-87.6278","latitude":"41.8819"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/southcentralus","name":"southcentralus","displayName":"South - Central US","longitude":"-98.5","latitude":"29.4167"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/northeurope","name":"northeurope","displayName":"North - Europe","longitude":"-6.2597","latitude":"53.3478"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/westeurope","name":"westeurope","displayName":"West - Europe","longitude":"4.9","latitude":"52.3667"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/japanwest","name":"japanwest","displayName":"Japan - West","longitude":"135.5022","latitude":"34.6939"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/japaneast","name":"japaneast","displayName":"Japan - East","longitude":"139.77","latitude":"35.68"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/brazilsouth","name":"brazilsouth","displayName":"Brazil - South","longitude":"-46.633","latitude":"-23.55"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/australiaeast","name":"australiaeast","displayName":"Australia - East","longitude":"151.2094","latitude":"-33.86"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/australiasoutheast","name":"australiasoutheast","displayName":"Australia - Southeast","longitude":"144.9631","latitude":"-37.8136"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/southindia","name":"southindia","displayName":"South - India","longitude":"80.1636","latitude":"12.9822"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/centralindia","name":"centralindia","displayName":"Central - India","longitude":"73.9197","latitude":"18.5822"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/westindia","name":"westindia","displayName":"West - India","longitude":"72.868","latitude":"19.088"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/canadacentral","name":"canadacentral","displayName":"Canada - Central","longitude":"-79.383","latitude":"43.653"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/canadaeast","name":"canadaeast","displayName":"Canada - East","longitude":"-71.217","latitude":"46.817"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/uksouth","name":"uksouth","displayName":"UK - South","longitude":"-0.799","latitude":"50.941"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/ukwest","name":"ukwest","displayName":"UK - West","longitude":"-3.084","latitude":"53.427"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/westcentralus","name":"westcentralus","displayName":"West - Central US","longitude":"-110.234","latitude":"40.890"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/westus2","name":"westus2","displayName":"West - US 2","longitude":"-119.852","latitude":"47.233"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/koreacentral","name":"koreacentral","displayName":"Korea - Central","longitude":"126.9780","latitude":"37.5665"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/koreasouth","name":"koreasouth","displayName":"Korea - South","longitude":"129.0756","latitude":"35.1796"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/francecentral","name":"francecentral","displayName":"France - Central","longitude":"2.3730","latitude":"46.3772"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/francesouth","name":"francesouth","displayName":"France - South","longitude":"2.1972","latitude":"43.8345"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/australiacentral","name":"australiacentral","displayName":"Australia - Central","longitude":"149.1244","latitude":"-35.3075"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/australiacentral2","name":"australiacentral2","displayName":"Australia - Central 2","longitude":"149.1244","latitude":"-35.3075"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/uaecentral","name":"uaecentral","displayName":"UAE - Central","longitude":"54.366669","latitude":"24.466667"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/uaenorth","name":"uaenorth","displayName":"UAE - North","longitude":"55.316666","latitude":"25.266666"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/southafricanorth","name":"southafricanorth","displayName":"South - Africa North","longitude":"28.218370","latitude":"-25.731340"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/southafricawest","name":"southafricawest","displayName":"South - Africa West","longitude":"18.843266","latitude":"-34.075691"}]}' - headers: - cache-control: - - no-cache - content-length: - - '6008' - content-type: - - application/json; charset=utf-8 - date: - - Tue, 06 Aug 2019 21:32:30 GMT - expires: - - '-1' - pragma: - - no-cache - strict-transport-security: - - max-age=31536000; includeSubDomains - vary: - - Accept-Encoding - x-content-type-options: - - nosniff - status: - code: 200 - message: OK - request: body: 'b''{"properties": {"template": {"$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": {"botEnv": {"type": "string", "defaultValue": @@ -167,8 +88,8 @@ interactions: "description": "[parameters(\''description\'')]"}}, "dependsOn": ["[parameters(\''serverFarmId\'')]", "[resourceId(\''Microsoft.Web/sites/\'', parameters(\''siteName\''))]", "MSDeploy"]}]}, "parameters": {"location": {"value": "westus"}, "kind": {"value": "sdk"}, "sku": - {"value": "F0"}, "siteName": {"value": "cli000002"}, "appId": {"value": "bdc62a65-f40f-42c7-92a4-0687e3a2fe73"}, - "appSecret": {"value": "f2bbf582-190f-4909-9778-004c1113f6e5"}, "serverFarmId": + {"value": "F0"}, "siteName": {"value": "cli000002"}, "appId": {"value": "61539b38-09a6-45a7-813d-700c8fe519b4"}, + "appSecret": {"value": "7eecb7a5-9c06-4933-80eb-4657f283b7fe"}, "serverFarmId": {"value": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002"}, "zipUrl": {"value": ""}, "botEnv": {"value": "prod"}, "createServerFarm": {"value": true}, "serverFarmLocation": {"value": "westus"}, "botId": {"value": "cli000002"}}, @@ -187,28 +108,28 @@ interactions: Content-Type: - application/json; charset=utf-8 ParameterSetName: - - -k -g -n --appid -p -v --lang + - -k -g -n --appid -p --lang User-Agent: - - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 resourcemanagementclient/2.2.0 - Azure-SDK-For-Python AZURECLI/2.0.70 + - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 azure-mgmt-resource/3.1.0 + Azure-SDK-For-Python AZURECLI/2.0.73 accept-language: - en-US method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment?api-version=2019-05-10 response: body: - string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Resources/deployments/cli000002","name":"cli000002","properties":{"templateHash":"4372465197576269071","parameters":{"botEnv":{"type":"String","value":"prod"},"botId":{"type":"String","value":"cli000002"},"description":{"type":"String","value":""},"location":{"type":"String","value":"westus"},"sku":{"type":"String","value":"F0"},"kind":{"type":"String","value":"sdk"},"siteName":{"type":"String","value":"cli000002"},"appId":{"type":"String","value":"bdc62a65-f40f-42c7-92a4-0687e3a2fe73"},"appSecret":{"type":"String","value":"f2bbf582-190f-4909-9778-004c1113f6e5"},"zipUrl":{"type":"String","value":""},"serverFarmId":{"type":"String","value":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002"},"createServerFarm":{"type":"Bool","value":true},"serverFarmLocation":{"type":"String","value":"westus"},"serverFarmSku":{"type":"Object","value":{"name":"S1","tier":"Standard","size":"S1","family":"S","capacity":1}},"endpoint":{"type":"String","value":""},"botFileEncryptionKey":{"type":"String","value":""}},"mode":"Incremental","provisioningState":"Accepted","timestamp":"2019-08-06T21:32:31.9766569Z","duration":"PT0.2261857S","correlationId":"94d61c8f-0a64-482a-bc48-16ff062a6ade","providers":[{"namespace":"Microsoft.Web","resourceTypes":[{"resourceType":"serverfarms","locations":["westus"]},{"resourceType":"sites","locations":["westus"]}]},{"namespace":"Microsoft.BotService","resourceTypes":[{"resourceType":"botServices","locations":["global"]}]}],"dependencies":[{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002","resourceType":"Microsoft.Web/serverfarms","resourceName":"cli000002"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002","resourceType":"Microsoft.Web/sites","resourceName":"cli000002"},{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002","resourceType":"Microsoft.Web/sites","resourceName":"cli000002"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002/Extensions/MSDeploy","resourceType":"Microsoft.Web/sites/Extensions","resourceName":"cli000002/MSDeploy"},{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002","resourceType":"Microsoft.Web/serverfarms","resourceName":"cli000002"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002","resourceType":"Microsoft.Web/sites","resourceName":"cli000002"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002/Extensions/MSDeploy","resourceType":"Microsoft.Web/sites/Extensions","resourceName":"cli000002/MSDeploy"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/Sites/cli000002/config/publishingcredentials","resourceType":"Microsoft.Web/Sites/config","resourceName":"cli000002/publishingcredentials","actionName":"list","apiVersion":"2018-02-01"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002","resourceType":"Microsoft.BotService/botServices","resourceName":"cli000002"}]}}' + string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Resources/deployments/cli000002","name":"cli000002","type":"Microsoft.Resources/deployments","properties":{"templateHash":"12265489627004014712","parameters":{"botEnv":{"type":"String","value":"prod"},"botId":{"type":"String","value":"cli000002"},"description":{"type":"String","value":""},"location":{"type":"String","value":"westus"},"sku":{"type":"String","value":"F0"},"kind":{"type":"String","value":"sdk"},"siteName":{"type":"String","value":"cli000002"},"appId":{"type":"String","value":"61539b38-09a6-45a7-813d-700c8fe519b4"},"appSecret":{"type":"String","value":"7eecb7a5-9c06-4933-80eb-4657f283b7fe"},"zipUrl":{"type":"String","value":""},"serverFarmId":{"type":"String","value":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002"},"createServerFarm":{"type":"Bool","value":true},"serverFarmLocation":{"type":"String","value":"westus"},"serverFarmSku":{"type":"Object","value":{"name":"S1","tier":"Standard","size":"S1","family":"S","capacity":1}},"endpoint":{"type":"String","value":""},"botFileEncryptionKey":{"type":"String","value":""}},"mode":"Incremental","provisioningState":"Accepted","timestamp":"2019-09-20T00:04:41.0446309Z","duration":"PT0.1662663S","correlationId":"628d7968-9bf0-42cc-bda0-1bc2bd44f8e8","providers":[{"namespace":"Microsoft.Web","resourceTypes":[{"resourceType":"serverfarms","locations":["westus"]},{"resourceType":"sites","locations":["westus"]}]},{"namespace":"Microsoft.BotService","resourceTypes":[{"resourceType":"botServices","locations":["global"]}]}],"dependencies":[{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002","resourceType":"Microsoft.Web/serverfarms","resourceName":"cli000002"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002","resourceType":"Microsoft.Web/sites","resourceName":"cli000002"},{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002","resourceType":"Microsoft.Web/sites","resourceName":"cli000002"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002/Extensions/MSDeploy","resourceType":"Microsoft.Web/sites/Extensions","resourceName":"cli000002/MSDeploy"},{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002","resourceType":"Microsoft.Web/serverfarms","resourceName":"cli000002"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002","resourceType":"Microsoft.Web/sites","resourceName":"cli000002"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002/Extensions/MSDeploy","resourceType":"Microsoft.Web/sites/Extensions","resourceName":"cli000002/MSDeploy"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/Sites/cli000002/config/publishingcredentials","resourceType":"Microsoft.Web/Sites/config","resourceName":"cli000002/publishingcredentials","actionName":"list","apiVersion":"2018-02-01"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002","resourceType":"Microsoft.BotService/botServices","resourceName":"cli000002"}]}}' headers: azure-asyncoperation: - - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/cli000002/operationStatuses/08586364797337271709?api-version=2019-05-10 + - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/cli000002/operationStatuses/08586326690045992770?api-version=2019-05-10 cache-control: - no-cache content-length: - - '3898' + - '3940' content-type: - application/json; charset=utf-8 date: - - Tue, 06 Aug 2019 21:32:31 GMT + - Fri, 20 Sep 2019 00:04:40 GMT expires: - '-1' pragma: @@ -234,12 +155,12 @@ interactions: Connection: - keep-alive ParameterSetName: - - -k -g -n --appid -p -v --lang + - -k -g -n --appid -p --lang User-Agent: - - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 resourcemanagementclient/2.2.0 - Azure-SDK-For-Python AZURECLI/2.0.70 + - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 azure-mgmt-resource/3.1.0 + Azure-SDK-For-Python AZURECLI/2.0.73 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08586364797337271709?api-version=2019-05-10 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08586326690045992770?api-version=2019-05-10 response: body: string: '{"status":"Running"}' @@ -251,15 +172,13 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Tue, 06 Aug 2019 21:33:01 GMT + - Fri, 20 Sep 2019 00:06:32 GMT expires: - '-1' pragma: - no-cache strict-transport-security: - max-age=31536000; includeSubDomains - vary: - - Accept-Encoding x-content-type-options: - nosniff status: @@ -277,12 +196,12 @@ interactions: Connection: - keep-alive ParameterSetName: - - -k -g -n --appid -p -v --lang + - -k -g -n --appid -p --lang User-Agent: - - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 resourcemanagementclient/2.2.0 - Azure-SDK-For-Python AZURECLI/2.0.70 + - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 azure-mgmt-resource/3.1.0 + Azure-SDK-For-Python AZURECLI/2.0.73 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08586364797337271709?api-version=2019-05-10 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08586326690045992770?api-version=2019-05-10 response: body: string: '{"status":"Running"}' @@ -294,7 +213,7 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Tue, 06 Aug 2019 21:33:32 GMT + - Fri, 20 Sep 2019 00:07:03 GMT expires: - '-1' pragma: @@ -320,98 +239,12 @@ interactions: Connection: - keep-alive ParameterSetName: - - -k -g -n --appid -p -v --lang + - -k -g -n --appid -p --lang User-Agent: - - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 resourcemanagementclient/2.2.0 - Azure-SDK-For-Python AZURECLI/2.0.70 + - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 azure-mgmt-resource/3.1.0 + Azure-SDK-For-Python AZURECLI/2.0.73 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08586364797337271709?api-version=2019-05-10 - response: - body: - string: '{"status":"Running"}' - headers: - cache-control: - - no-cache - content-length: - - '20' - content-type: - - application/json; charset=utf-8 - date: - - Tue, 06 Aug 2019 21:34:02 GMT - expires: - - '-1' - pragma: - - no-cache - strict-transport-security: - - max-age=31536000; includeSubDomains - vary: - - Accept-Encoding - x-content-type-options: - - nosniff - status: - code: 200 - message: OK -- request: - body: null - headers: - Accept: - - application/json - Accept-Encoding: - - gzip, deflate - CommandName: - - bot create - Connection: - - keep-alive - ParameterSetName: - - -k -g -n --appid -p -v --lang - User-Agent: - - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 resourcemanagementclient/2.2.0 - Azure-SDK-For-Python AZURECLI/2.0.70 - method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08586364797337271709?api-version=2019-05-10 - response: - body: - string: '{"status":"Running"}' - headers: - cache-control: - - no-cache - content-length: - - '20' - content-type: - - application/json; charset=utf-8 - date: - - Tue, 06 Aug 2019 21:34:33 GMT - expires: - - '-1' - pragma: - - no-cache - strict-transport-security: - - max-age=31536000; includeSubDomains - vary: - - Accept-Encoding - x-content-type-options: - - nosniff - status: - code: 200 - message: OK -- request: - body: null - headers: - Accept: - - application/json - Accept-Encoding: - - gzip, deflate - CommandName: - - bot create - Connection: - - keep-alive - ParameterSetName: - - -k -g -n --appid -p -v --lang - User-Agent: - - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 resourcemanagementclient/2.2.0 - Azure-SDK-For-Python AZURECLI/2.0.70 - method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08586364797337271709?api-version=2019-05-10 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08586326690045992770?api-version=2019-05-10 response: body: string: '{"status":"Succeeded"}' @@ -423,7 +256,7 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Tue, 06 Aug 2019 21:35:02 GMT + - Fri, 20 Sep 2019 00:07:33 GMT expires: - '-1' pragma: @@ -449,24 +282,24 @@ interactions: Connection: - keep-alive ParameterSetName: - - -k -g -n --appid -p -v --lang + - -k -g -n --appid -p --lang User-Agent: - - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 resourcemanagementclient/2.2.0 - Azure-SDK-For-Python AZURECLI/2.0.70 + - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 azure-mgmt-resource/3.1.0 + Azure-SDK-For-Python AZURECLI/2.0.73 method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment?api-version=2019-05-10 response: body: - string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Resources/deployments/cli000002","name":"cli000002","properties":{"templateHash":"4372465197576269071","parameters":{"botEnv":{"type":"String","value":"prod"},"botId":{"type":"String","value":"cli000002"},"description":{"type":"String","value":""},"location":{"type":"String","value":"westus"},"sku":{"type":"String","value":"F0"},"kind":{"type":"String","value":"sdk"},"siteName":{"type":"String","value":"cli000002"},"appId":{"type":"String","value":"bdc62a65-f40f-42c7-92a4-0687e3a2fe73"},"appSecret":{"type":"String","value":"f2bbf582-190f-4909-9778-004c1113f6e5"},"zipUrl":{"type":"String","value":""},"serverFarmId":{"type":"String","value":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002"},"createServerFarm":{"type":"Bool","value":true},"serverFarmLocation":{"type":"String","value":"westus"},"serverFarmSku":{"type":"Object","value":{"name":"S1","tier":"Standard","size":"S1","family":"S","capacity":1}},"endpoint":{"type":"String","value":""},"botFileEncryptionKey":{"type":"String","value":""}},"mode":"Incremental","provisioningState":"Succeeded","timestamp":"2019-08-06T21:34:33.8651416Z","duration":"PT2M2.1146704S","correlationId":"94d61c8f-0a64-482a-bc48-16ff062a6ade","providers":[{"namespace":"Microsoft.Web","resourceTypes":[{"resourceType":"serverfarms","locations":["westus"]},{"resourceType":"sites","locations":["westus"]}]},{"namespace":"Microsoft.BotService","resourceTypes":[{"resourceType":"botServices","locations":["global"]}]}],"dependencies":[{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002","resourceType":"Microsoft.Web/serverfarms","resourceName":"cli000002"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002","resourceType":"Microsoft.Web/sites","resourceName":"cli000002"},{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002","resourceType":"Microsoft.Web/sites","resourceName":"cli000002"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002/Extensions/MSDeploy","resourceType":"Microsoft.Web/sites/Extensions","resourceName":"cli000002/MSDeploy"},{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002","resourceType":"Microsoft.Web/serverfarms","resourceName":"cli000002"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002","resourceType":"Microsoft.Web/sites","resourceName":"cli000002"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002/Extensions/MSDeploy","resourceType":"Microsoft.Web/sites/Extensions","resourceName":"cli000002/MSDeploy"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/Sites/cli000002/config/publishingcredentials","resourceType":"Microsoft.Web/Sites/config","resourceName":"cli000002/publishingcredentials","actionName":"list","apiVersion":"2018-02-01"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002","resourceType":"Microsoft.BotService/botServices","resourceName":"cli000002"}],"outputResources":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002/Extensions/MSDeploy"}]}}' + string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Resources/deployments/cli000002","name":"cli000002","type":"Microsoft.Resources/deployments","properties":{"templateHash":"12265489627004014712","parameters":{"botEnv":{"type":"String","value":"prod"},"botId":{"type":"String","value":"cli000002"},"description":{"type":"String","value":""},"location":{"type":"String","value":"westus"},"sku":{"type":"String","value":"F0"},"kind":{"type":"String","value":"sdk"},"siteName":{"type":"String","value":"cli000002"},"appId":{"type":"String","value":"61539b38-09a6-45a7-813d-700c8fe519b4"},"appSecret":{"type":"String","value":"7eecb7a5-9c06-4933-80eb-4657f283b7fe"},"zipUrl":{"type":"String","value":""},"serverFarmId":{"type":"String","value":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002"},"createServerFarm":{"type":"Bool","value":true},"serverFarmLocation":{"type":"String","value":"westus"},"serverFarmSku":{"type":"Object","value":{"name":"S1","tier":"Standard","size":"S1","family":"S","capacity":1}},"endpoint":{"type":"String","value":""},"botFileEncryptionKey":{"type":"String","value":""}},"mode":"Incremental","provisioningState":"Succeeded","timestamp":"2019-09-20T00:07:07.7765997Z","duration":"PT2M26.8982351S","correlationId":"628d7968-9bf0-42cc-bda0-1bc2bd44f8e8","providers":[{"namespace":"Microsoft.Web","resourceTypes":[{"resourceType":"serverfarms","locations":["westus"]},{"resourceType":"sites","locations":["westus"]}]},{"namespace":"Microsoft.BotService","resourceTypes":[{"resourceType":"botServices","locations":["global"]}]}],"dependencies":[{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002","resourceType":"Microsoft.Web/serverfarms","resourceName":"cli000002"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002","resourceType":"Microsoft.Web/sites","resourceName":"cli000002"},{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002","resourceType":"Microsoft.Web/sites","resourceName":"cli000002"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002/Extensions/MSDeploy","resourceType":"Microsoft.Web/sites/Extensions","resourceName":"cli000002/MSDeploy"},{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002","resourceType":"Microsoft.Web/serverfarms","resourceName":"cli000002"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002","resourceType":"Microsoft.Web/sites","resourceName":"cli000002"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002/Extensions/MSDeploy","resourceType":"Microsoft.Web/sites/Extensions","resourceName":"cli000002/MSDeploy"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/Sites/cli000002/config/publishingcredentials","resourceType":"Microsoft.Web/Sites/config","resourceName":"cli000002/publishingcredentials","actionName":"list","apiVersion":"2018-02-01"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002","resourceType":"Microsoft.BotService/botServices","resourceName":"cli000002"}],"outputResources":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002"}]}}' headers: cache-control: - no-cache content-length: - - '4532' + - '4412' content-type: - application/json; charset=utf-8 date: - - Tue, 06 Aug 2019 21:35:02 GMT + - Fri, 20 Sep 2019 00:07:33 GMT expires: - '-1' pragma: @@ -492,17 +325,17 @@ interactions: Connection: - keep-alive ParameterSetName: - - -k -g -n --appid -p -v --lang + - -k -g -n --appid -p --lang User-Agent: - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 azure-mgmt-botservice/0.2.0 - Azure-SDK-For-Python AZURECLI/2.0.70 + Azure-SDK-For-Python AZURECLI/2.0.73 accept-language: - en-US method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002?api-version=2018-07-12 response: body: - string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002","name":"cli000002","type":"Microsoft.BotService/botServices","etag":"\"17004ad1-0000-0100-0000-5d49f2690000\"","location":"global","sku":{"name":"F0"},"kind":"sdk","tags":{},"properties":{"displayName":"cli000002","description":null,"iconUrl":"https://docs.botframework.com/static/devportal/client/images/bot-framework-default.png","endpoint":"https://cli000002.azurewebsites.net/api/messages","msaAppId":"bdc62a65-f40f-42c7-92a4-0687e3a2fe73","developerAppInsightKey":null,"developerAppInsightsApplicationId":null,"luisAppIds":[],"endpointVersion":"3.0","configuredChannels":["webchat"],"enabledChannels":["webchat","directline"],"isDeveloperAppInsightsApiKeySet":false,"isStreamingSupported":false,"publishingCredentials":null,"parameters":null,"allSettings":null,"manifestUrl":null,"storageResourceId":null,"provisioningState":"Succeeded"}}' + string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002","name":"cli000002","type":"Microsoft.BotService/botServices","etag":"\"2000116d-0000-0100-0000-5d84182b0000\"","location":"global","sku":{"name":"F0"},"kind":"sdk","tags":{},"properties":{"displayName":"cli000002","description":null,"iconUrl":"https://docs.botframework.com/static/devportal/client/images/bot-framework-default.png","endpoint":"https://cli000002.azurewebsites.net/api/messages","msaAppId":"61539b38-09a6-45a7-813d-700c8fe519b4","developerAppInsightKey":null,"developerAppInsightsApplicationId":null,"luisAppIds":[],"endpointVersion":"3.0","configuredChannels":["webchat"],"enabledChannels":["webchat","directline"],"isDeveloperAppInsightsApiKeySet":false,"isStreamingSupported":false,"publishingCredentials":null,"parameters":null,"allSettings":null,"manifestUrl":null,"storageResourceId":null,"provisioningState":"Succeeded"}}' headers: cache-control: - no-cache @@ -511,9 +344,9 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Tue, 06 Aug 2019 21:35:04 GMT + - Fri, 20 Sep 2019 00:07:33 GMT etag: - - '"17004ad1-0000-0100-0000-5d49f2690000"' + - '"2000116d-0000-0100-0000-5d84182b0000"' expires: - '-1' pragma: @@ -546,14 +379,14 @@ interactions: - -g -n --msbot User-Agent: - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 azure-mgmt-botservice/0.2.0 - Azure-SDK-For-Python AZURECLI/2.0.70 + Azure-SDK-For-Python AZURECLI/2.0.73 accept-language: - en-US method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002?api-version=2018-07-12 response: body: - string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002","name":"cli000002","type":"Microsoft.BotService/botServices","etag":"\"17004ad1-0000-0100-0000-5d49f2690000\"","location":"global","sku":{"name":"F0"},"kind":"sdk","tags":{},"properties":{"displayName":"cli000002","description":null,"iconUrl":"https://docs.botframework.com/static/devportal/client/images/bot-framework-default.png","endpoint":"https://cli000002.azurewebsites.net/api/messages","msaAppId":"bdc62a65-f40f-42c7-92a4-0687e3a2fe73","developerAppInsightKey":null,"developerAppInsightsApplicationId":null,"luisAppIds":[],"endpointVersion":"3.0","configuredChannels":["webchat"],"enabledChannels":["webchat","directline"],"isDeveloperAppInsightsApiKeySet":false,"isStreamingSupported":false,"publishingCredentials":null,"parameters":null,"allSettings":null,"manifestUrl":null,"storageResourceId":null,"provisioningState":"Succeeded"}}' + string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002","name":"cli000002","type":"Microsoft.BotService/botServices","etag":"\"2000116d-0000-0100-0000-5d84182b0000\"","location":"global","sku":{"name":"F0"},"kind":"sdk","tags":{},"properties":{"displayName":"cli000002","description":null,"iconUrl":"https://docs.botframework.com/static/devportal/client/images/bot-framework-default.png","endpoint":"https://cli000002.azurewebsites.net/api/messages","msaAppId":"61539b38-09a6-45a7-813d-700c8fe519b4","developerAppInsightKey":null,"developerAppInsightsApplicationId":null,"luisAppIds":[],"endpointVersion":"3.0","configuredChannels":["webchat"],"enabledChannels":["webchat","directline"],"isDeveloperAppInsightsApiKeySet":false,"isStreamingSupported":false,"publishingCredentials":null,"parameters":null,"allSettings":null,"manifestUrl":null,"storageResourceId":null,"provisioningState":"Succeeded"}}' headers: cache-control: - no-cache @@ -562,9 +395,9 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Tue, 06 Aug 2019 21:35:04 GMT + - Fri, 20 Sep 2019 00:08:02 GMT etag: - - '"17004ad1-0000-0100-0000-5d49f2690000"' + - '"2000116d-0000-0100-0000-5d84182b0000"' expires: - '-1' pragma: @@ -573,10 +406,8 @@ interactions: - Microsoft-IIS/10.0 strict-transport-security: - max-age=31536000; includeSubDomains - transfer-encoding: - - chunked vary: - - Accept-Encoding,Accept-Encoding + - Accept-Encoding x-content-type-options: - nosniff status: @@ -599,7 +430,7 @@ interactions: - -g -n --msbot User-Agent: - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 azure-mgmt-web/0.42.0 - Azure-SDK-For-Python AZURECLI/2.0.70 + Azure-SDK-For-Python AZURECLI/2.0.73 accept-language: - en-US method: POST @@ -607,7 +438,7 @@ interactions: response: body: string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002/config/appsettings","name":"appsettings","type":"Microsoft.Web/sites/config","location":"West - US","properties":{"WEBSITE_NODE_DEFAULT_VERSION":"10.14.1","MicrosoftAppId":"bdc62a65-f40f-42c7-92a4-0687e3a2fe73","MicrosoftAppPassword":"f2bbf582-190f-4909-9778-004c1113f6e5"}}' + US","properties":{"WEBSITE_NODE_DEFAULT_VERSION":"10.14.1","MicrosoftAppId":"61539b38-09a6-45a7-813d-700c8fe519b4","MicrosoftAppPassword":"7eecb7a5-9c06-4933-80eb-4657f283b7fe"}}' headers: cache-control: - no-cache @@ -616,7 +447,7 @@ interactions: content-type: - application/json date: - - Tue, 06 Aug 2019 21:35:05 GMT + - Fri, 20 Sep 2019 00:08:03 GMT expires: - '-1' pragma: @@ -655,7 +486,7 @@ interactions: - -g -n --msbot User-Agent: - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 azure-mgmt-web/0.42.0 - Azure-SDK-For-Python AZURECLI/2.0.70 + Azure-SDK-For-Python AZURECLI/2.0.73 accept-language: - en-US method: GET @@ -672,7 +503,7 @@ interactions: content-type: - application/json date: - - Tue, 06 Aug 2019 21:35:06 GMT + - Fri, 20 Sep 2019 00:08:04 GMT expires: - '-1' pragma: diff --git a/src/azure-cli/azure/cli/command_modules/botservice/tests/latest/recordings/test_botservice_update_should_update_bot_properties.yaml b/src/azure-cli/azure/cli/command_modules/botservice/tests/latest/recordings/test_botservice_update_should_update_bot_properties.yaml index b8890a52494..3b6509809c8 100644 --- a/src/azure-cli/azure/cli/command_modules/botservice/tests/latest/recordings/test_botservice_update_should_update_bot_properties.yaml +++ b/src/azure-cli/azure/cli/command_modules/botservice/tests/latest/recordings/test_botservice_update_should_update_bot_properties.yaml @@ -16,7 +16,7 @@ interactions: - -g -n User-Agent: - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 azure-mgmt-botservice/0.2.0 - Azure-SDK-For-Python AZURECLI/2.0.70 + Azure-SDK-For-Python AZURECLI/2.0.73 accept-language: - en-US method: DELETE @@ -28,7 +28,7 @@ interactions: cache-control: - no-cache date: - - Tue, 06 Aug 2019 21:37:15 GMT + - Thu, 19 Sep 2019 23:10:06 GMT expires: - '-1' pragma: @@ -38,92 +38,13 @@ interactions: x-content-type-options: - nosniff x-ms-ratelimit-remaining-subscription-deletes: - - '14998' + - '14999' status: code: 204 message: No Content -- request: - body: null - headers: - Accept: - - application/json - Accept-Encoding: - - gzip, deflate - CommandName: - - bot delete - Connection: - - keep-alive - ParameterSetName: - - -g -n - User-Agent: - - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 subscriptionclient/2.2.0 - Azure-SDK-For-Python AZURECLI/2.0.70 - accept-language: - - en-US - method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/locations?api-version=2016-06-01 - response: - body: - string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/eastasia","name":"eastasia","displayName":"East - Asia","longitude":"114.188","latitude":"22.267"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/southeastasia","name":"southeastasia","displayName":"Southeast - Asia","longitude":"103.833","latitude":"1.283"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/centralus","name":"centralus","displayName":"Central - US","longitude":"-93.6208","latitude":"41.5908"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/eastus","name":"eastus","displayName":"East - US","longitude":"-79.8164","latitude":"37.3719"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/eastus2","name":"eastus2","displayName":"East - US 2","longitude":"-78.3889","latitude":"36.6681"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/westus","name":"westus","displayName":"West - US","longitude":"-122.417","latitude":"37.783"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/northcentralus","name":"northcentralus","displayName":"North - Central US","longitude":"-87.6278","latitude":"41.8819"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/southcentralus","name":"southcentralus","displayName":"South - Central US","longitude":"-98.5","latitude":"29.4167"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/northeurope","name":"northeurope","displayName":"North - Europe","longitude":"-6.2597","latitude":"53.3478"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/westeurope","name":"westeurope","displayName":"West - Europe","longitude":"4.9","latitude":"52.3667"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/japanwest","name":"japanwest","displayName":"Japan - West","longitude":"135.5022","latitude":"34.6939"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/japaneast","name":"japaneast","displayName":"Japan - East","longitude":"139.77","latitude":"35.68"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/brazilsouth","name":"brazilsouth","displayName":"Brazil - South","longitude":"-46.633","latitude":"-23.55"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/australiaeast","name":"australiaeast","displayName":"Australia - East","longitude":"151.2094","latitude":"-33.86"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/australiasoutheast","name":"australiasoutheast","displayName":"Australia - Southeast","longitude":"144.9631","latitude":"-37.8136"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/southindia","name":"southindia","displayName":"South - India","longitude":"80.1636","latitude":"12.9822"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/centralindia","name":"centralindia","displayName":"Central - India","longitude":"73.9197","latitude":"18.5822"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/westindia","name":"westindia","displayName":"West - India","longitude":"72.868","latitude":"19.088"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/canadacentral","name":"canadacentral","displayName":"Canada - Central","longitude":"-79.383","latitude":"43.653"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/canadaeast","name":"canadaeast","displayName":"Canada - East","longitude":"-71.217","latitude":"46.817"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/uksouth","name":"uksouth","displayName":"UK - South","longitude":"-0.799","latitude":"50.941"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/ukwest","name":"ukwest","displayName":"UK - West","longitude":"-3.084","latitude":"53.427"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/westcentralus","name":"westcentralus","displayName":"West - Central US","longitude":"-110.234","latitude":"40.890"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/westus2","name":"westus2","displayName":"West - US 2","longitude":"-119.852","latitude":"47.233"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/koreacentral","name":"koreacentral","displayName":"Korea - Central","longitude":"126.9780","latitude":"37.5665"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/koreasouth","name":"koreasouth","displayName":"Korea - South","longitude":"129.0756","latitude":"35.1796"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/francecentral","name":"francecentral","displayName":"France - Central","longitude":"2.3730","latitude":"46.3772"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/francesouth","name":"francesouth","displayName":"France - South","longitude":"2.1972","latitude":"43.8345"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/australiacentral","name":"australiacentral","displayName":"Australia - Central","longitude":"149.1244","latitude":"-35.3075"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/australiacentral2","name":"australiacentral2","displayName":"Australia - Central 2","longitude":"149.1244","latitude":"-35.3075"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/uaecentral","name":"uaecentral","displayName":"UAE - Central","longitude":"54.366669","latitude":"24.466667"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/uaenorth","name":"uaenorth","displayName":"UAE - North","longitude":"55.316666","latitude":"25.266666"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/southafricanorth","name":"southafricanorth","displayName":"South - Africa North","longitude":"28.218370","latitude":"-25.731340"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/southafricawest","name":"southafricawest","displayName":"South - Africa West","longitude":"18.843266","latitude":"-34.075691"}]}' - headers: - cache-control: - - no-cache - content-length: - - '6008' - content-type: - - application/json; charset=utf-8 - date: - - Tue, 06 Aug 2019 21:37:15 GMT - expires: - - '-1' - pragma: - - no-cache - strict-transport-security: - - max-age=31536000; includeSubDomains - vary: - - Accept-Encoding - x-content-type-options: - - nosniff - status: - code: 200 - message: OK - request: body: '{"location": "global", "sku": {"name": "F0"}, "kind": "bot", "properties": - {"displayName": "cli000002", "endpoint": "", "msaAppId": "2e0d5692-be3b-4416-b874-9bf59ab52f29"}}' + {"displayName": "cli000002", "endpoint": "", "msaAppId": "4454b736-4f0c-4c16-844f-e7a1570ef06a"}}' headers: Accept: - application/json @@ -141,14 +62,14 @@ interactions: - -k -g -n --appid -p User-Agent: - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 azure-mgmt-botservice/0.2.0 - Azure-SDK-For-Python AZURECLI/2.0.70 + Azure-SDK-For-Python AZURECLI/2.0.73 accept-language: - en-US method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002?api-version=2018-07-12 response: body: - string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002","name":"cli000002","type":"Microsoft.BotService/botServices","etag":"\"17007bd5-0000-0100-0000-5d49f30d0000\"","location":"global","sku":{"name":"F0"},"kind":"bot","tags":{},"properties":{"displayName":"cli000002","description":null,"iconUrl":"https://docs.botframework.com/static/devportal/client/images/bot-framework-default.png","endpoint":"","msaAppId":"2e0d5692-be3b-4416-b874-9bf59ab52f29","developerAppInsightKey":null,"developerAppInsightsApplicationId":null,"luisAppIds":[],"endpointVersion":"3.0","configuredChannels":["webchat"],"enabledChannels":["webchat","directline"],"isDeveloperAppInsightsApiKeySet":false,"isStreamingSupported":false,"publishingCredentials":null,"parameters":null,"allSettings":null,"manifestUrl":null,"storageResourceId":null,"provisioningState":"Succeeded"}}' + string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002","name":"cli000002","type":"Microsoft.BotService/botServices","etag":"\"20000344-0000-0100-0000-5d840ad10000\"","location":"global","sku":{"name":"F0"},"kind":"bot","tags":{},"properties":{"displayName":"cli000002","description":null,"iconUrl":"https://docs.botframework.com/static/devportal/client/images/bot-framework-default.png","endpoint":"","msaAppId":"4454b736-4f0c-4c16-844f-e7a1570ef06a","developerAppInsightKey":null,"developerAppInsightsApplicationId":null,"luisAppIds":[],"endpointVersion":"3.0","configuredChannels":["webchat"],"enabledChannels":["webchat","directline"],"isDeveloperAppInsightsApiKeySet":false,"isStreamingSupported":false,"publishingCredentials":null,"parameters":null,"allSettings":null,"manifestUrl":null,"storageResourceId":null,"provisioningState":"Succeeded"}}' headers: cache-control: - no-cache @@ -157,9 +78,9 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Tue, 06 Aug 2019 21:37:18 GMT + - Thu, 19 Sep 2019 23:10:08 GMT etag: - - '"17007bd5-0000-0100-0000-5d49f30d0000"' + - '"20000344-0000-0100-0000-5d840ad10000"' expires: - '-1' pragma: @@ -187,17 +108,17 @@ interactions: Connection: - keep-alive ParameterSetName: - - -g -n -e --description --sku -d --ai-key --ai-api-key --ai-app-id --tags + - -g -n -e --description --sku -d --ai-key --ai-api-key --ai-app-id --tags --icon-url User-Agent: - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 azure-mgmt-botservice/0.2.0 - Azure-SDK-For-Python AZURECLI/2.0.70 + Azure-SDK-For-Python AZURECLI/2.0.73 accept-language: - en-US method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002?api-version=2018-07-12 response: body: - string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002","name":"cli000002","type":"Microsoft.BotService/botServices","etag":"\"17007bd5-0000-0100-0000-5d49f30d0000\"","location":"global","sku":{"name":"F0"},"kind":"bot","tags":{},"properties":{"displayName":"cli000002","description":null,"iconUrl":"https://docs.botframework.com/static/devportal/client/images/bot-framework-default.png","endpoint":"","msaAppId":"2e0d5692-be3b-4416-b874-9bf59ab52f29","developerAppInsightKey":null,"developerAppInsightsApplicationId":null,"luisAppIds":[],"endpointVersion":"3.0","configuredChannels":["webchat"],"enabledChannels":["webchat","directline"],"isDeveloperAppInsightsApiKeySet":false,"isStreamingSupported":false,"publishingCredentials":null,"parameters":null,"allSettings":null,"manifestUrl":null,"storageResourceId":null,"provisioningState":"Succeeded"}}' + string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002","name":"cli000002","type":"Microsoft.BotService/botServices","etag":"\"20000344-0000-0100-0000-5d840ad10000\"","location":"global","sku":{"name":"F0"},"kind":"bot","tags":{},"properties":{"displayName":"cli000002","description":null,"iconUrl":"https://docs.botframework.com/static/devportal/client/images/bot-framework-default.png","endpoint":"","msaAppId":"4454b736-4f0c-4c16-844f-e7a1570ef06a","developerAppInsightKey":null,"developerAppInsightsApplicationId":null,"luisAppIds":[],"endpointVersion":"3.0","configuredChannels":["webchat"],"enabledChannels":["webchat","directline"],"isDeveloperAppInsightsApiKeySet":false,"isStreamingSupported":false,"publishingCredentials":null,"parameters":null,"allSettings":null,"manifestUrl":null,"storageResourceId":null,"provisioningState":"Succeeded"}}' headers: cache-control: - no-cache @@ -206,9 +127,9 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Tue, 06 Aug 2019 21:37:17 GMT + - Thu, 19 Sep 2019 23:10:09 GMT etag: - - '"17007bd5-0000-0100-0000-5d49f30d0000"' + - '"20000344-0000-0100-0000-5d840ad10000"' expires: - '-1' pragma: @@ -228,10 +149,10 @@ interactions: message: OK - request: body: '{"tags": {"Hello": "Microsoft!"}, "sku": {"name": "S1"}, "properties": - {"displayName": "clitestbot", "description": "HelloWorld!", "iconUrl": "https://docs.botframework.com/static/devportal/client/images/bot-framework-default.png", - "endpoint": "https://dev.botframework.com/api/messages", "msaAppId": "2e0d5692-be3b-4416-b874-9bf59ab52f29", - "developerAppInsightKey": "3c0f660f-2754-4f61-9bfe-75e57490ac50", "developerAppInsightsApiKey": - "cli.000003", "developerAppInsightsApplicationId": "acbaece3-0061-47b5-8814-68fffd33392a", + {"displayName": "clitestbot", "description": "HelloWorld!", "iconUrl": "https://dev.botframework.com/client/images/channels/icons/directline.png", + "endpoint": "https://dev.botframework.com/api/messages", "msaAppId": "4454b736-4f0c-4c16-844f-e7a1570ef06a", + "developerAppInsightKey": "22aca8c9-c96e-4316-a0da-2707b7d987fc", "developerAppInsightsApiKey": + "cli.000003", "developerAppInsightsApplicationId": "31cc44da-1017-46c8-89f8-7af824852d98", "luisAppIds": []}}' headers: Accept: @@ -243,32 +164,32 @@ interactions: Connection: - keep-alive Content-Length: - - '576' + - '562' Content-Type: - application/json; charset=utf-8 ParameterSetName: - - -g -n -e --description --sku -d --ai-key --ai-api-key --ai-app-id --tags + - -g -n -e --description --sku -d --ai-key --ai-api-key --ai-app-id --tags --icon-url User-Agent: - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 azure-mgmt-botservice/0.2.0 - Azure-SDK-For-Python AZURECLI/2.0.70 + Azure-SDK-For-Python AZURECLI/2.0.73 accept-language: - en-US method: PATCH uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002?api-version=2018-07-12 response: body: - string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002","name":"cli000002","type":"Microsoft.BotService/botServices","etag":"\"170088d5-0000-0100-0000-5d49f30f0000\"","location":"global","sku":{"name":"S1"},"kind":"bot","tags":{"Hello":"Microsoft!"},"properties":{"displayName":"clitestbot","description":"HelloWorld!","iconUrl":"https://docs.botframework.com/static/devportal/client/images/bot-framework-default.png","endpoint":"https://dev.botframework.com/api/messages","msaAppId":"2e0d5692-be3b-4416-b874-9bf59ab52f29","developerAppInsightKey":"3c0f660f-2754-4f61-9bfe-75e57490ac50","developerAppInsightsApplicationId":"acbaece3-0061-47b5-8814-68fffd33392a","luisAppIds":[],"endpointVersion":"3.0","configuredChannels":["webchat"],"enabledChannels":["webchat","directline"],"isDeveloperAppInsightsApiKeySet":true,"isStreamingSupported":false,"publishingCredentials":null,"parameters":null,"allSettings":null,"manifestUrl":null,"storageResourceId":null,"provisioningState":"Succeeded"}}' + string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002","name":"cli000002","type":"Microsoft.BotService/botServices","etag":"\"20001244-0000-0100-0000-5d840ad30000\"","location":"global","sku":{"name":"S1"},"kind":"bot","tags":{"Hello":"Microsoft!"},"properties":{"displayName":"clitestbot","description":"HelloWorld!","iconUrl":"https://dev.botframework.com/client/images/channels/icons/directline.png","endpoint":"https://dev.botframework.com/api/messages","msaAppId":"4454b736-4f0c-4c16-844f-e7a1570ef06a","developerAppInsightKey":"22aca8c9-c96e-4316-a0da-2707b7d987fc","developerAppInsightsApplicationId":"31cc44da-1017-46c8-89f8-7af824852d98","luisAppIds":[],"endpointVersion":"3.0","configuredChannels":["webchat"],"enabledChannels":["webchat","directline"],"isDeveloperAppInsightsApiKeySet":true,"isStreamingSupported":false,"publishingCredentials":null,"parameters":null,"allSettings":null,"manifestUrl":null,"storageResourceId":null,"provisioningState":"Succeeded"}}' headers: cache-control: - no-cache content-length: - - '1094' + - '1080' content-type: - application/json; charset=utf-8 date: - - Tue, 06 Aug 2019 21:37:19 GMT + - Thu, 19 Sep 2019 23:10:10 GMT etag: - - '"170088d5-0000-0100-0000-5d49f30f0000"' + - '"20001244-0000-0100-0000-5d840ad30000"' expires: - '-1' pragma: diff --git a/src/azure-cli/azure/cli/command_modules/botservice/tests/latest/recordings/test_create_v4_webapp_bot_should_succeed_with_ending_hyphen.yaml b/src/azure-cli/azure/cli/command_modules/botservice/tests/latest/recordings/test_create_v4_webapp_bot_should_succeed_with_ending_hyphen.yaml index cef31f946b7..5238aeae79b 100644 --- a/src/azure-cli/azure/cli/command_modules/botservice/tests/latest/recordings/test_create_v4_webapp_bot_should_succeed_with_ending_hyphen.yaml +++ b/src/azure-cli/azure/cli/command_modules/botservice/tests/latest/recordings/test_create_v4_webapp_bot_should_succeed_with_ending_hyphen.yaml @@ -16,7 +16,7 @@ interactions: - -g -n User-Agent: - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 azure-mgmt-botservice/0.2.0 - Azure-SDK-For-Python AZURECLI/2.0.70 + Azure-SDK-For-Python AZURECLI/2.0.73 accept-language: - en-US method: DELETE @@ -28,7 +28,7 @@ interactions: cache-control: - no-cache date: - - Tue, 06 Aug 2019 21:37:21 GMT + - Fri, 20 Sep 2019 00:10:55 GMT expires: - '-1' pragma: @@ -42,85 +42,6 @@ interactions: status: code: 204 message: No Content -- request: - body: null - headers: - Accept: - - application/json - Accept-Encoding: - - gzip, deflate - CommandName: - - bot delete - Connection: - - keep-alive - ParameterSetName: - - -g -n - User-Agent: - - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 subscriptionclient/2.2.0 - Azure-SDK-For-Python AZURECLI/2.0.70 - accept-language: - - en-US - method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/locations?api-version=2016-06-01 - response: - body: - string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/eastasia","name":"eastasia","displayName":"East - Asia","longitude":"114.188","latitude":"22.267"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/southeastasia","name":"southeastasia","displayName":"Southeast - Asia","longitude":"103.833","latitude":"1.283"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/centralus","name":"centralus","displayName":"Central - US","longitude":"-93.6208","latitude":"41.5908"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/eastus","name":"eastus","displayName":"East - US","longitude":"-79.8164","latitude":"37.3719"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/eastus2","name":"eastus2","displayName":"East - US 2","longitude":"-78.3889","latitude":"36.6681"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/westus","name":"westus","displayName":"West - US","longitude":"-122.417","latitude":"37.783"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/northcentralus","name":"northcentralus","displayName":"North - Central US","longitude":"-87.6278","latitude":"41.8819"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/southcentralus","name":"southcentralus","displayName":"South - Central US","longitude":"-98.5","latitude":"29.4167"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/northeurope","name":"northeurope","displayName":"North - Europe","longitude":"-6.2597","latitude":"53.3478"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/westeurope","name":"westeurope","displayName":"West - Europe","longitude":"4.9","latitude":"52.3667"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/japanwest","name":"japanwest","displayName":"Japan - West","longitude":"135.5022","latitude":"34.6939"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/japaneast","name":"japaneast","displayName":"Japan - East","longitude":"139.77","latitude":"35.68"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/brazilsouth","name":"brazilsouth","displayName":"Brazil - South","longitude":"-46.633","latitude":"-23.55"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/australiaeast","name":"australiaeast","displayName":"Australia - East","longitude":"151.2094","latitude":"-33.86"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/australiasoutheast","name":"australiasoutheast","displayName":"Australia - Southeast","longitude":"144.9631","latitude":"-37.8136"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/southindia","name":"southindia","displayName":"South - India","longitude":"80.1636","latitude":"12.9822"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/centralindia","name":"centralindia","displayName":"Central - India","longitude":"73.9197","latitude":"18.5822"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/westindia","name":"westindia","displayName":"West - India","longitude":"72.868","latitude":"19.088"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/canadacentral","name":"canadacentral","displayName":"Canada - Central","longitude":"-79.383","latitude":"43.653"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/canadaeast","name":"canadaeast","displayName":"Canada - East","longitude":"-71.217","latitude":"46.817"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/uksouth","name":"uksouth","displayName":"UK - South","longitude":"-0.799","latitude":"50.941"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/ukwest","name":"ukwest","displayName":"UK - West","longitude":"-3.084","latitude":"53.427"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/westcentralus","name":"westcentralus","displayName":"West - Central US","longitude":"-110.234","latitude":"40.890"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/westus2","name":"westus2","displayName":"West - US 2","longitude":"-119.852","latitude":"47.233"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/koreacentral","name":"koreacentral","displayName":"Korea - Central","longitude":"126.9780","latitude":"37.5665"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/koreasouth","name":"koreasouth","displayName":"Korea - South","longitude":"129.0756","latitude":"35.1796"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/francecentral","name":"francecentral","displayName":"France - Central","longitude":"2.3730","latitude":"46.3772"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/francesouth","name":"francesouth","displayName":"France - South","longitude":"2.1972","latitude":"43.8345"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/australiacentral","name":"australiacentral","displayName":"Australia - Central","longitude":"149.1244","latitude":"-35.3075"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/australiacentral2","name":"australiacentral2","displayName":"Australia - Central 2","longitude":"149.1244","latitude":"-35.3075"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/uaecentral","name":"uaecentral","displayName":"UAE - Central","longitude":"54.366669","latitude":"24.466667"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/uaenorth","name":"uaenorth","displayName":"UAE - North","longitude":"55.316666","latitude":"25.266666"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/southafricanorth","name":"southafricanorth","displayName":"South - Africa North","longitude":"28.218370","latitude":"-25.731340"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/locations/southafricawest","name":"southafricawest","displayName":"South - Africa West","longitude":"18.843266","latitude":"-34.075691"}]}' - headers: - cache-control: - - no-cache - content-length: - - '6008' - content-type: - - application/json; charset=utf-8 - date: - - Tue, 06 Aug 2019 21:37:22 GMT - expires: - - '-1' - pragma: - - no-cache - strict-transport-security: - - max-age=31536000; includeSubDomains - vary: - - Accept-Encoding - x-content-type-options: - - nosniff - status: - code: 200 - message: OK - request: body: 'b''{"properties": {"template": {"$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", "contentVersion": "1.0.0.0", "parameters": {"botEnv": {"type": "string", "defaultValue": @@ -167,8 +88,8 @@ interactions: "description": "[parameters(\''description\'')]"}}, "dependsOn": ["[parameters(\''serverFarmId\'')]", "[resourceId(\''Microsoft.Web/sites/\'', parameters(\''siteName\''))]", "MSDeploy"]}]}, "parameters": {"location": {"value": "westus"}, "kind": {"value": "sdk"}, "sku": - {"value": "F0"}, "siteName": {"value": "cli000002"}, "appId": {"value": "39f8cead-2225-40ea-9981-77eb912ecde7"}, - "appSecret": {"value": "649ac65d-997a-4f72-8eb2-8c738a536b10"}, "serverFarmId": + {"value": "F0"}, "siteName": {"value": "cli000002"}, "appId": {"value": "20e34264-e95e-4c02-9a43-b5139a35b9e7"}, + "appSecret": {"value": "2d23bce6-1423-418d-9f78-b244ca2fb360"}, "serverFarmId": {"value": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002-"}, "zipUrl": {"value": ""}, "botEnv": {"value": "prod"}, "createServerFarm": {"value": true}, "serverFarmLocation": {"value": "westus"}, "botId": {"value": "cli000002-"}}, @@ -187,28 +108,28 @@ interactions: Content-Type: - application/json; charset=utf-8 ParameterSetName: - - -k -g -n --appid -p -v --lang + - -k -g -n --appid -p --lang User-Agent: - - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 resourcemanagementclient/2.2.0 - Azure-SDK-For-Python AZURECLI/2.0.70 + - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 azure-mgmt-resource/3.1.0 + Azure-SDK-For-Python AZURECLI/2.0.73 accept-language: - en-US method: PUT uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment?api-version=2019-05-10 response: body: - string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Resources/deployments/cli000002-","name":"cli000002-","properties":{"templateHash":"4372465197576269071","parameters":{"botEnv":{"type":"String","value":"prod"},"botId":{"type":"String","value":"cli000002-"},"description":{"type":"String","value":""},"location":{"type":"String","value":"westus"},"sku":{"type":"String","value":"F0"},"kind":{"type":"String","value":"sdk"},"siteName":{"type":"String","value":"cli000002"},"appId":{"type":"String","value":"39f8cead-2225-40ea-9981-77eb912ecde7"},"appSecret":{"type":"String","value":"649ac65d-997a-4f72-8eb2-8c738a536b10"},"zipUrl":{"type":"String","value":""},"serverFarmId":{"type":"String","value":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002-"},"createServerFarm":{"type":"Bool","value":true},"serverFarmLocation":{"type":"String","value":"westus"},"serverFarmSku":{"type":"Object","value":{"name":"S1","tier":"Standard","size":"S1","family":"S","capacity":1}},"endpoint":{"type":"String","value":""},"botFileEncryptionKey":{"type":"String","value":""}},"mode":"Incremental","provisioningState":"Accepted","timestamp":"2019-08-06T21:37:22.9166349Z","duration":"PT0.2092687S","correlationId":"1588c073-c496-4fa7-9a4a-60d8b8bc76fa","providers":[{"namespace":"Microsoft.Web","resourceTypes":[{"resourceType":"serverfarms","locations":["westus"]},{"resourceType":"sites","locations":["westus"]}]},{"namespace":"Microsoft.BotService","resourceTypes":[{"resourceType":"botServices","locations":["global"]}]}],"dependencies":[{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002-","resourceType":"Microsoft.Web/serverfarms","resourceName":"cli000002-"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002","resourceType":"Microsoft.Web/sites","resourceName":"cli000002"},{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002","resourceType":"Microsoft.Web/sites","resourceName":"cli000002"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002/Extensions/MSDeploy","resourceType":"Microsoft.Web/sites/Extensions","resourceName":"cli000002/MSDeploy"},{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002-","resourceType":"Microsoft.Web/serverfarms","resourceName":"cli000002-"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002","resourceType":"Microsoft.Web/sites","resourceName":"cli000002"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002/Extensions/MSDeploy","resourceType":"Microsoft.Web/sites/Extensions","resourceName":"cli000002/MSDeploy"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/Sites/cli000002/config/publishingcredentials","resourceType":"Microsoft.Web/Sites/config","resourceName":"cli000002/publishingcredentials","actionName":"list","apiVersion":"2018-02-01"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002-","resourceType":"Microsoft.BotService/botServices","resourceName":"cli000002-"}]}}' + string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Resources/deployments/cli000002-","name":"cli000002-","type":"Microsoft.Resources/deployments","properties":{"templateHash":"12265489627004014712","parameters":{"botEnv":{"type":"String","value":"prod"},"botId":{"type":"String","value":"cli000002-"},"description":{"type":"String","value":""},"location":{"type":"String","value":"westus"},"sku":{"type":"String","value":"F0"},"kind":{"type":"String","value":"sdk"},"siteName":{"type":"String","value":"cli000002"},"appId":{"type":"String","value":"20e34264-e95e-4c02-9a43-b5139a35b9e7"},"appSecret":{"type":"String","value":"2d23bce6-1423-418d-9f78-b244ca2fb360"},"zipUrl":{"type":"String","value":""},"serverFarmId":{"type":"String","value":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002-"},"createServerFarm":{"type":"Bool","value":true},"serverFarmLocation":{"type":"String","value":"westus"},"serverFarmSku":{"type":"Object","value":{"name":"S1","tier":"Standard","size":"S1","family":"S","capacity":1}},"endpoint":{"type":"String","value":""},"botFileEncryptionKey":{"type":"String","value":""}},"mode":"Incremental","provisioningState":"Accepted","timestamp":"2019-09-20T00:10:56.2499401Z","duration":"PT0.1430463S","correlationId":"63538e9e-0fa2-46df-9826-364840c64d43","providers":[{"namespace":"Microsoft.Web","resourceTypes":[{"resourceType":"serverfarms","locations":["westus"]},{"resourceType":"sites","locations":["westus"]}]},{"namespace":"Microsoft.BotService","resourceTypes":[{"resourceType":"botServices","locations":["global"]}]}],"dependencies":[{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002-","resourceType":"Microsoft.Web/serverfarms","resourceName":"cli000002-"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002","resourceType":"Microsoft.Web/sites","resourceName":"cli000002"},{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002","resourceType":"Microsoft.Web/sites","resourceName":"cli000002"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002/Extensions/MSDeploy","resourceType":"Microsoft.Web/sites/Extensions","resourceName":"cli000002/MSDeploy"},{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002-","resourceType":"Microsoft.Web/serverfarms","resourceName":"cli000002-"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002","resourceType":"Microsoft.Web/sites","resourceName":"cli000002"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002/Extensions/MSDeploy","resourceType":"Microsoft.Web/sites/Extensions","resourceName":"cli000002/MSDeploy"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/Sites/cli000002/config/publishingcredentials","resourceType":"Microsoft.Web/Sites/config","resourceName":"cli000002/publishingcredentials","actionName":"list","apiVersion":"2018-02-01"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002-","resourceType":"Microsoft.BotService/botServices","resourceName":"cli000002-"}]}}' headers: azure-asyncoperation: - - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/cli000002-/operationStatuses/08586364794427702766?api-version=2019-05-10 + - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/cli000002-/operationStatuses/08586326686293707570?api-version=2019-05-10 cache-control: - no-cache content-length: - - '3908' + - '3950' content-type: - application/json; charset=utf-8 date: - - Tue, 06 Aug 2019 21:37:22 GMT + - Fri, 20 Sep 2019 00:10:56 GMT expires: - '-1' pragma: @@ -234,12 +155,12 @@ interactions: Connection: - keep-alive ParameterSetName: - - -k -g -n --appid -p -v --lang + - -k -g -n --appid -p --lang User-Agent: - - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 resourcemanagementclient/2.2.0 - Azure-SDK-For-Python AZURECLI/2.0.70 + - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 azure-mgmt-resource/3.1.0 + Azure-SDK-For-Python AZURECLI/2.0.73 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08586364794427702766?api-version=2019-05-10 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08586326686293707570?api-version=2019-05-10 response: body: string: '{"status":"Running"}' @@ -251,7 +172,7 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Tue, 06 Aug 2019 21:37:52 GMT + - Fri, 20 Sep 2019 00:11:25 GMT expires: - '-1' pragma: @@ -277,12 +198,12 @@ interactions: Connection: - keep-alive ParameterSetName: - - -k -g -n --appid -p -v --lang + - -k -g -n --appid -p --lang User-Agent: - - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 resourcemanagementclient/2.2.0 - Azure-SDK-For-Python AZURECLI/2.0.70 + - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 azure-mgmt-resource/3.1.0 + Azure-SDK-For-Python AZURECLI/2.0.73 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08586364794427702766?api-version=2019-05-10 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08586326686293707570?api-version=2019-05-10 response: body: string: '{"status":"Running"}' @@ -294,7 +215,7 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Tue, 06 Aug 2019 21:38:22 GMT + - Fri, 20 Sep 2019 00:11:56 GMT expires: - '-1' pragma: @@ -320,12 +241,12 @@ interactions: Connection: - keep-alive ParameterSetName: - - -k -g -n --appid -p -v --lang + - -k -g -n --appid -p --lang User-Agent: - - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 resourcemanagementclient/2.2.0 - Azure-SDK-For-Python AZURECLI/2.0.70 + - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 azure-mgmt-resource/3.1.0 + Azure-SDK-For-Python AZURECLI/2.0.73 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08586364794427702766?api-version=2019-05-10 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08586326686293707570?api-version=2019-05-10 response: body: string: '{"status":"Succeeded"}' @@ -337,7 +258,7 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Tue, 06 Aug 2019 21:38:52 GMT + - Fri, 20 Sep 2019 00:12:26 GMT expires: - '-1' pragma: @@ -363,24 +284,24 @@ interactions: Connection: - keep-alive ParameterSetName: - - -k -g -n --appid -p -v --lang + - -k -g -n --appid -p --lang User-Agent: - - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 resourcemanagementclient/2.2.0 - Azure-SDK-For-Python AZURECLI/2.0.70 + - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 azure-mgmt-resource/3.1.0 + Azure-SDK-For-Python AZURECLI/2.0.73 method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment?api-version=2019-05-10 response: body: - string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Resources/deployments/cli000002-","name":"cli000002-","properties":{"templateHash":"4372465197576269071","parameters":{"botEnv":{"type":"String","value":"prod"},"botId":{"type":"String","value":"cli000002-"},"description":{"type":"String","value":""},"location":{"type":"String","value":"westus"},"sku":{"type":"String","value":"F0"},"kind":{"type":"String","value":"sdk"},"siteName":{"type":"String","value":"cli000002"},"appId":{"type":"String","value":"39f8cead-2225-40ea-9981-77eb912ecde7"},"appSecret":{"type":"String","value":"649ac65d-997a-4f72-8eb2-8c738a536b10"},"zipUrl":{"type":"String","value":""},"serverFarmId":{"type":"String","value":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002-"},"createServerFarm":{"type":"Bool","value":true},"serverFarmLocation":{"type":"String","value":"westus"},"serverFarmSku":{"type":"Object","value":{"name":"S1","tier":"Standard","size":"S1","family":"S","capacity":1}},"endpoint":{"type":"String","value":""},"botFileEncryptionKey":{"type":"String","value":""}},"mode":"Incremental","provisioningState":"Succeeded","timestamp":"2019-08-06T21:38:50.3278532Z","duration":"PT1M27.620487S","correlationId":"1588c073-c496-4fa7-9a4a-60d8b8bc76fa","providers":[{"namespace":"Microsoft.Web","resourceTypes":[{"resourceType":"serverfarms","locations":["westus"]},{"resourceType":"sites","locations":["westus"]}]},{"namespace":"Microsoft.BotService","resourceTypes":[{"resourceType":"botServices","locations":["global"]}]}],"dependencies":[{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002-","resourceType":"Microsoft.Web/serverfarms","resourceName":"cli000002-"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002","resourceType":"Microsoft.Web/sites","resourceName":"cli000002"},{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002","resourceType":"Microsoft.Web/sites","resourceName":"cli000002"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002/Extensions/MSDeploy","resourceType":"Microsoft.Web/sites/Extensions","resourceName":"cli000002/MSDeploy"},{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002-","resourceType":"Microsoft.Web/serverfarms","resourceName":"cli000002-"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002","resourceType":"Microsoft.Web/sites","resourceName":"cli000002"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002/Extensions/MSDeploy","resourceType":"Microsoft.Web/sites/Extensions","resourceName":"cli000002/MSDeploy"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/Sites/cli000002/config/publishingcredentials","resourceType":"Microsoft.Web/Sites/config","resourceName":"cli000002/publishingcredentials","actionName":"list","apiVersion":"2018-02-01"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002-","resourceType":"Microsoft.BotService/botServices","resourceName":"cli000002-"}],"outputResources":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002-"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002-"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002/Extensions/MSDeploy"}]}}' + string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Resources/deployments/cli000002-","name":"cli000002-","type":"Microsoft.Resources/deployments","properties":{"templateHash":"12265489627004014712","parameters":{"botEnv":{"type":"String","value":"prod"},"botId":{"type":"String","value":"cli000002-"},"description":{"type":"String","value":""},"location":{"type":"String","value":"westus"},"sku":{"type":"String","value":"F0"},"kind":{"type":"String","value":"sdk"},"siteName":{"type":"String","value":"cli000002"},"appId":{"type":"String","value":"20e34264-e95e-4c02-9a43-b5139a35b9e7"},"appSecret":{"type":"String","value":"2d23bce6-1423-418d-9f78-b244ca2fb360"},"zipUrl":{"type":"String","value":""},"serverFarmId":{"type":"String","value":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002-"},"createServerFarm":{"type":"Bool","value":true},"serverFarmLocation":{"type":"String","value":"westus"},"serverFarmSku":{"type":"Object","value":{"name":"S1","tier":"Standard","size":"S1","family":"S","capacity":1}},"endpoint":{"type":"String","value":""},"botFileEncryptionKey":{"type":"String","value":""}},"mode":"Incremental","provisioningState":"Succeeded","timestamp":"2019-09-20T00:12:19.4279832Z","duration":"PT1M23.3210894S","correlationId":"63538e9e-0fa2-46df-9826-364840c64d43","providers":[{"namespace":"Microsoft.Web","resourceTypes":[{"resourceType":"serverfarms","locations":["westus"]},{"resourceType":"sites","locations":["westus"]}]},{"namespace":"Microsoft.BotService","resourceTypes":[{"resourceType":"botServices","locations":["global"]}]}],"dependencies":[{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002-","resourceType":"Microsoft.Web/serverfarms","resourceName":"cli000002-"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002","resourceType":"Microsoft.Web/sites","resourceName":"cli000002"},{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002","resourceType":"Microsoft.Web/sites","resourceName":"cli000002"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002/Extensions/MSDeploy","resourceType":"Microsoft.Web/sites/Extensions","resourceName":"cli000002/MSDeploy"},{"dependsOn":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002-","resourceType":"Microsoft.Web/serverfarms","resourceName":"cli000002-"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002","resourceType":"Microsoft.Web/sites","resourceName":"cli000002"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002/Extensions/MSDeploy","resourceType":"Microsoft.Web/sites/Extensions","resourceName":"cli000002/MSDeploy"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/Sites/cli000002/config/publishingcredentials","resourceType":"Microsoft.Web/Sites/config","resourceName":"cli000002/publishingcredentials","actionName":"list","apiVersion":"2018-02-01"}],"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002-","resourceType":"Microsoft.BotService/botServices","resourceName":"cli000002-"}],"outputResources":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002-"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/serverfarms/cli000002-"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Web/sites/cli000002"}]}}' headers: cache-control: - no-cache content-length: - - '4544' + - '4424' content-type: - application/json; charset=utf-8 date: - - Tue, 06 Aug 2019 21:38:53 GMT + - Fri, 20 Sep 2019 00:12:26 GMT expires: - '-1' pragma: @@ -406,17 +327,17 @@ interactions: Connection: - keep-alive ParameterSetName: - - -k -g -n --appid -p -v --lang + - -k -g -n --appid -p --lang User-Agent: - python/3.7.0 (Windows-10-10.0.18362-SP0) msrest/0.6.8 msrest_azure/0.6.1 azure-mgmt-botservice/0.2.0 - Azure-SDK-For-Python AZURECLI/2.0.70 + Azure-SDK-For-Python AZURECLI/2.0.73 accept-language: - en-US method: GET uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002-?api-version=2018-07-12 response: body: - string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002-","name":"cli000002-","type":"Microsoft.BotService/botServices","etag":"\"170072d8-0000-0100-0000-5d49f3690000\"","location":"global","sku":{"name":"F0"},"kind":"sdk","tags":{},"properties":{"displayName":"cli000002-","description":null,"iconUrl":"https://docs.botframework.com/static/devportal/client/images/bot-framework-default.png","endpoint":"https://cli000002.azurewebsites.net/api/messages","msaAppId":"39f8cead-2225-40ea-9981-77eb912ecde7","developerAppInsightKey":null,"developerAppInsightsApplicationId":null,"luisAppIds":[],"endpointVersion":"3.0","configuredChannels":["webchat"],"enabledChannels":["webchat","directline"],"isDeveloperAppInsightsApiKeySet":false,"isStreamingSupported":false,"publishingCredentials":null,"parameters":null,"allSettings":null,"manifestUrl":null,"storageResourceId":null,"provisioningState":"Succeeded"}}' + string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.BotService/botServices/cli000002-","name":"cli000002-","type":"Microsoft.BotService/botServices","etag":"\"20003770-0000-0100-0000-5d8419630000\"","location":"global","sku":{"name":"F0"},"kind":"sdk","tags":{},"properties":{"displayName":"cli000002-","description":null,"iconUrl":"https://docs.botframework.com/static/devportal/client/images/bot-framework-default.png","endpoint":"https://cli000002.azurewebsites.net/api/messages","msaAppId":"20e34264-e95e-4c02-9a43-b5139a35b9e7","developerAppInsightKey":null,"developerAppInsightsApplicationId":null,"luisAppIds":[],"endpointVersion":"3.0","configuredChannels":["webchat"],"enabledChannels":["webchat","directline"],"isDeveloperAppInsightsApiKeySet":false,"isStreamingSupported":false,"publishingCredentials":null,"parameters":null,"allSettings":null,"manifestUrl":null,"storageResourceId":null,"provisioningState":"Succeeded"}}' headers: cache-control: - no-cache @@ -425,9 +346,9 @@ interactions: content-type: - application/json; charset=utf-8 date: - - Tue, 06 Aug 2019 21:38:54 GMT + - Fri, 20 Sep 2019 00:12:27 GMT etag: - - '"170072d8-0000-0100-0000-5d49f3690000"' + - '"20003770-0000-0100-0000-5d8419630000"' expires: - '-1' pragma: diff --git a/src/azure-cli/azure/cli/command_modules/botservice/tests/latest/test_bot_commands.py b/src/azure-cli/azure/cli/command_modules/botservice/tests/latest/test_bot_commands.py index ce58f99d213..e880634a631 100644 --- a/src/azure-cli/azure/cli/command_modules/botservice/tests/latest/test_bot_commands.py +++ b/src/azure-cli/azure/cli/command_modules/botservice/tests/latest/test_bot_commands.py @@ -458,7 +458,7 @@ def test_create_v4_webapp_bot_should_succeed_with_ending_hyphen(self, resource_g # Clean up the folder shutil.rmtree(dir_path) - self.cmd('az bot create -k webapp -g {rg} -n {botname} --appid {app_id} -p {password} -v v4 --lang Csharp', + self.cmd('az bot create -k webapp -g {rg} -n {botname} --appid {app_id} -p {password} --lang Csharp', checks=[ self.check('resourceGroup', '{rg}'), self.check('id', '{botname}'), @@ -512,7 +512,7 @@ def test_botservice_show_on_v4_csharp_webapp_bot(self, resource_group): # clean up the folder shutil.rmtree(dir_path) - self.cmd('az bot create -k webapp -g {rg} -n {botname} --appid {app_id} -p {password} -v v4 --lang Csharp', + self.cmd('az bot create -k webapp -g {rg} -n {botname} --appid {app_id} -p {password} --lang Csharp', checks={ self.check('resourceGroup', '{rg}'), self.check('id', '{botname}'), @@ -789,8 +789,10 @@ def test_botservice_update_should_update_bot_properties(self, resource_group): results = self.cmd('az bot update -g {rg} -n {botname} -e "{endpoint}" --description {description} --sku S1 ' '-d {display_name} --ai-key {ai-key} --ai-api-key {ai-api-key} --ai-app-id {ai-app-id} --tags ' - '{tag}={tag-value}', checks=[self.check('name', '{botname}'), - self.check('resourceGroup', '{rg}')]) + '{tag}={tag-value} --icon-url https://dev.botframework.com/client/images/channels/icons/directline.png', + checks=[ + self.check('name', '{botname}'), + self.check('resourceGroup', '{rg}')]) results = results.get_output_in_json() assert results['sku']['name'] == 'S1' @@ -802,6 +804,7 @@ def test_botservice_update_should_update_bot_properties(self, resource_group): # The "developerAppInsightsApiKey" is a secret and is always null when retrieved. assert not results['properties']['developerAppInsightsApiKey'] assert results['properties']['developerAppInsightsApplicationId'] + assert results['properties']['iconUrl'] == 'https://dev.botframework.com/client/images/channels/icons/directline.png' @ResourceGroupPreparer(random_name_length=20) def test_botservice_prepare_deploy_javascript_fail_if_web_config_exists(self, resource_group):