Commit e5aa23a

authored

Merge pull request microsoft#431 from srdan-bozovic-msft/master

sql-managed-instance: prepare - a few fixes

2 parents 0000604 + 85cb49a commit e5aa23aCopy full SHA for e5aa23a

File tree

2 files changed

-14

lines changed

samples/manage/azure-sql-db-managed-instance/prepare-subnet
- README.md
- prepareSubnet.ps1

2 files changed

-14

lines changed

`‎samples/manage/azure-sql-db-managed-instance/prepare-subnet/README.md`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ $parameters = @{`
`55`	`55`	`subnetName = '<subnetName>'`
`56`	`56`	`}`
`57`	`57`
`58`		`-Invoke-Command -ScriptBlock ([Scriptblock]::Create((New-Object System.Net.WebClient).DownloadString($scriptUrlBase+'/prepareSubnet.ps1?t='+ [DateTime]::Now.Ticks))) -ArgumentList $parameters`
	`58`	`+Invoke-Command -ScriptBlock ([Scriptblock]::Create((iwr ($scriptUrlBase+'/prepareSubnet.ps1?t='+ [DateTime]::Now.Ticks)).Content)) -ArgumentList $parameters`
`59`	`59`
`60`	`60`	```
`61`	`61`

`‎samples/manage/azure-sql-db-managed-instance/prepare-subnet/prepareSubnet.ps1`

Lines changed: 8 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,16 +12,11 @@ function Ensure-Login ()`
`12`	`12`	`If($context.Subscription -eq $null)`
`13`	`13`	`{`
`14`	`14`	`Write-Host "Loging in ..."`
`15`		`- Try`
	`15`	`+ If((Login-AzureRmAccount -ErrorAction SilentlyContinue -ErrorVariable Errors) -eq$null)`
`16`	`16`	`{`
`17`		`- Login-AzureRmAccount -ErrorAction Stop \| Out-null`
	`17`	`+ Write-Host ("Login failed: {0}" -f $Errors[0].Exception.Message) -ForegroundColor Red`
	`18`	`+ Break`
`18`	`19`	`}`
`19`		`- Catch`
`20`		`- {`
`21`		`- Write-Host "Login failed: $_" -ForegroundColor Red`
`22`		`- Exit`
`23`		`- }`
`24`		`-`
`25`	`20`	`}`
`26`	`21`	`Write-Host "User logedin." -ForegroundColor Green`
`27`	`22`	`}`
`@@ -41,7 +36,7 @@ function Select-SubscriptionId {`
`41`	`36`	`Catch`
`42`	`37`	`{`
`43`	`38`	`Write-Host "Subscription selection failed: $_" -ForegroundColor Red`
`44`		`- Exit`
	`39`	`+ Break`
`45`	`40`	`}`
`46`	`41`	`}`
`47`	`42`	`Write-Host "Subscription selected." -ForegroundColor Green`
`@@ -62,7 +57,7 @@ function Load-VirtualNetwork {`
`62`	`57`	`else`
`63`	`58`	`{`
`64`	`59`	`Write-Host "Virtual network not found." -ForegroundColor Red`
`65`		`- Exit`
	`60`	`+ Break`
`66`	`61`	`}`
`67`	`62`	`}`
`68`	`63`
`@@ -83,7 +78,7 @@ function Load-VirtualNetworkSubnet {`
`83`	`78`	`else`
`84`	`79`	`{`
`85`	`80`	`Write-Host "Subnet not found." -ForegroundColor Red`
`86`		`- Exit`
	`81`	`+ Break`
`87`	`82`	`}`
`88`	`83`	`}`
`89`	`84`
`@@ -99,7 +94,7 @@ function Verify-Subnet {`
`99`	`94`	`Else`
`100`	`95`	`{`
`101`	`96`	`Write-Host "Failed Validation - Minimum supported subnet size is /28." -ForegroundColor Red`
`102`		`- Exit`
	`97`	`+ Break`
`103`	`98`	`}`
`104`	`99`	`If(`
`105`	`100`	`($subnet.IpConfigurations.Count -eq 0) -and`
`@@ -114,7 +109,7 @@ function Verify-Subnet {`
`114`	`109`	`Else`
`115`	`110`	`{`
`116`	`111`	`Write-Host "Failed Validation - Subnet is already in use." -ForegroundColor Red`
`117`		`- Exit`
	`112`	`+ Break`
`118`	`113`	`}`
`119`	`114`	`}`
`120`	`115`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit e5aa23a

File tree

2 files changed

2 files changed

`‎samples/manage/azure-sql-db-managed-instance/prepare-subnet/README.md`

`‎samples/manage/azure-sql-db-managed-instance/prepare-subnet/prepareSubnet.ps1`

0 commit comments