Skip to content

Commit

Permalink
Dev remove host pool region restriction (#35)
Browse files Browse the repository at this point in the history
* Remove Region Restriction when deploying from Portal UI
  • Loading branch information
WillyMoselhy authored Jan 8, 2025
1 parent 507ca56 commit cace9e7
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 31 deletions.
2 changes: 1 addition & 1 deletion FunctionApp/profile.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Set-PSFConfig -FullName PSFramework.Message.style.NoColor -Value $true #This is
## Version Banner ## Updated by Build\Build-Zip-File.ps1

# This value is automatically maintanted using GitHub Actions.
Write-PSFMessage -Level Host -Message "This is SessionHostReplacer version {0}" -StringValues 'v0.3.2'
Write-PSFMessage -Level Host -Message "This is SessionHostReplacer version {0}" -StringValues 'v0.3.3-beta.1'

# Import Function Parameters
try {
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Detailed instructions on the required permissions and how to assign them are ava
### Deployment
| Deployment Type | Link |
| :------------------------ | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| Azure Portal UI | [![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#blade/Microsoft_Azure_CreateUIDef/CustomDeploymentBlade/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FAVDSessionHostReplacer%2Fv0.3.2%2Fdeploy%2Farm%2FDeployAVDSessionHostReplacer.json/uiFormDefinitionUri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FAVDSessionHostReplacer%2Fv0.3.2%2Fdeploy%2Fportal-ui%2Fportal-ui.json) [![Deploy to Azure Gov](https://aka.ms/deploytoazuregovbutton)](https://portal.azure.us/#blade/Microsoft_Azure_CreateUIDef/CustomDeploymentBlade/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FAVDSessionHostReplacer%2Fv0.3.2%2Fdeploy%2Farm%2FDeployAVDSessionHostReplacer.json/uiFormDefinitionUri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FAVDSessionHostReplacer%2Fv0.3.2%2Fdeploy%2Fportal-ui%2Fportal-ui.json) [![Deploy to Azure China](https://aka.ms/deploytoazurechinabutton)](https://portal.azure.cn/#blade/Microsoft_Azure_CreateUIDef/CustomDeploymentBlade/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FAVDSessionHostReplacer%2Fv0.3.2%2Fdeploy%2Farm%2FDeployAVDSessionHostReplacer.json/uiFormDefinitionUri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FAVDSessionHostReplacer%2Fv0.3.2%2Fdeploy%2Fportal-ui%2Fportal-ui.json) |
| Azure Portal UI | [![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#blade/Microsoft_Azure_CreateUIDef/CustomDeploymentBlade/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FAVDSessionHostReplacer%2Fv0.3.3-beta.1%2Fdeploy%2Farm%2FDeployAVDSessionHostReplacer.json/uiFormDefinitionUri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FAVDSessionHostReplacer%2Fv0.3.3-beta.1%2Fdeploy%2Fportal-ui%2Fportal-ui.json) [![Deploy to Azure Gov](https://aka.ms/deploytoazuregovbutton)](https://portal.azure.us/#blade/Microsoft_Azure_CreateUIDef/CustomDeploymentBlade/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FAVDSessionHostReplacer%2Fv0.3.3-beta.1%2Fdeploy%2Farm%2FDeployAVDSessionHostReplacer.json/uiFormDefinitionUri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FAVDSessionHostReplacer%2Fv0.3.3-beta.1%2Fdeploy%2Fportal-ui%2Fportal-ui.json) [![Deploy to Azure China](https://aka.ms/deploytoazurechinabutton)](https://portal.azure.cn/#blade/Microsoft_Azure_CreateUIDef/CustomDeploymentBlade/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FAVDSessionHostReplacer%2Fv0.3.3-beta.1%2Fdeploy%2Farm%2FDeployAVDSessionHostReplacer.json/uiFormDefinitionUri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2FAVDSessionHostReplacer%2Fv0.3.3-beta.1%2Fdeploy%2Fportal-ui%2Fportal-ui.json) |
| Command line (Bicep/ARM) | [![Powershell/Azure CLI](./docs/icons/powershell.png)](./docs/CodeDeploy.md) |
| Offline Deployment (no GitHub) | [![Offline Deployment](./docs/icons/powershell.png)](./docs/CodeDeploy-offline.md) |

Expand Down
8 changes: 4 additions & 4 deletions StandardSessionHostTemplate/DeploySessionHosts.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.30.23.60470",
"templateHash": "14473546331683394413"
"version": "0.31.92.45157",
"templateHash": "9505111717020699037"
}
},
"parameters": {
Expand Down Expand Up @@ -141,8 +141,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.30.23.60470",
"templateHash": "7484271327926153268"
"version": "0.31.92.45157",
"templateHash": "1668721350327397558"
}
},
"parameters": {
Expand Down
34 changes: 17 additions & 17 deletions deploy/arm/DeployAVDSessionHostReplacer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.30.23.60470",
"templateHash": "1784400238600217767"
"version": "0.31.92.45157",
"templateHash": "2547658333929528003"
}
},
"parameters": {
Expand All @@ -25,7 +25,7 @@
},
"FunctionAppZipUrl": {
"type": "string",
"defaultValue": "https://github.com/Azure/AVDSessionHostReplacer/releases/download/v0.3.2/FunctionApp.zip",
"defaultValue": "https://github.com/Azure/AVDSessionHostReplacer/releases/download/v0.3.3-beta.1/FunctionApp.zip",
"metadata": {
"description": "Required: No | URL of the FunctionApp.zip file. This is the zip file containing the Function App code. Must be provided when OfflineDeploy is set to false | Default: The latest release of the Function App code."
}
Expand Down Expand Up @@ -580,8 +580,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.30.23.60470",
"templateHash": "14614504622325227119"
"version": "0.31.92.45157",
"templateHash": "2051971360233800407"
}
},
"parameters": {
Expand Down Expand Up @@ -792,8 +792,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.30.23.60470",
"templateHash": "1855754008854946998"
"version": "0.31.92.45157",
"templateHash": "2416204606786922916"
}
},
"parameters": {
Expand Down Expand Up @@ -868,8 +868,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.30.23.60470",
"templateHash": "12635068526585988455"
"version": "0.31.92.45157",
"templateHash": "13561226300070898150"
}
},
"parameters": {
Expand All @@ -888,8 +888,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.30.23.60470",
"templateHash": "14473546331683394413"
"version": "0.31.92.45157",
"templateHash": "9505111717020699037"
}
},
"parameters": {
Expand Down Expand Up @@ -1025,8 +1025,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.30.23.60470",
"templateHash": "7484271327926153268"
"version": "0.31.92.45157",
"templateHash": "1668721350327397558"
}
},
"parameters": {
Expand Down Expand Up @@ -1355,8 +1355,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.30.23.60470",
"templateHash": "2574188172202499390"
"version": "0.31.92.45157",
"templateHash": "2127924129757676299"
}
},
"parameters": {
Expand Down Expand Up @@ -1416,8 +1416,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.30.23.60470",
"templateHash": "2574188172202499390"
"version": "0.31.92.45157",
"templateHash": "2127924129757676299"
}
},
"parameters": {
Expand Down
2 changes: 1 addition & 1 deletion deploy/bicep/DeployAVDSessionHostReplacer.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ param Location string = resourceGroup().location
param OfflineDeploy bool = false

@description('Required: No | URL of the FunctionApp.zip file. This is the zip file containing the Function App code. Must be provided when OfflineDeploy is set to false | Default: The latest release of the Function App code.')
param FunctionAppZipUrl string = 'https://github.com/Azure/AVDSessionHostReplacer/releases/download/v0.3.2/FunctionApp.zip'
param FunctionAppZipUrl string = 'https://github.com/Azure/AVDSessionHostReplacer/releases/download/v0.3.3-beta.1/FunctionApp.zip'

//Monitoring
param EnableMonitoring bool = true
Expand Down
7 changes: 3 additions & 4 deletions deploy/portal-ui/portal-ui.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@
},
"options": {
"filter": {
"subscription": "onBasics",
"location": "onBasics"
"subscription": "onBasics"
}
}
},
Expand Down Expand Up @@ -133,7 +132,7 @@
"options": {
"icon": "Info",
"text": "When using a User Assigned Managed Identity, make sure the identity has the needed permissions in Azure and Entra. Follow the link for more info.",
"uri": "https://github.com/Azure/AVDReplacementPlans/blob/v0.3.2/docs/Permissions.md"
"uri": "https://github.com/Azure/AVDReplacementPlans/blob/v0.3.3-beta.1/docs/Permissions.md"
}
}
]
Expand Down Expand Up @@ -193,7 +192,7 @@
"type": "Microsoft.Common.TextBlock",
"visible": true,
"options": {
"text": "AVD session host replacer Portal UI Version: v0.3.2",
"text": "AVD session host replacer Portal UI Version: v0.3.3-beta.1",
"link": {
"label": "GitHub Repository",
"uri": "https://github.com/Azure/AVDSessionHostReplacer"
Expand Down
4 changes: 2 additions & 2 deletions docs/CodeDeploy-offline.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
This code deploys the AVD Session Host Replacer without dependency on GitHub. Remember to assign the [needed permissions](Permissions.md).

Required Files:
* [DeployAVDSessionHostReplacer.json](https://github.com/Azure/AVDSessionHostReplacer/releases/download/v0.3.2/DeployAVDSessionHostReplacer.json)
* [FunctionApp.zip](https://github.com/Azure/AVDSessionHostReplacer/releases/download/v0.3.2/FunctionApp.zip)
* [DeployAVDSessionHostReplacer.json](https://github.com/Azure/AVDSessionHostReplacer/releases/download/v0.3.3-beta.1/DeployAVDSessionHostReplacer.json)
* [FunctionApp.zip](https://github.com/Azure/AVDSessionHostReplacer/releases/download/v0.3.3-beta.1/FunctionApp.zip)

### PowerShell
```PowerShell
Expand Down
2 changes: 1 addition & 1 deletion docs/CodeDeploy.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ $TemplateParameters = @{
$paramNewAzResourceGroupDeployment = @{
Name = 'AVDSessionHostReplacer'
ResourceGroupName = $ResourceGroupName
TemplateUri = 'https://raw.githubusercontent.com/Azure/AVDSessionHostReplacer/v0.3.2/deploy/arm/DeployAVDSessionHostReplacer.json'
TemplateUri = 'https://raw.githubusercontent.com/Azure/AVDSessionHostReplacer/v0.3.3-beta.1/deploy/arm/DeployAVDSessionHostReplacer.json'
# If you cloned the repo and want to deploy using the bicep file use this instead of the above line
#TemplateFile = '.\deploy\bicep\DeployAVDSessionHostReplacer.bicep'
Expand Down

0 comments on commit cace9e7

Please sign in to comment.