Skip to content

Commit

Permalink
BotService: 0.1.3 release (Azure#8035)
Browse files Browse the repository at this point in the history
* botservice: fix AppInsights mapping bug

* botservice: add logger to KuduClient, reduce Kudu network calls, delete wwwroot folder before new bot is published

* botservice: strip extra whitespace, fix microsoft/botbuilder-tools#820

* botservice: use appInsightsLocation arg, fix microsoft/botbuilder-tools#853

* botservice: add .bot file decryption to az bot show

* botservice: update HISTORY.rst

* botservice: adjust bot show logic, rerecord and add tests

* botservice: update help, azure-cli.pyproj

* botservice: use str.format instead of string interpolation for 2.7 compat

* botservice: fix StaticCheck errors

* botservice: fix and rerecord az bot show tests
  • Loading branch information
stevengum authored and tjprescott committed Dec 13, 2018
1 parent 6f67c71 commit 3425a96
Show file tree
Hide file tree
Showing 23 changed files with 165,960 additions and 162,867 deletions.
31 changes: 31 additions & 0 deletions azure-cli.pyproj
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,18 @@
<Compile Include="command_modules\azure-cli-batch\azure_bdist_wheel.py" />
<Compile Include="command_modules\azure-cli-billing\azure\cli\command_modules\billing\tests\latest\test_billing_commands.py" />
<Compile Include="command_modules\azure-cli-billing\azure\cli\command_modules\billing\_exception_handler.py" />
<Compile Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\adal_authenticator.py" />
<Compile Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\azure_region_mapper.py" />
<Compile Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\bot_json_formatter.py" />
<Compile Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\bot_publish_prep.py" />
<Compile Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\bot_template_deployer.py" />
<Compile Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\channel_operations.py" />
<Compile Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\commands.py" />
<Compile Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\converged_app.py" />
<Compile Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\custom.py" />
<Compile Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\http_response_validator.py" />
<Compile Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\kudu_client.py" />
<Compile Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\web_app_operations.py" />
<Compile Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\tests\latest\test_authsetting_commands.py" />
<Compile Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\tests\latest\test_bot_commands.py" />
<Compile Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\tests\latest\test_channel_commands.py" />
Expand All @@ -232,9 +241,18 @@
<Compile Include="command_modules\azure-cli-botservice\azure\cli\__init__.py" />
<Compile Include="command_modules\azure-cli-botservice\azure\__init__.py" />
<Compile Include="command_modules\azure-cli-botservice\azure_bdist_wheel.py" />
<Compile Include="command_modules\azure-cli-botservice\build\lib.linux-x86_64-2.7\azure\cli\command_modules\botservice\adal_authenticator.py" />
<Compile Include="command_modules\azure-cli-botservice\build\lib.linux-x86_64-2.7\azure\cli\command_modules\botservice\azure_region_mapper.py" />
<Compile Include="command_modules\azure-cli-botservice\build\lib.linux-x86_64-2.7\azure\cli\command_modules\botservice\bot_json_formatter.py" />
<Compile Include="command_modules\azure-cli-botservice\build\lib.linux-x86_64-2.7\azure\cli\command_modules\botservice\bot_publish_prep.py" />
<Compile Include="command_modules\azure-cli-botservice\build\lib.linux-x86_64-2.7\azure\cli\command_modules\botservice\bot_template_deployer.py" />
<Compile Include="command_modules\azure-cli-botservice\build\lib.linux-x86_64-2.7\azure\cli\command_modules\botservice\channel_operations.py" />
<Compile Include="command_modules\azure-cli-botservice\build\lib.linux-x86_64-2.7\azure\cli\command_modules\botservice\commands.py" />
<Compile Include="command_modules\azure-cli-botservice\build\lib.linux-x86_64-2.7\azure\cli\command_modules\botservice\converged_app.py" />
<Compile Include="command_modules\azure-cli-botservice\build\lib.linux-x86_64-2.7\azure\cli\command_modules\botservice\custom.py" />
<Compile Include="command_modules\azure-cli-botservice\build\lib.linux-x86_64-2.7\azure\cli\command_modules\botservice\http_response_validator.py" />
<Compile Include="command_modules\azure-cli-botservice\build\lib.linux-x86_64-2.7\azure\cli\command_modules\botservice\kudu_client.py" />
<Compile Include="command_modules\azure-cli-botservice\build\lib.linux-x86_64-2.7\azure\cli\command_modules\botservice\web_app_operations.py" />
<Compile Include="command_modules\azure-cli-botservice\build\lib.linux-x86_64-2.7\azure\cli\command_modules\botservice\_client_factory.py" />
<Compile Include="command_modules\azure-cli-botservice\build\lib.linux-x86_64-2.7\azure\cli\command_modules\botservice\_exception_handler.py" />
<Compile Include="command_modules\azure-cli-botservice\build\lib.linux-x86_64-2.7\azure\cli\command_modules\botservice\_help.py" />
Expand Down Expand Up @@ -1152,8 +1170,21 @@
<Content Include="command_modules\azure-cli-botservice\azure\.vscode\tags" />
<Content Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\functionapp.template.json" />
<Content Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\tests\latest\recordings\test_auth_setting.yaml" />
<Content Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\tests\latest\recordings\test_botservice_show_on_v3_csharp_webapp_bot.yaml" />
<Content Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\tests\latest\recordings\test_botservice_show_on_v3_js_webapp_bot.yaml" />
<Content Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\tests\latest\recordings\test_botservice_show_on_v4_csharp_webapp_bot.yaml" />
<Content Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\tests\latest\recordings\test_botservice_show_on_v4_js_webapp_bot.yaml" />
<Content Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\tests\latest\recordings\test_create_bot_invalid_kind_fails.yaml" />
<Content Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\tests\latest\recordings\test_create_v3_js_webapp_bot.yaml" />
<Content Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\tests\latest\recordings\test_create_v3_webapp_bot.yaml" />
<Content Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\tests\latest\recordings\test_create_v4_js_webapp_bot.yaml" />
<Content Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\tests\latest\recordings\test_create_v4_webapp_bot.yaml" />
<Content Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\tests\latest\recordings\test_directline_channel.yaml" />
<Content Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\tests\latest\recordings\test_msteams_channel.yaml" />
<Content Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\tests\latest\recordings\test_prepare_publish_should_raise_cli_error_for_v4_bots.yaml" />
<Content Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\tests\latest\recordings\test_prepare_publish_should_raise_cli_error_when_version_is_v4.yaml" />
<Content Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\tests\latest\recordings\test_prepare_publish_with_registration_bot_should_raise_error.yaml" />
<Content Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\tests\latest\recordings\test_prepare_publish_with_unregistered_bot_name_should_fail.yaml" />
<Content Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\tests\latest\recordings\test_registration_bot.yaml" />
<Content Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\tests\latest\recordings\test_service_providers.yaml" />
<Content Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\tests\latest\recordings\test_skype_channel.yaml" />
Expand Down
1 change: 0 additions & 1 deletion azure-cli2017.pyproj
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,6 @@
<Compile Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\_exception_handler.py" />
<Compile Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\_help.py" />
<Compile Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\_params.py" />
<Compile Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\_webutils.py" />
<Compile Include="command_modules\azure-cli-botservice\azure\cli\command_modules\botservice\__init__.py" />
<Compile Include="command_modules\azure-cli-botservice\azure\cli\command_modules\__init__.py" />
<Compile Include="command_modules\azure-cli-botservice\azure\cli\__init__.py" />
Expand Down
8 changes: 8 additions & 0 deletions src/command_modules/azure-cli-botservice/HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
Release History
===============

0.1.3
+++++
* Add support for .bot file parsing when calling `az bot show`
* Fix AppInsights provisioning bug
* Fix whitespace bug when dealing with file paths
* Reduce Kudu network calls
* Additional UX improvements

0.1.2
+++++
* Major refactoring
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@
helps['bot show'] = """
type: command
short-summary: Get an existing bot.
long-summary: Get information about an existing bot. To get the information needed to connect to the bot, use the
--msbot flag with the command.
examples:
- name: Get the information needed to connect to an existing bot on Azure
text: |-
az bot show -n botName -g MyResourceGroup --msbot
"""
helps['bot prepare-publish'] = """
type: command
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def load_arguments(self, _):
c.argument('code_dir', options_list=['--code-dir'], help='The directory to upload bot code from.')
c.argument('proj_name', help='Name of the start up project file name.')
c.argument('version', options_list=['-v', '--version'],
help='The Microsoft Bot Builder SDK version by the bot.')
help='The Microsoft Bot Builder SDK version of the bot.')

with self.argument_context('bot download') as c:
c.argument('file_save_path', options_list=['--save-path'], help='The directory to download bot code to.')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def get_app_insights_location(key):
'australiacentral2': 'southeastasia',
'australiasoutheast': 'southeastasia',
'eastasia': 'southeastasia',
'southeastasia': 'westus',
'southeastasia': 'southeastasia',
'eastus': 'eastus',
'eastus2': 'eastus',
'southcentralus': 'southcentralus',
Expand Down
Loading

0 comments on commit 3425a96

Please sign in to comment.