зеркало из https://github.com/microsoft/AL-Go.git
Collect changes from freddydk/*@main
This commit is contained in:
Родитель
5340d9458d
Коммит
ef7cb72f54
|
@ -376,6 +376,7 @@ function ReadSettings {
|
|||
"insiderSasTokenSecretName" = "InsiderSasToken"
|
||||
"ghTokenWorkflowSecretName" = "GhTokenWorkflow"
|
||||
"adminCenterApiCredentialsSecretName" = "AdminCenterApiCredentials"
|
||||
"applicationInsightsConnectionStringSecretName" = "ApplicationInsightsConnectionString"
|
||||
"keyVaultCertificateUrlSecretName" = ""
|
||||
"keyVaultCertificatePasswordSecretName" = ""
|
||||
"keyVaultClientIdSecretName" = ""
|
||||
|
@ -1099,6 +1100,15 @@ function CreateDevEnv {
|
|||
if ($insiderSasTokenSecret) { $insiderSasToken = $insiderSasTokenSecret.SecretValue | Get-PlainText }
|
||||
|
||||
# do not add codesign cert.
|
||||
|
||||
if ($settings.applicationInsightsConnectionStringSecretName) {
|
||||
$applicationInsightsConnectionStringSecret = Get-AzKeyVaultSecret -VaultName $settings.keyVaultName -Name $settings.applicationInsightsConnectionStringSecretName
|
||||
if ($applicationInsightsConnectionStringSecret) {
|
||||
$runAlPipelineParams += @{
|
||||
"applicationInsightsConnectionString" = $applicationInsightsConnectionStringSecret.SecretValue | Get-PlainText
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($settings.KeyVaultCertificateUrlSecretName) {
|
||||
$KeyVaultCertificateUrlSecret = Get-AzKeyVaultSecret -VaultName $settings.keyVaultName -Name $settings.KeyVaultCertificateUrlSecretName
|
||||
|
|
|
@ -10,7 +10,7 @@ Param(
|
|||
[Parameter(HelpMessage = "Settings from repository in compressed Json format", Mandatory = $false)]
|
||||
[string] $settingsJson = '{"AppBuild":"", "AppRevision":""}',
|
||||
[Parameter(HelpMessage = "Secrets from repository in compressed Json format", Mandatory = $false)]
|
||||
[string] $secretsJson = '{"insiderSasToken":"","licenseFileUrl":"","CodeSignCertificateUrl":"","CodeSignCertificatePassword":"","KeyVaultCertificateUrl":"","KeyVaultCertificatePassword":"","KeyVaultClientId":"","StorageContext":""}'
|
||||
[string] $secretsJson = '{"insiderSasToken":"","licenseFileUrl":"","CodeSignCertificateUrl":"","CodeSignCertificatePassword":"","KeyVaultCertificateUrl":"","KeyVaultCertificatePassword":"","KeyVaultClientId":"","StorageContext":"","ApplicationInsightsConnectionString":""}'
|
||||
)
|
||||
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
@ -48,7 +48,7 @@ try {
|
|||
$secrets = $secretsJson | ConvertFrom-Json | ConvertTo-HashTable
|
||||
$appBuild = $settings.appBuild
|
||||
$appRevision = $settings.appRevision
|
||||
'licenseFileUrl','insiderSasToken','CodeSignCertificateUrl','CodeSignCertificatePassword','KeyVaultCertificateUrl','KeyVaultCertificatePassword','KeyVaultClientId','StorageContext' | ForEach-Object {
|
||||
'licenseFileUrl','insiderSasToken','CodeSignCertificateUrl','CodeSignCertificatePassword','KeyVaultCertificateUrl','KeyVaultCertificatePassword','KeyVaultClientId','StorageContext','ApplicationInsightsConnectionString' | ForEach-Object {
|
||||
if ($secrets.ContainsKey($_)) {
|
||||
$value = $secrets."$_"
|
||||
}
|
||||
|
@ -137,6 +137,12 @@ try {
|
|||
"CodeSignCertPfxPassword" = ConvertTo-SecureString -string $codeSignCertificatePassword -AsPlainText -Force
|
||||
}
|
||||
}
|
||||
if ($applicationInsightsConnectionString) {
|
||||
$runAlPipelineParams += @{
|
||||
"applicationInsightsConnectionString" = $applicationInsightsConnectionString
|
||||
}
|
||||
}
|
||||
|
||||
if ($KeyVaultCertificateUrl -and $KeyVaultCertificatePassword -and $KeyVaultClientId) {
|
||||
$runAlPipelineParams += @{
|
||||
"KeyVaultCertPfxFile" = $KeyVaultCertificateUrl
|
||||
|
|
|
@ -24,7 +24,7 @@ inputs:
|
|||
secretsJson:
|
||||
description: Secrets from repository in compressed Json format
|
||||
required: false
|
||||
default: '{"insiderSasToken":"","licenseFileUrl":"","CodeSignCertificateUrl":"","CodeSignCertificatePw":"","KeyVaultCertificateUrl":"","KeyVaultCertificatePw":"","KeyVaultClientId":""}'
|
||||
default: '{"insiderSasToken":"","licenseFileUrl":"","CodeSignCertificateUrl":"","CodeSignCertificatePw":"","KeyVaultCertificateUrl":"","KeyVaultCertificatePw":"","KeyVaultClientId":"","applicationInsightsConnectionString": ""}'
|
||||
runs:
|
||||
using: composite
|
||||
steps:
|
||||
|
|
Загрузка…
Ссылка в новой задаче