Skip to content

Add a default value for environmentName #17309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
barustum merged 3 commits into from
Dec 3, 2020
Merged

Add a default value for environmentName #17309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d27707
Add a default value for environmentName
Dec 3, 2020
7ba59c6
Add a dash in the default value for environmentName
Dec 3, 2020
d2d2905
change output variable name for template file
Dec 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdk/timeseriesinsights/Azure.Iot.TimeSeriesInsights/tests/prerequisites/setup.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ az deployment group create --resource-group $ResourceGroup --name $($Environment

# Even though the output variable names are all capital letters in the script, ARM turns them into a strange casing
# and we have to use that casing in order to get them from the deployment outputs.
$dataAccessFqdn = az deployment group show -g $ResourceGroup -n $($EnvironmentName.ToLower()) --query 'properties.outputs.dataAccessFQDN.value' --output tsv
$dataAccessFqdn = az deployment group show -g $ResourceGroup -n $($EnvironmentName.ToLower()) --query 'properties.outputs.TIMESERIESINSIGHTS_URL.value' --output tsv

Write-Host("`nSet a new client secret for $appId`n")
$appSecret = az ad app credential reset --id $appId --years 2 --query 'password' --output tsv
Expand Down
3 changes: 2 additions & 1 deletion sdk/timeseriesinsights/test-resources.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ param environmentName string {
description: 'Name of the environment. The name cannot include: \'<\', \'>\', \'%\', \'&\', \':\', \'\\\', \'?\', \'/\' and any control characters. All other characters are allowed.'
}
maxLength: 90
default: concat(az.resourceGroup().name, '-TSI')
}

param consumerGroupName string {
Expand Down Expand Up @@ -173,4 +174,4 @@ resource storageaccount 'Microsoft.Storage/storageAccounts@2018-11-01' = {
properties: {}
}

output dataAccessFQDN string = '${environment.properties.dataAccessFqdn}'
output TIMESERIESINSIGHTS_URL string = '${environment.properties.dataAccessFqdn}'
5 changes: 3 additions & 2 deletions sdk/timeseriesinsights/test-resources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
"maxLength": 90,
"metadata": {
"description": "Name of the environment. The name cannot include: '<', '>', '%', '&', ':', '\\', '?', '/' and any control characters. All other characters are allowed."
}
},
"defaultValue": "[concat(resourceGroup().name, '-TSI')]"
},
"consumerGroupName": {
"type": "string",
Expand Down Expand Up @@ -190,7 +191,7 @@
}
],
"outputs": {
"dataAccessFQDN": {
"TIMESERIESINSIGHTS_URL": {
"type": "string",
"value": "[reference(resourceId('Microsoft.TimeSeriesInsights/environments', parameters('environmentName'))).dataAccessFqdn]"
}
Expand Down