Skip to content
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

feat: appended provision with a profile #5741

Merged
merged 66 commits into from
Mar 1, 2021
Merged

feat: appended provision with a profile #5741

merged 66 commits into from
Mar 1, 2021

Conversation

VanyLaw
Copy link
Contributor

@VanyLaw VanyLaw commented Feb 9, 2021 •
edited
Loading

Description

Add the ability to do the provision in an existed profile.

  • update the edit profile UI.
  • update the add profile UI.
  • do the appended provision e2e successfully.
  • can publish successfully with new profile.

In this PR we also did the following updates:

  • Add subscriptionId, resourceGroup and botName in the publish profile. When edit the publish profile, subscriptionId and resourceGroup is not editable at this moment, you can only append new resources under the same subscription and resourceGroup. botName is the name of bot channel registration.
  • Decouple the resourceGroup and hostname, previously in publish profile, we use hostname(name-environment) for both resourceGroup and hostname, now this value is decoupled, you can create new resources with different name under an existing resourceGroup. This is more convenient for users who don't have the permission to create a new resourceGroup.

Task Item

close #5403

Screenshots

@luhan2017
Fix some issues
19f6cdb 
1. fix the logic of merging existing profile with new provisioned configurations.
2. when hostname or name exist, don't provision new webapp.
3. add subscriptionId and resourceGroup in the publish profile.
@luhan2017
Copy link
Contributor

@zidaneymar we have three known issues now, need to fix after we get the permission back.

  1. remove the dependency between webapp and bot channel registration while provisioning.
  2. two issue of region, one is UX display error, even I select westus for luis, it will still show the region of resourcegroup. The other is whatever region I select, it will always provision on the westus.
  3. need to implement QnA in getExistResource function.

@coveralls
Copy link

coveralls commented Feb 19, 2021 •
edited
Loading

Coverage Status

Coverage increased (+0.02%) to 53.784% when pulling c1b4dd8 on wenyluo/prov2 into 80dad34 on main.

@luhan2017
Copy link
Contributor

@zidaneymar we have three known issues now, need to fix after we get the permission back.

  1. remove the dependency between webapp and bot channel registration while provisioning.
  2. two issue of region, one is UX display error, even I select westus for luis, it will still show the region of resourcegroup. The other is whatever region I select, it will always provision on the westus.
  3. need to implement QnA in getExistResource function.

All the three issues are fixed now.

VanyLaw and others added 19 commits March 1, 2021 15:11
@VanyLaw
add display name for app registration
e0f68a2
@luhan2017
Merge branch 'main' into wenyluo/prov2
701947c
@VanyLaw
remove form page if type already have
159575d
@VanyLaw
fix bug
625a706
@VanyLaw
Merge branch 'wenyluo/prov2' of https://github.com/microsoft/BotFrame…
5332fb4 
…work-Composer into wenyluo/prov2
@VanyLaw
fix bug
22653bd
@VanyLaw
remove image
41b5ee5
@VanyLaw
add image
de0b25d
@VanyLaw
fix bugs
621b8ac
@alanlong9278
fix: provision process shown in publish list (#6044)
582285b 
* add jobId for filter publish process

* lint

* delete un-use value

* ut

* refactor
@VanyLaw
fix region
c021d27
@VanyLaw
Merge branch 'wenyluo/prov2' of https://github.com/microsoft/BotFrame…
71132f9 
…work-Composer into wenyluo/prov2
@boydc2014
Merge branch 'main' into wenyluo/prov2
52c60f8
@VanyLaw
go to edit page if no resources can be added
f6b88eb
@VanyLaw
Merge branch 'wenyluo/prov2' of https://github.com/microsoft/BotFrame…
c6a3bde 
…work-Composer into wenyluo/prov2
@luhan2017
fix the region issue
f3cbe00
@VanyLaw
fix ut
cde52aa
@VanyLaw
Merge branch 'wenyluo/prov2' of https://github.com/microsoft/BotFrame…
626f930 
…work-Composer into wenyluo/prov2
@VanyLaw
fix auth dialog popup everytime
c1b4dd8
@boydc2014 boydc2014 merged commit cba7a75 into main Mar 1, 2021
@boydc2014 boydc2014 deleted the wenyluo/prov2 branch March 1, 2021 14:44
@hibrenda hibrenda mentioned this pull request Mar 2, 2021
Closed
This was referenced Mar 16, 2021
Closed
Closed
lei9444 pushed a commit to lei9444/BotFramework-Composer-1 that referenced this pull request Jun 15, 2021
@VanyLaw @luhan2017
@benbrown @alanlong9278 @boydc2014
feat: appended provision with a profile (microsoft#5741)
19ba613 
* change edit dialog page 1

* change add and edit page one

* add review page and enable provision resources in current provision

* add some log

* fix test

* add profile merge logic

* add retry logic judging

* remove settings

* remove settings

* fix review page display error

* fix profile update in edit

* remove status and fix provision update

* add missed field in current settings

* Fix some issues

1. fix the logic of merging existing profile with new provisioned configurations.
2. when hostname or name exist, don't provision new webapp.
3. add subscriptionId and resourceGroup in the publish profile.

* remove the dependency between webapp and bot channel registration in provision

* fix luis region always westus

* decouple resourceGroup and hostName, fix regex

* Add a botName field for channel service

* fix bug when select luis resource but not select the luis region

* add botName to publish profile

* make hostname disable if name or hostname already have

* fix resourceGroup display error in review page

* remove annotation

* fix regex issue and get location issue

* update publish function getPublishConfig

* fix hostname check issue

* fix UI in add resource page

* fix UI issue

* Fix the config missing issue

* update qna image and resource group check

* add region to profile and show the profile region as default in edit mode

* add display name for app registration

* remove form page if type already have

* fix bug

* fix bug

* remove image

* add image

* fix bugs

* fix: provision process shown in publish list (microsoft#6044)

* add jobId for filter publish process

* lint

* delete un-use value

* ut

* refactor

* fix region

* go to edit page if no resources can be added

* fix the region issue

* fix ut

* fix auth dialog popup everytime

Co-authored-by: Qi Kang <qika@microsoft.com>
Co-authored-by: Lu Han <32191031+luhan2017@users.noreply.github.com>
Co-authored-by: Ben Brown <benbro@microsoft.com>
Co-authored-by: Long Alan <julong@microsoft.com>
Co-authored-by: Dong Lei <donglei@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@carlosscastro carlosscastro carlosscastro left review comments

@luhan2017 luhan2017 luhan2017 approved these changes

@boydc2014 boydc2014 boydc2014 approved these changes

@a-b-r-o-w-n a-b-r-o-w-n Awaiting requested review from a-b-r-o-w-n

@beyackle beyackle Awaiting requested review from beyackle

@cwhitten cwhitten Awaiting requested review from cwhitten

@GeoffCoxMSFT GeoffCoxMSFT Awaiting requested review from GeoffCoxMSFT

@hatpick hatpick Awaiting requested review from hatpick

@srinaath srinaath Awaiting requested review from srinaath

@tonyanziano tonyanziano Awaiting requested review from tonyanziano

Assignees

@boydc2014 boydc2014

@carlosscastro carlosscastro

@luhan2017 luhan2017

Labels
1.4 Team: Runtime & Publishing
Projects
None yet
Milestone
R12
Development

Successfully merging this pull request may close these issues.

Provision V2: Edit publish profile(add/update/delete services) through UX
8 participants
@VanyLaw @luhan2017 @coveralls @boydc2014 @carlosscastro @srinaath @benbrown @alanlong9278