Skip to content

Fix 01-Create-Skill-Test-Shared-Azure-Resources #605

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

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Fix 01-Create-Skill-Test-Shared-Azure-Resources #605

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8f7fcf6
Add Set-PSDebug -Trace 1
Aug 25, 2022
7332149
Add ";" to line ends
Aug 25, 2022
1e6c57f
Disable Deploy Key Vault
Aug 25, 2022
41ea92f
Fix auth for createAppRegistrations.yml
Aug 25, 2022
489d565
Add trace
Sep 2, 2022
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
Prev Previous commit
Next Next commit
Add ";" to line ends
  • Loading branch information
Bruce Haley committed Aug 25, 2022
commit 7332149cecb1afe6daf4f30c3b1034f44ea07d9d
28 changes: 14 additions & 14 deletions build/yaml/deployBotResources/common/getAppRegistration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ steps:
inlineScript: |
Set-PSDebug -Trace 1;

$secret = New-Object -TypeName psobject
$source = ""
$secret = New-Object -TypeName psobject;
$source = "";
$withAppSecret = $true;

if("UserAssignedMSI" -eq "${{ parameters.appType }}") {
$appId = (az identity show --name "${{ parameters.botName }}${{ parameters.resourceSuffix }}" --resource-group "${{ parameters.sharedResourceGroup }}" | ConvertFrom-Json).clientId;
$secret | Add-Member -MemberType NoteProperty -Name AppId -Value $appId
$secret | Add-Member -MemberType NoteProperty -Name AppId -Value $appId;
$source = "UserAssignedMSI ${{ parameters.botName }}${{ parameters.resourceSuffix }}";
$withAppSecret = $false;

Expand All @@ -58,29 +58,29 @@ steps:
$entries = az keyvault secret list --vault-name "${{ parameters.keyVault }}" | ConvertFrom-Json | Where-Object {$_.name -like "${{ parameters.botName }}*"};

foreach ($entry in $entries) {
$secretVault = az keyvault secret show --id $entry.id | ConvertFrom-Json
$secret | Add-Member -MemberType NoteProperty -Name ($secretVault.name -replace "${{ parameters.botName }}", "") -Value "$($secretVault.value)"
$secretVault = az keyvault secret show --id $entry.id | ConvertFrom-Json;
$secret | Add-Member -MemberType NoteProperty -Name ($secretVault.name -replace "${{ parameters.botName }}", "") -Value "$($secretVault.value)";
}
} else {
$source = "Pipeline Variables"
$secret | Add-Member -MemberType NoteProperty -Name AppId -Value "${{ parameters.appId }}"
$secret | Add-Member -MemberType NoteProperty -Name AppSecret -Value "${{ parameters.appSecret }}"
$source = "Pipeline Variables";
$secret | Add-Member -MemberType NoteProperty -Name AppId -Value "${{ parameters.appId }}";
$secret | Add-Member -MemberType NoteProperty -Name AppSecret -Value "${{ parameters.appSecret }}";
}

if ([string]::IsNullOrEmpty($secret.AppId)) {
Write-Host "##vso[task.LogIssue type=error;]AppId is Null or Empty"
Write-Host "##vso[task.complete result=Failed;]DONE"
Write-Host "##vso[task.LogIssue type=error;]AppId is Null or Empty";
Write-Host "##vso[task.complete result=Failed;]DONE";
}

if ($withAppSecret -and [string]::IsNullOrEmpty($secret.AppSecret)) {
Write-Host "##vso[task.LogIssue type=error;]AppSecret is Null or Empty"
Write-Host "##vso[task.complete result=Failed;]DONE"
Write-Host "##vso[task.LogIssue type=error;]AppSecret is Null or Empty";
Write-Host "##vso[task.complete result=Failed;]DONE";
}

Write-Host "Source: $source;"
Write-Host "AppId: $($secret.AppId);"

Write-Host "##vso[task.setvariable variable=AppId]$($secret.AppId)"
Write-Host "##vso[task.setvariable variable=AppSecret]$($secret.AppSecret)"
Write-Host "##vso[task.setvariable variable=AppId]$($secret.AppId)";
Write-Host "##vso[task.setvariable variable=AppSecret]$($secret.AppSecret)";

Set-PSDebug -Trace 0;