Skip to content
This repository was archived by the owner on Jun 30, 2022. It is now read-only.

Commit 86617ff

Browse files
lauren-millsdarrenj
lauren-mills
authored and
darrenj
committed
resource group name fix (#1334)
1 parent d1c390c commit 86617ff

File tree

7 files changed

+21
-21
lines changed
  • templates
    • Skill-Template/csharp
    • Virtual-Assistant-Template
      • csharp
      • typescript
        • generator-botbuilder-assistant/generators
          • app/templates/customAssistant/deployment/scripts
          • skill/templates/customSkill/deployment/scripts
        • samples/sample-assistant/deployment/scripts

7 files changed

+21
-21
lines changed

‎templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Scripts/deploy.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ $timestamp = Get-Date -f MMddyyyyHHmmss
9494

9595
# Create resource group
9696
Write-Host "> Creating resource group ..."
97-
(az group create --name $name --location $location) 2>> $logFile | Out-Null
97+
(az group create --name $resourceGroup --location $location) 2>> $logFile | Out-Null
9898

9999
# Deploy Azure services (deploys LUIS, QnA Maker, Content Moderator, CosmosDB)
100100
Write-Host "> Deploying Azure services (this could take a while)..." -ForegroundColor Yellow
@@ -104,14 +104,14 @@ if ($parametersFile) {
104104
--resource-group $resourceGroup `
105105
--template-file "$(Join-Path $PSScriptRoot '..' 'Resources' 'template.json')" `
106106
--parameters "@$($parametersFile)" `
107-
--parameters microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
107+
--parameters name=$name microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
108108
}
109109
else {
110110
(az group deployment create `
111111
--name $timestamp `
112112
--resource-group $resourceGroup `
113113
--template-file "$(Join-Path $PSScriptRoot '..' 'Resources' 'template.json')" `
114-
--parameters microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
114+
--parameters name=$name microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
115115
}
116116

117117
# Get deployment outputs

‎templates/Skill-Template/csharp/Template/Skill/Deployment/Scripts/deploy.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ $timestamp = Get-Date -f MMddyyyyHHmmss
9494

9595
# Create resource group
9696
Write-Host "> Creating resource group ..."
97-
(az group create --name $name --location $location) 2>> $logFile | Out-Null
97+
(az group create --name $resourceGroup --location $location) 2>> $logFile | Out-Null
9898

9999
# Deploy Azure services (deploys LUIS, QnA Maker, Content Moderator, CosmosDB)
100100
Write-Host "> Deploying Azure services (this could take a while)..." -ForegroundColor Yellow
@@ -104,14 +104,14 @@ if ($parametersFile) {
104104
--resource-group $resourceGroup `
105105
--template-file "$(Join-Path $PSScriptRoot '..' 'Resources' 'template.json')" `
106106
--parameters "@$($parametersFile)" `
107-
--parameters microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
107+
--parameters name=$name microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
108108
}
109109
else {
110110
(az group deployment create `
111111
--name $timestamp `
112112
--resource-group $resourceGroup `
113113
--template-file "$(Join-Path $PSScriptRoot '..' 'Resources' 'template.json')" `
114-
--parameters microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
114+
--parameters name=$name microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
115115
}
116116

117117
# Get deployment outputs

‎templates/Virtual-Assistant-Template/csharp/Sample/VirtualAssistantSample/Deployment/Scripts/deploy.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ $timestamp = Get-Date -f MMddyyyyHHmmss
9494

9595
# Create resource group
9696
Write-Host "> Creating resource group ..."
97-
(az group create --name $name --location $location) 2>> $logFile | Out-Null
97+
(az group create --name $resourceGroup --location $location) 2>> $logFile | Out-Null
9898

9999
# Deploy Azure services (deploys LUIS, QnA Maker, Content Moderator, CosmosDB)
100100
Write-Host "> Deploying Azure services (this could take a while)..." -ForegroundColor Yellow
@@ -104,14 +104,14 @@ if ($parametersFile) {
104104
--resource-group $resourceGroup `
105105
--template-file "$(Join-Path $PSScriptRoot '..' 'Resources' 'template.json')" `
106106
--parameters "@$($parametersFile)" `
107-
--parameters microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
107+
--parameters name=$name microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
108108
}
109109
else {
110110
(az group deployment create `
111111
--name $timestamp `
112112
--resource-group $resourceGroup `
113113
--template-file "$(Join-Path $PSScriptRoot '..' 'Resources' 'template.json')" `
114-
--parameters microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
114+
--parameters name=$name microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
115115
}
116116

117117
# Get deployment outputs

‎templates/Virtual-Assistant-Template/csharp/Template/VA/Deployment/Scripts/deploy.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ $timestamp = Get-Date -f MMddyyyyHHmmss
9494

9595
# Create resource group
9696
Write-Host "> Creating resource group ..."
97-
(az group create --name $name --location $location) 2>> $logFile | Out-Null
97+
(az group create --name $resourceGroup --location $location) 2>> $logFile | Out-Null
9898

9999
# Deploy Azure services (deploys LUIS, QnA Maker, Content Moderator, CosmosDB)
100100
Write-Host "> Deploying Azure services (this could take a while)..." -ForegroundColor Yellow
@@ -104,14 +104,14 @@ if ($parametersFile) {
104104
--resource-group $resourceGroup `
105105
--template-file "$(Join-Path $PSScriptRoot '..' 'Resources' 'template.json')" `
106106
--parameters "@$($parametersFile)" `
107-
--parameters microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
107+
--parameters name=$name microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
108108
}
109109
else {
110110
(az group deployment create `
111111
--name $timestamp `
112112
--resource-group $resourceGroup `
113113
--template-file "$(Join-Path $PSScriptRoot '..' 'Resources' 'template.json')" `
114-
--parameters microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
114+
--parameters name=$name microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
115115
}
116116

117117
# Get deployment outputs

‎templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/app/templates/customAssistant/deployment/scripts/deploy.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ $timestamp = Get-Date -f MMddyyyyHHmmss
9494

9595
# Create resource group
9696
Write-Host "> Creating resource group ..."
97-
(az group create --name $name --location $location) 2>> $logFile | Out-Null
97+
(az group create --name $resourceGroup --location $location) 2>> $logFile | Out-Null
9898

9999
# Deploy Azure services (deploys LUIS, QnA Maker, Content Moderator, CosmosDB)
100100
Write-Host "> Deploying Azure services (this could take a while)..." -ForegroundColor Yellow
@@ -104,14 +104,14 @@ if ($parametersFile) {
104104
--resource-group $resourceGroup `
105105
--template-file "$(Join-Path $PSScriptRoot '..' 'resources' 'template.json')" `
106106
--parameters "@$($parametersFile)" `
107-
--parameters microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
107+
--parameters name=$name microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
108108
}
109109
else {
110110
(az group deployment create `
111111
--name $timestamp `
112112
--resource-group $resourceGroup `
113113
--template-file "$(Join-Path $PSScriptRoot '..' 'resources' 'template.json')" `
114-
--parameters microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
114+
--parameters name=$name microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
115115
}
116116

117117
# Get deployment outputs

‎templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/skill/templates/customSkill/deployment/scripts/deploy.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ $timestamp = Get-Date -f MMddyyyyHHmmss
9494

9595
# Create resource group
9696
Write-Host "> Creating resource group ..."
97-
(az group create --name $name --location $location) 2>> $logFile | Out-Null
97+
(az group create --name $resourceGroup --location $location) 2>> $logFile | Out-Null
9898

9999
# Deploy Azure services (deploys LUIS, QnA Maker, Content Moderator, CosmosDB)
100100
Write-Host "> Deploying Azure services (this could take a while)..." -ForegroundColor Yellow
@@ -104,14 +104,14 @@ if ($parametersFile) {
104104
--resource-group $resourceGroup `
105105
--template-file "$(Join-Path $PSScriptRoot '..' 'resources' 'template.json')" `
106106
--parameters "@$($parametersFile)" `
107-
--parameters microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
107+
--parameters name=$name microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
108108
}
109109
else {
110110
(az group deployment create `
111111
--name $timestamp `
112112
--resource-group $resourceGroup `
113113
--template-file "$(Join-Path $PSScriptRoot '..' 'resources' 'template.json')" `
114-
--parameters microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
114+
--parameters name=$name microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
115115
}
116116

117117
# Get deployment outputs

‎templates/Virtual-Assistant-Template/typescript/samples/sample-assistant/deployment/scripts/deploy.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ $timestamp = Get-Date -f MMddyyyyHHmmss
9494

9595
# Create resource group
9696
Write-Host "> Creating resource group ..."
97-
(az group create --name $name --location $location) 2>> $logFile | Out-Null
97+
(az group create --name $resourceGroup --location $location) 2>> $logFile | Out-Null
9898

9999
# Deploy Azure services (deploys LUIS, QnA Maker, Content Moderator, CosmosDB)
100100
Write-Host "> Deploying Azure services (this could take a while)..." -ForegroundColor Yellow
@@ -104,14 +104,14 @@ if ($parametersFile) {
104104
--resource-group $resourceGroup `
105105
--template-file "$(Join-Path $PSScriptRoot '..' 'resources' 'template.json')" `
106106
--parameters "@$($parametersFile)" `
107-
--parameters microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
107+
--parameters name=$name microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
108108
}
109109
else {
110110
(az group deployment create `
111111
--name $timestamp `
112112
--resource-group $resourceGroup `
113113
--template-file "$(Join-Path $PSScriptRoot '..' 'resources' 'template.json')" `
114-
--parameters microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
114+
--parameters name=$name microsoftAppId=$appId microsoftAppPassword="`"$($appPassword)`"") 2>> $logFile | Out-Null
115115
}
116116

117117
# Get deployment outputs

0 commit comments

Comments
 (0)