Skip to content

Commit 8efe382

Browse files
committed
Fixed sb namepace
1 parent d3e2d47 commit 8efe382

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

blockchain-workbench/scripts/upgrade/azureBlockchainWorkbenchUpgradeToLatest.ps1

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,7 @@ elseif ($TestEnv -And (Get-Module -ListAvailable -Name AzureRM)) {
7676
Set-Alias -Name Get-AzServiceBusNamespace -Value Get-AzureRmServiceBusNamespace
7777
Set-Alias -Name Get-AzEventGridTopic -Value Get-AzureRmEventGridTopic
7878
Set-Alias -Name Get-AzEventGridTopicKey -Value Get-AzureRmEventGridTopicKey
79-
Set-Alias -Name Get-AzServiceBusQueue -Value Get-AzureRmServiceBusQueue
8079
Set-Alias -Name New-AzServiceBusQueue -Value New-AzureRmServiceBusQueue
81-
Set-Alias -Name Get-AzServiceBusTopic -Value Get-AzureRmServiceBusTopic
8280
Set-Alias -Name New-AzServiceBusTopic -Value New-AzureRmServiceBusTopic
8381
Set-Alias -Name Remove-AzVmssExtension -Value Remove-AzureRmVmssExtension
8482
Set-Alias -Name Add-AzVmssExtension -Value Add-AzureRmVmssExtension
@@ -153,7 +151,7 @@ if (-Not $uiWebsite) {
153151
$uiWebsite = Get-AzWebApp -ResourceGroupName $ResourceGroupName -Name $uiWebsite.Name
154152

155153
# Locate the service bus
156-
$serviceBusNs = Get-AzServiceBusNamespace -ResourceGroupName $ResourceGroupName -ErrorAction SilentlyContinue
154+
$serviceBusNs = (Get-AzServiceBusNamespace -ResourceGroupName $ResourceGroupName -ErrorAction SilentlyContinue)[0]
157155
if (-Not $serviceBusNs) {
158156
throw "Could not locate Service Bus within the resource group $ResourceGroupName. Is this a Blockchain Workbench deployment?"
159157
}
@@ -311,7 +309,7 @@ Write-Progress -Id $logID -Activity "Pre-Requisites" -Status "Checking for servi
311309

312310
# Create the Service Bus queue "ingressQueue", "internalQueue" and topic "egressTopic" if they don't exist
313311
$queueName = "internalQueue"
314-
$queue = Get-AzServiceBusQueue -ResourceGroupName $ResourceGroupName -Namespace $serviceBusNs -Name $queueName -ErrorAction SilentlyContinue
312+
$queue = Get-AzServiceBusQueue -ResourceGroupName $ResourceGroupName -Namespace $serviceBusNs.Name -Name $queueName -ErrorAction SilentlyContinue
315313
if (-Not $queue) {
316314
Write-Progress -Id $logID -Activity "Pre-Requisites" -Status "Checking for service bus queue..." -PercentComplete 35
317315

@@ -332,7 +330,7 @@ if (-Not $queue) {
332330
}
333331

334332
$queueName = "ingressQueue"
335-
$queue = Get-AzServiceBusQueue -ResourceGroupName $ResourceGroupName -Namespace $serviceBusNs -Name $queueName -ErrorAction SilentlyContinue
333+
$queue = Get-AzServiceBusQueue -ResourceGroupName $ResourceGroupName -Namespace $serviceBusNs.Name -Name $queueName -ErrorAction SilentlyContinue
336334
if (-Not $queue) {
337335
Write-Progress -Id $logID -Activity "Pre-Requisites" -Status "Checking for service bus queue..." -PercentComplete 35
338336

@@ -353,7 +351,7 @@ if (-Not $queue) {
353351
}
354352

355353
$topicName = "egressTopic"
356-
$topic = Get-AzServiceBusTopic -ResourceGroupName $ResourceGroupName -Namespace $serviceBusNs -Name $topicName -ErrorAction SilentlyContinue
354+
$topic = Get-AzServiceBusTopic -ResourceGroupName $ResourceGroupName -Namespace $serviceBusNs.Name -Name $topicName -ErrorAction SilentlyContinue
357355
if (-Not $topic) {
358356
Write-Progress -Id $logID -Activity "Pre-Requisites" -Status "Checking for service bus topic..." -PercentComplete 35
359357

0 commit comments

Comments
 (0)