8000 [pull] main from microsoft:main by pull[bot] · Pull Request #36 · rrosajp/botbuilder-python · GitHub
[go: up one dir, main page]
Skip to content

[pull] main from microsoft:main #36

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

Jump to bottom
Merged
merged 3 commits into from
Dec 2, 2024
Merged

[pull] main from microsoft:main #36

merged 3 commits into from
Dec 2, 2024

Conversation

pull[bot]
Copy link
@pull pull bot commented Dec 2, 2024 •
edited by sourcery-ai bot
Loading

See Commits and Changes for more details.

Created by pull[bot] (v2.0.0-alpha.1)

Can you help keep this open source service alive? 💖 Please sponsor : )

Summary by Sourcery

Enhance deployment templates to support multiple bot authentication types and update Python version to 3.9. Revise documentation to reflect these changes and update dependencies in various libraries. Fix test assertion syntax for improved reliability.

Enhancements:

  • Add support for different bot authentication types including MultiTenant, SingleTenant, and UserAssignedMSI in deployment templates.
  • Update Python version in deployment templates from 3.7 to 3.9.
  • Disable FTPS state in deployment templates for enhanced security.

Documentation:

  • Revise deployment template documentation to include new parameters and usage instructions for bot authentication types.

Tests:

  • Fix assertion syntax in test_choice_recognizers.py to improve test reliability.

Chores:

  • Update dependencies in requirements.txt and setup.py files across multiple libraries, including upgrading aiohttp and pytest versions.

gandiddi and others added 3 commits December 2, 2024 07:59
@gandiddi
Added missing parameters: appType, UMSIName, UMSIResourceGroupName, a…
3a55f8a 
…nd tenantId to the ARM template for Python bot deployment. (#2191)
@gandiddi @tracyboehrer
Bumped pytest (#2189)
394d3d6 
Co-authored-by: tracyboehrer <tracyboehrer@users.noreply.github.com>
@dependabot @gandiddi @tracyboehrer
Bump: aiohttp from 3.10.5 to 3.10.11 (#2190)
a7f5d91 
* Bump aiohttp

Bumps the pip group with 1 update in the /libraries/botbuilder-integration-aiohttp directory: [aiohttp](https://github.com/aio-libs/aiohttp).


Updates `aiohttp` from 3.10.5 to 3.10.11
- [Release notes](https://github.com/aio-libs/aiohttp/releases)
- [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst)
- [Commits](aio-libs/aiohttp@v3.10.5...v3.10.11)

---
updated-dependencies:
- dependency-name: aiohttp
  dependency-type: direct:production
  dependency-group: pip
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump: aiohttp to 3.10.11 in SDK packages

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ganapathi Diddi <v-gandiddi@microsoft.com>
Co-authored-by: tracyboehrer <tracyboehrer@users.noreply.github.com>
@pull pull bot added the ⤵️ pull label Dec 2, 2024
@pull pull bot merged commit a7f5d91 into rrosajp:main Dec 2, 2024
@sourcery-ai Sourcery AI
Copy link
sourcery-ai bot commented Dec 2, 2024 •
edited
Loading

Reviewer's Guide by Sourcery

This pull request implements significant updates to the Bot Framework deployment templates and dependencies. The changes focus on enhancing authentication options, improving security configurations, and updating Python package dependencies to their latest versions.

ER diagram for updated Bot Framework deployment templates

erDiagram
    PARAMETERS {
        string appServiceName
        string existingAppServicePlanLocation
        string newAppServicePlanName
        string newAppServicePlanLocation
        string appType
        string appId
        string appSecret
        string UMSIName
        string UMSIResourceGroupName
        string tenantId
    }
    VARIABLES {
        string tenantId
        string msiResourceId
        object appTypeDef
        object appType
    }
    PARAMETERS ||--o{ VARIABLES : "defines"
    PARAMETERS {
        string appType
        string appId
        string UMSIName
        string UMSIResourceGroupName
        string tenantId
    }
    VARIABLES {
        string tenantId
        string msiResourceId
        object appTypeDef
        object appType
    }
    PARAMETERS ||--o{ VARIABLES : "defines"
Loading

File-Level Changes

Change Details Files
Enhanced bot authentication support in deployment templates
  • Added new appType parameter to support MultiTenant, SingleTenant, and UserAssignedMSI authentication types
  • Implemented tenant ID handling for different authentication scenarios
  • Added support for User-Assigned Managed Identity authentication
  • Updated application settings to include MicrosoftAppType and MicrosoftAppTenantId
 generators/app/templates/core/{{cookiecutter.bot_name}}/deploymentTemplates/deployUseExistResourceGroup/template-BotApp-with-rg.json
generators/app/templates/echo/{{cookiecutter.bot_name}}/deploymentTemplates/deployUseExistResourceGroup/template-BotApp-with-rg.json
generators/app/templates/empty/{{cookiecutter.bot_name}}/deploymentTemplates/deployUseExistResourceGroup/template-BotApp-with-rg.json
Security and configuration improvements in deployment templates
  • Disabled FTPS access by changing ftpsState from AllAllowed to Disabled
  • Updated Python runtime from 3.7 to 3.9
  • Improved parameter handling with better default values and descriptions
 generators/app/templates/core/{{cookiecutter.bot_name}}/deploymentTemplates/deployUseExistResourceGroup/template-BotApp-with-rg.json
generators/app/templates/echo/{{cookiecutter.bot_name}}/deploymentTemplates/deployUseExistResourceGroup/template-BotApp-with-rg.json
generators/app/templates/empty/{{cookiecutter.bot_name}}/deploymentTemplates/deployUseExistResourceGroup/template-BotApp-with-rg.json
Updated Python package dependencies to latest versions
  • Upgraded aiohttp from 3.10.5 to 3.10.11
  • Updated pytest from 7.3.1 to 8.3.3
  • Updated pytest-cov and pytest-asyncio to newer versions
 libraries/botbuilder-adapters-slack/requirements.txt
libraries/botbuilder-ai/setup.py
libraries/botbuilder-integration-aiohttp/requirements.txt
libraries/botbuilder-integration-aiohttp/setup.py
libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py
libraries/botbuilder-testing/setup.py
libraries/botframework-connector/tests/requirements.txt
Documentation improvements for deployment parameters
  • Reformatted parameter documentation for better readability
  • Added detailed descriptions for new authentication parameters
  • Included links to additional documentation resources
 generators/app/templates/core/{{cookiecutter.bot_name}}/deploymentTemplates/deployUseExistResourceGroup/readme.md
generators/app/templates/echo/{{cookiecutter.bot_name}}/deploymentTemplates/deployUseExistResourceGroup/readme.md
generators/app/templates/empty/{{cookiecutter.bot_name}}/deploymentTemplates/deployUseExistResourceGroup/readme.md
Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time. You can also use
    this command to specify where the summary should be inserted.

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

61BE

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
⤵️ pull
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@gandiddi
0