Supporting Stretch Edition Database in PowerShell

[sw145]

This commit aims to supporting Stretch Edition Database in PowerShell

[azurecla]

Hi @sw145, I'm your friendly neighborhood Azure Pull Request Bot (You can call me AZPRBOT). Thanks for your contribution!

In order for us to evaluate and accept your PR, we ask that you sign a contribution license agreement. It's all electronic and will take just minutes. I promise there's no faxing. https://cla.azure.com.

TTYL, AZPRBOT;

[azuresdkci]

Can one of the admins verify this patch?

[azurecla]

@sw145, Thanks for signing the contribution license agreement so quickly! Actual humans will now validate the agreement and then evaluate the PR.

Thanks, AZPRBOT;

[markcowl]

We should not have hard-coded locations, as this prevents tests from running in AzureChina, AzureStack, etc.

[markcowl]

@azuresdkci add to whitelist

[sw145]

I understand we can use existing Cmdlets to retrieve location list, but then how to select which one in the location list that can satisfy every developer's need? We'll still need to write scripts or change codes in the <tests.ps1> to decide locations.

Also, I just use the same way how other checked-in tests are using and i believe this is just common practice for writing tests? So do i need to really make this change to my current code?

[markcowl]

@sw145 This is the required pattern for tests. See an example of thsi here:https://github.com/Azure/azure-powershell/blob/dev/src/ResourceManager/KeyVault/Commands.KeyVault.Test/ScenarioTests/Common.ps1#L37

[azurecla]

Hi @sw145, I'm your friendly neighborhood Azure Pull Request Bot (You can call me AZPRBOT). Thanks for your contribution!

It looks like you're working at Microsoft (shicwu). If you're full-time, we DON'T require a contribution license agreement.

If you are a vendor, DO please sign the electronic contribution license agreement. It will take 2 minutes and there's no faxing! https://cla.azure.com.

TTYL, AZPRBOT;

[markcowl]

@sw145 There are merge conflicts, please update

[sw145]

@markcowl May I know how can see these merge conflicts between my branch and Azure/dev? I can only see the files changes between my branch and Azure/dev through the page for pull request, but i can't find where's the conflicts

I tried on my local branch the following cmd:
git checkout dev
git fetch azure/git fetch azure-staging
both of "fetch" need me to provide authentication but i don't know what is that? My MS account doesn't work.
So if i can't get the most up-to-date context of Azure/dev, then how to merge from there to my branch and compare conflicts?

[markcowl]

@sw145 if you pull the latest from the dev branch intop your branch, you will see the merge conflicts, and can fix them with git resolve.

[sw145]

@markcowl Yeah, i know i need to pull the lastest dev into mine and compare, but the thing is i don't know how to realize this using git commands.

Since i'm in sw145/azure-powershell not in Azure/azure-powershell, and the dev branch is not up-to-date with Azure/dev, so what i'm planning to do is like following:

1. git merge from Azure/dev --> sw145/dev, to make my dev branch up-to-date
2. git merge from sw145/dev --> sw145/dev-shicwu
3. check merge conflicts, fix it, commit again
4. re-submit pullrequest
   The problem right now is i can't even accomplish step Merge private into public #1, because i don't have authentication when try to load information about Azure/dev into my local repo using command:
   git fetch azure/git fetch azure-Staging

Am i doing anything wrong for the above steps? Would you like to provide an example for the right things to do with specific commands?

Thanks!

[sw145]

@markcowl OK, i think i figured out the best way to do the pull, i'm using the following command:

git checkout dev-shicwu
git pull https://github.com/Azure/azure-powershell.git dev

This generates all the conflicts and i just need to solve them manually, however, what takes me extremely long time is I tried to do the following:

This makes me believe azure or azure-Staging part could be the powershell team repository url,
so then i tried commands like:
git fetch azure/git fetch azure-Staging
git pull azure dev/git pull azure-Staging dev, etc
and turns out it's just something else and also it need me to provide credentials to login. I don't understand why this information is stored here btw.

Also I think there must be some documentations specificly for Azure to tell us what to do when merge conflicts happens so that won't waste too much time even for Github newers since everyone will come into merge conflicts from time to time.

[markcowl]

@sw145 The remotes you show are specific to the clone of the repo on your machine, these you set up at some point with git remote commands. You can use either git pull or git rebase to pull in changes. The online git docs are the best source of intformation: https://git-scm.com/documentation

[sw145]

@markcowl sure, thanks for sharing! So is there anything i need to do right now for this PR to be checked-in?

[markcowl]

on demand run here: http://azuresdkci.cloudapp.net/view/1-AzurePowerShell/job/powershell-demand/927/

[markcowl]

LGTM once the on-demand build passes

[sw145]

@markcowl Hi, I check the on-demand build link you gave me, looks like it failed because of the wrong name for my repository, it believe we miss "s" in the name typed in the cmd.
For example:
"Cloning repository [email protected]:w145/azure-powershell.git"
should be
"Cloning repository [email protected]:sw145/azure-powershell.git"

Thanks for your help!