Skip to content

Commit b17a199

Browse files
author
Russ Williams
committed
Fixed a number of issues
1 parent c5d0535 commit b17a199

File tree

5 files changed

+37
-29
lines changed

5 files changed

+37
-29
lines changed

‎ACSAgentHub/local.settings.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"Values": {
44
"AzureWebJobsStorage": "UseDevelopmentStorage=true",
55
"FUNCTIONS_WORKER_RUNTIME": "dotnet",
6-
"agentHubStorageConnectionString": "",
7-
"acsConnectionString": "",
8-
"botBaseAddress": "http://localhost:3978/",
6+
"agentHubStorageConnectionString": "DefaultEndpointsProtocol=https;EndpointSuffix=core.windows.net;AccountName=acsagenthubrhw;AccountKey=1CEyV1LH0o2xyXh2OiFW1/ofFEMiHWYv2sTJPnPXnJjZn80cF15wYsvUGt29LyFSyvlONf7hG/VY+AStiIaUVQ==",
7+
"acsConnectionString": "endpoint=https://acsagenthubrhwacs.communication.azure.com/;accesskey=/6LN9tienVGXi65p3gcYyGrQf+YHX8dzg+mMn9e5aUfupI77qExVX1TZrVJQVTuS0Fhk0IE/HbJmyy1xQ5AEJg==",
8+
"botBaseAddress": "http://localhost:3980/",
99
"useACSManagedIdentity": "false",
10-
"webPusSubConnectionString": "",
10+
"webPusSubConnectionString": "Endpoint=https://acsagenthubrhwwps.webpubsub.azure.com;AccessKey=IIKkVIPszyVZtSEmvAzLTSObrd8wNVub/KIZoCHImXY=;Version=1.0;",
1111
"webPubSubHubName": "refreshConversations"
1212
},
1313
"Host": {

‎Deployment/Scripts/create_nuget_package.ps1

+11-11
Original file line numberDiff line numberDiff line change
@@ -74,22 +74,22 @@ $startTime = Get-Date
7474
Write-Host "Creating local NuGet feed for ACSConnector" -NoNewline -ForegroundColor Green
7575
$acsConnectorNuGetPackage = Join-Path $PSScriptRoot ..\..\ "ACSConnector\bin\Debug\ACSConnector.$connectorPackageVersion.nupkg" -Resolve
7676
$acsAgentHubSDKNuGetPackage = Join-Path $PSScriptRoot ..\.. "ACSAgentHubSDK\bin\Debug\ACSAgentHubSDK.$connectorPackageVersion.nupkg" -Resolve
77-
$acsConnectorLocalFeedFolder = join-Path $PSScriptRoot ..\..\ "ACSConnector\localFeed" -Resolve
77+
$acsConnectorLocalFeedFolder = join-Path $PSScriptRoot ..\..\ "ACSConnector" -Resolve
7878
# First, create folder for local NuGet feed
79-
if ($showCommands.ToLower() -eq "true") {Write-Host ''; Write-Host "mkdir -Force $acsConnectorLocalFeedFolder"}
80-
mkdir -Force $acsConnectorLocalFeedFolder
79+
if ($showCommands.ToLower() -eq "true") {Write-Host ''; Write-Host "mkdir -Force $acsConnectorLocalFeedFolder\localfeed"}
80+
mkdir $acsConnectorLocalFeedFolder\localfeed
8181

82-
if ($showCommands.ToLower() -eq "true") {Write-Host ''; Write-Host "$NuGetFullPath delete ACSAgentHubSDK $connectorPackageVersion -Source $acsConnectorLocalFeedFolder -NonInteractive " }
83-
& $NuGetFullPath delete ACSAgentHubSDK $connectorPackageVersion -Source $acsConnectorLocalFeedFolder -NonInteractive
84-
if ($showCommands.ToLower() -eq "true") {Write-Host ''; Write-Host "$NuGetFullPath delete ACSConnector $connectorPackageVersion -Source $acsConnectorLocalFeedFolder -NonInteractive " }
85-
& $NuGetFullPath delete ACSConnector $connectorPackageVersion -Source $acsConnectorLocalFeedFolder -NonInteractive
82+
if ($showCommands.ToLower() -eq "true") {Write-Host ''; Write-Host "$NuGetFullPath delete ACSAgentHubSDK $connectorPackageVersion -Source $acsConnectorLocalFeedFolder\localfeed -NonInteractive " }
83+
& $NuGetFullPath delete ACSAgentHubSDK $connectorPackageVersion -Source $acsConnectorLocalFeedFolder\localfeed -NonInteractive
84+
if ($showCommands.ToLower() -eq "true") {Write-Host ''; Write-Host "$NuGetFullPath delete ACSConnector $connectorPackageVersion -Source $acsConnectorLocalFeedFolder\localfeed -NonInteractive " }
85+
& $NuGetFullPath delete ACSConnector $connectorPackageVersion -Source $acsConnectorLocalFeedFolder\localfeed -NonInteractive
8686

8787
# Next, clear all NuGet caches in case we are overwriting existing versions of existing NuGet packages (this can cause runtime startup issues in Composer)
8888
#if ($showCommands.ToLower() -eq "true") {Write-Host ''; Write-Host "$NuGetFullPath locals all -clear" }
8989
#& $NuGetFullPath locals all -clear
9090

9191
# Next, add ACSConnector and its dependencies to local NuGet feed
92-
if ($showCommands.ToLower() -eq "true") {Write-Host ''; Write-Host "$NuGetFullPath add $acsAgentHubSDKNuGetPackage -Source $acsConnectorLocalFeedFolder" }
93-
& $NuGetFullPath add $acsAgentHubSDKNuGetPackage -Source $acsConnectorLocalFeedFolder
94-
if ($showCommands.ToLower() -eq "true") {Write-Host ''; Write-Host "$NuGetFullPath add $acsConnectorNuGetPackage -Source $acsConnectorLocalFeedFolder" }
95-
& $NuGetFullPath add $acsConnectorNuGetPackage -Source $acsConnectorLocalFeedFolder
92+
if ($showCommands.ToLower() -eq "true") {Write-Host ''; Write-Host "$NuGetFullPath add $acsAgentHubSDKNuGetPackage -Source $acsConnectorLocalFeedFolder\localfeed" }
93+
& $NuGetFullPath add $acsAgentHubSDKNuGetPackage -Source $acsConnectorLocalFeedFolder\localfeed
94+
if ($showCommands.ToLower() -eq "true") {Write-Host ''; Write-Host "$NuGetFullPath add $acsConnectorNuGetPackage -Source $acsConnectorLocalFeedFolder\localfeed" }
95+
& $NuGetFullPath add $acsConnectorNuGetPackage -Source $acsConnectorLocalFeedFolder\localfeed

‎Deployment/Scripts/deploy_acs_agent_hub.ps1

+9-9
Original file line numberDiff line numberDiff line change
@@ -112,22 +112,22 @@ Write-Host " - Done." -ForegroundColor Green
112112
Write-Host "Creating local NuGet feed for ACSConnector" -NoNewline -ForegroundColor Green
113113
$acsConnectorNuGetPackage = Join-Path $PSScriptRoot ..\..\ "ACSConnector\bin\Debug\ACSConnector.$connectorPackageVersion.nupkg" -Resolve
114114
$acsAgentHubSDKNuGetPackage = Join-Path $PSScriptRoot ..\.. "ACSAgentHubSDK\bin\Debug\ACSAgentHubSDK.$connectorPackageVersion.nupkg" -Resolve
115-
$acsConnectorLocalFeedFolder = join-Path $PSScriptRoot ..\..\ "ACSConnector\localFeed" -Resolve
115+
$acsConnectorLocalFeedFolder = join-Path $PSScriptRoot ..\..\ "ACSConnector" -Resolve
116116
# First, create folder for local NuGet feed
117-
if ($showCommands.ToLower() -eq "true") {Write-Host ''; Write-Host "mkdir -Force $acsConnectorLocalFeedFolder"}
118-
mkdir -Force $acsConnectorLocalFeedFolder 2>> "$logFile" | Out-Null
117+
if ($showCommands.ToLower() -eq "true") {Write-Host ''; Write-Host "mkdir $acsConnectorLocalFeedFolder\localfeed"}
118+
mkdir $acsConnectorLocalFeedFolder\localfeed 2>> "$logFile" | Out-Null
119119

120-
& $NuGetFullPath delete ACSAgentHubSDK $connectorPackageVersion -Source $acsConnectorLocalFeedFolder -NonInteractive 2>> "$logFile" | Out-Null
121-
& $NuGetFullPath delete ACSConnector $connectorPackageVersion -Source $acsConnectorLocalFeedFolder -NonInteractive 2>> "$logFile" | Out-Null
120+
& $NuGetFullPath delete ACSAgentHubSDK $connectorPackageVersion -Source $acsConnectorLocalFeedFolder\localfeed -NonInteractive 2>> "$logFile" | Out-Null
121+
& $NuGetFullPath delete ACSConnector $connectorPackageVersion -Source $acsConnectorLocalFeedFolder\localfeed -NonInteractive 2>> "$logFile" | Out-Null
122122

123123
# Next, clear all NuGet caches in case we are overwriting existing versions of existing NuGet packages (this can cause runtime startup issues in Composer)
124124
#& $NuGetFullPath locals all -clear 2>> "$logFile" | Out-Null
125125

126126
# Next, add ACSConnector and its dependencies to local NuGet feed
127-
if ($showCommands.ToLower() -eq "true") {Write-Host ''; Write-Host "$NuGetFullPath add $acsConnectorNuGetPackage -Source $acsConnectorLocalFeedFolder" }
128-
& $NuGetFullPath add $acsConnectorNuGetPackage -Source $acsConnectorLocalFeedFolder 2>> "$logFile" | Out-Null
129-
if ($showCommands.ToLower() -eq "true") {Write-Host ''; Write-Host "$NuGetFullPath add $acsAgentHubSDKNuGetPackage -Source $acsConnectorLocalFeedFolder" }
130-
& $NuGetFullPath add $acsAgentHubSDKNuGetPackage -Source $acsConnectorLocalFeedFolder 2>> "$logFile" | Out-Null
127+
if ($showCommands.ToLower() -eq "true") {Write-Host ''; Write-Host "$NuGetFullPath add $acsConnectorNuGetPackage -Source $acsConnectorLocalFeedFolder\localfeed" }
128+
& $NuGetFullPath add $acsConnectorNuGetPackage -Source $acsConnectorLocalFeedFolder\localfeed 2>> "$logFile" | Out-Null
129+
if ($showCommands.ToLower() -eq "true") {Write-Host ''; Write-Host "$NuGetFullPath add $acsAgentHubSDKNuGetPackage -Source $acsConnectorLocalFeedFolder\localfeed" }
130+
& $NuGetFullPath add $acsAgentHubSDKNuGetPackage -Source $acsConnectorLocalFeedFolder\localfeed 2>> "$logFile" | Out-Null
131131

132132
Write-Host " - Done." -ForegroundColor Green
133133

‎README.md

+11-3
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,19 @@ Services, you can have an agent escalation capability up and working in 15 minut
77

88
### <a name="Prerequisites"></a>Prerequisites
99

10+
#### Powershell 7
11+
The deployment scripts require Powershell 7 which can be downloaded [here](https://docs.microsoft.com/en-us/powershell/scripting/install/installing-powershell-on-windows?view=powershell-7.2)
12+
1013
#### Ngrok
1114
To install ngrok, follow instructions [here](https://ngrok.com/download)
1215

1316
#### Azure CLI
14-
The deployment scripts require Azure CLI version 2.22.0 or newer which you can install from [here](
17+
The deployment scripts require Azure CLI version 2.22.0 or newer. You can check which version of the Azure CLI you have
18+
installed by running this command from command prompt:
19+
```
20+
az version
21+
```
22+
If you don't already have the Azure CLI installed, you can install it from [here](
1523
https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-windows?tabs=azure-cli).
1624

1725
#### Azure Communication Service CLI Extension
@@ -61,14 +69,14 @@ In PowerShell, change the current directory to the root solution folder (i.e., t
6169
that contains the ACSAgentHub.sln file). Then run the following script to deploy and
6270
configure all the services required by the ACS Agent Hub:
6371
```
64-
.\Deployment\Scripts\deploy_and_configure.ps1 -hubName <hub name> -resourceGroup <resource group> $ngrokFullPath <ngrok path> -location <location name> -NuGetFullPath <nuget path>
72+
.\Deployment\Scripts\deploy_and_configure.ps1 -hubName <hub name> -resourceGroup <resource group> -ngrokFullPath <ngrok path> -location <location name> -NuGetFullPath <nuget path>
6573
```
6674
where:
6775
- **\<hub name>** is the name of your agent hub which will also be used as part of the name of
6876
other services created by this script
6977
- **\<resource group>** is the name of the resource group that services will be deployed to
7078
- **\<ngrok path>** is the full path to the ngrok.exe (e.g., c:\nuget\ngrok.exe)
71-
- **\<location name>** is the Azure location name of the region that services will be deployed in
79+
- **\<location name>** is the Azure location name of the region that services will be deployed in (e.g., eastus)
7280
- **\<nuget path>** is the full path to the nuget.exe (e.g., c:\nuget\nuget.exe)
7381

7482
### <a name="ExploreEscalationScenarios"></a>Explore Escalation Scenarios

‎agent-portal/src/settings/appsettings.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// App settings for the agent-portal
22
export const appsettings = {
3-
agentHubBaseAddress: '',
4-
webPusSubConnectionString: '',
3+
agentHubBaseAddress: 'http://localhost:7071',
4+
webPusSubConnectionString: 'Endpoint=https://acsagenthubrhwwps.webpubsub.azure.com;AccessKey=IIKkVIPszyVZtSEmvAzLTSObrd8wNVub/KIZoCHImXY=;Version=1.0;',
55
webPubSubHubName: 'refreshConversations'
66
};

0 commit comments

Comments
 (0)