Skip to content

Bug fixes for azure-cli-botservice #7956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tjprescott merged 3 commits into from
Nov 30, 2018
Merged

Bug fixes for azure-cli-botservice #7956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19ccf19
Az bot: fix bug when publishing Node.js bots, fix minor bugs
stevengum Nov 30, 2018
b460bea
Az bot: rerecord BotTests
stevengum Nov 30, 2018
e2852a7
Az bot: fix static check error
stevengum Nov 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/command_modules/azure-cli-botservice/azure/cli/command_modules/botservice/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,8 +478,8 @@ def publish_app(cmd, client, resource_group_name, resource_name, code_dir=None,
if 'PostDeployScripts' not in os.listdir(code_dir):
if version == 'v4':

logger.info('Detected SDK version v4. Running prepare publish in code directory %s and for project file %s', # pylint:disable=logging-too-few-args
(code_dir, proj_name))
logger.info('Detected SDK version v4. Running prepare publish in code directory %s and for project file %s' # pylint:disable=logging-not-lazy
% (code_dir, proj_name))

# Automatically run prepare-publish in case of v4.
BotPublishPrep.prepare_publish_v4(logger, code_dir, proj_name)
Expand Down
3 changes: 2 additions & 1 deletion src/command_modules/azure-cli-botservice/azure/cli/command_modules/botservice/kudu_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ def install_node_dependencies(self):
'command': 'npm install',
'dir': r'site\wwwroot'
}
response = requests.post(self.__scm_url + '/api/command', data=json.dumps(payload), headers=self.__auth_headers)
response = requests.post(self.__scm_url + '/api/command', data=json.dumps(payload),
headers=self.__get_application_json_headers())
HttpResponseValidator.check_response_status(response)
return response.json()

Expand Down
1,158 changes: 568 additions & 590 deletions .../cli/command_modules/botservice/tests/latest/recordings/test_create_v3_js_webapp_bot.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,801 changes: 902 additions & 899 deletions ...ure/cli/command_modules/botservice/tests/latest/recordings/test_create_v3_webapp_bot.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6,437 changes: 3,220 additions & 3,217 deletions .../cli/command_modules/botservice/tests/latest/recordings/test_create_v4_js_webapp_bot.yaml
View file
Open in desktop

Large diffs are not rendered by default.

317,364 changes: 158,672 additions & 158,692 deletions ...ure/cli/command_modules/botservice/tests/latest/recordings/test_create_v4_webapp_bot.yaml
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions ...sts/latest/recordings/test_prepare_publish_should_raise_cli_error_when_version_is_v4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
interactions:
- request:
body: '{"tags": {"date": "2018-11-29T08:15:34Z", "product": "azurecli", "cause":
"automation"}, "location": "westus"}'
body: '{"location": "westus", "tags": {"product": "azurecli", "cause": "automation",
"date": "2018-11-30T08:13:12Z"}}'
headers:
Accept: [application/json]
Accept-Encoding: ['gzip, deflate']
Expand All @@ -10,23 +10,23 @@ interactions:
Content-Length: ['110']
Content-Type: [application/json; charset=utf-8]
ParameterSetName: [--location --name --tag]
User-Agent: [python/3.5.2 (Windows-10-10.0.15063-SP0) msrest/0.6.2 msrest_azure/0.4.34
User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34
resourcemanagementclient/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.52]
accept-language: [en-US]
method: PUT
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001?api-version=2018-05-01
response:
body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"date":"2018-11-29T08:15:34Z","product":"azurecli","cause":"automation"},"properties":{"provisioningState":"Succeeded"}}'}
body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001","name":"clitest.rg000001","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2018-11-30T08:13:12Z"},"properties":{"provisioningState":"Succeeded"}}'}
headers:
cache-control: [no-cache]
content-length: ['274']
content-type: [application/json; charset=utf-8]
date: ['Thu, 29 Nov 2018 08:15:35 GMT']
date: ['Fri, 30 Nov 2018 08:13:13 GMT']
expires: ['-1']
pragma: [no-cache]
strict-transport-security: [max-age=31536000; includeSubDomains]
x-content-type-options: [nosniff]
x-ms-ratelimit-remaining-subscription-writes: ['1198']
x-ms-ratelimit-remaining-subscription-writes: ['1199']
status: {code: 201, message: Created}
- request:
body: null
Expand All @@ -37,7 +37,7 @@ interactions:
Connection: [keep-alive]
Content-Length: ['0']
ParameterSetName: [-g -n]
User-Agent: [python/3.5.2 (Windows-10-10.0.15063-SP0) msrest/0.6.2 msrest_azure/0.4.34
User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34
azure-mgmt-botservice/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.52]
accept-language: [en-US]
method: DELETE
Expand All @@ -46,12 +46,12 @@ interactions:
body: {string: ''}
headers:
cache-control: [no-cache]
date: ['Thu, 29 Nov 2018 08:15:35 GMT']
date: ['Fri, 30 Nov 2018 08:13:14 GMT']
expires: ['-1']
pragma: [no-cache]
strict-transport-security: [max-age=31536000; includeSubDomains]
x-content-type-options: [nosniff]
x-ms-ratelimit-remaining-subscription-deletes: ['14999']
x-ms-ratelimit-remaining-subscription-deletes: ['14998']
status: {code: 204, message: No Content}
- request:
body: null
Expand All @@ -62,7 +62,7 @@ interactions:
Connection: [keep-alive]
Content-Length: ['0']
ParameterSetName: [-g -n]
User-Agent: [python/3.5.2 (Windows-10-10.0.15063-SP0) msrest/0.6.2 msrest_azure/0.4.34
User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34
azure-mgmt-botservice/0.1.0 Azure-SDK-For-Python AZURECLI/2.0.52]
accept-language: [en-US]
method: DELETE
Expand All @@ -71,12 +71,12 @@ interactions:
body: {string: ''}
headers:
cache-control: [no-cache]
date: ['Thu, 29 Nov 2018 08:15:36 GMT']
date: ['Fri, 30 Nov 2018 08:13:15 GMT']
expires: ['-1']
pragma: [no-cache]
strict-transport-security: [max-age=31536000; includeSubDomains]
x-content-type-options: [nosniff]
x-ms-ratelimit-remaining-subscription-deletes: ['14999']
x-ms-ratelimit-remaining-subscription-deletes: ['14998']
status: {code: 204, message: No Content}
- request:
body: null
Expand All @@ -88,7 +88,7 @@ interactions:
Content-Length: ['0']
Content-Type: [application/json; charset=utf-8]
ParameterSetName: [--name --yes --no-wait]
User-Agent: [python/3.5.2 (Windows-10-10.0.15063-SP0) msrest/0.6.2 msrest_azure/0.4.34
User-Agent: [python/3.7.0 (Windows-10-10.0.17763-SP0) msrest/0.6.1 msrest_azure/0.4.34
resourcemanagementclient/2.0.0 Azure-SDK-For-Python AZURECLI/2.0.52]
accept-language: [en-US]
method: DELETE
Expand All @@ -98,9 +98,9 @@ interactions:
headers:
cache-control: [no-cache]
content-length: ['0']
date: ['Thu, 29 Nov 2018 08:15:36 GMT']
date: ['Fri, 30 Nov 2018 08:13:15 GMT']
expires: ['-1']
location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkdHS1JNMjZNRUJFLVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01']
location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/operationresults/eyJqb2JJZCI6IlJFU09VUkNFR1JPVVBERUxFVElPTkpPQi1DTElURVNUOjJFUkdGNlg3Q1pIUENULVdFU1RVUyIsImpvYkxvY2F0aW9uIjoid2VzdHVzIn0?api-version=2018-05-01']
pragma: [no-cache]
strict-transport-security: [max-age=31536000; includeSubDomains]
x-content-type-options: [nosniff]
Expand Down
Loading