Skip to content

Commit 867fad2

Browse files
alrios-msabrilgzz
alrios-ms
authored and
abrilgzz
committed
Updated PS1 scripts
1 parent ecc00d4 commit 867fad2

File tree

5 files changed

+37
-19
lines changed

5 files changed

+37
-19
lines changed

‎Deployment/Deploy-Resources.ps1‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ function Get-TemplateParameters {
156156
[Parameter(Mandatory = $true)]
157157
[string]$ParametersFilePath,
158158
[Parameter(Mandatory = $false)]
159-
[Hashtable]$AdditionalParameters = @{}
159+
[Hashtable]$AdditionalParameters = @{ parameters = @{} }
160160
)
161161

162162
$TemplateObject = Get-TemplateAsHashtable -TemplateFilePath $TemplateFilePath
@@ -264,7 +264,7 @@ function Set-PrereqResources {
264264
[Parameter(Mandatory = $true)]
265265
[string]$ParameterFilePath,
266266
[Parameter(Mandatory = $false)]
267-
[Hashtable]$AdditionalParameters = @{},
267+
[Hashtable]$AdditionalParameters = @{ parameters = @{} },
268268
[Parameter(Mandatory = $false)]
269269
[bool] $SetRBACPermissions
270270
)
@@ -306,7 +306,7 @@ function Set-DataResources {
306306
[Parameter(Mandatory = $true)]
307307
[string]$ParameterFilePath,
308308
[Parameter(Mandatory = $false)]
309-
[Hashtable]$AdditionalParameters = @{},
309+
[Hashtable]$AdditionalParameters = @{ parameters = @{} },
310310
[Parameter(Mandatory = $false)]
311311
[bool] $SetRBACPermissions
312312
)
@@ -348,7 +348,7 @@ function Set-ComputeResources {
348348
[Parameter(Mandatory = $true)]
349349
[string]$ParameterFilePath,
350350
[Parameter(Mandatory = $false)]
351-
[Hashtable]$AdditionalParameters = @{}
351+
[Hashtable]$AdditionalParameters = @{ parameters = @{} }
352352
)
353353

354354
$directoryPath = $TemplateFilePath
@@ -482,7 +482,8 @@ function Set-GMMResources {
482482
foreach ($secret in $adfDataSecrets) {
483483
$secretExists = Check-IfKeyVaultSecretExists -VaultName $dataResourceGroup -SecretName $secret
484484
if (-not $secretExists) {
485-
$secretValue = ConvertTo-SecureString -String "not-set" -AsPlainText -Force
485+
$secretValue = = New-Object System.Security.SecureString
486+
"not-set".ToCharArray() | ForEach-Object { $secretValue.AppendChar($_) }
486487
Set-AzKeyVaultSecret -VaultName $dataResourceGroup -Name $secret -SecretValue $secretValue
487488
}
488489
}

‎Scripts/Set-GMMSqlMembershipAzureADApplication.ps1‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,9 @@ function Set-GMMSqlMembershipAzureADApplication {
121121
Write-Verbose "Application (client) ID is $($sqlMembershipApp.AppId)"
122122

123123
$sqlMembershipAppIdKeyVaultSecretName = "sqlMembershipAppId"
124-
$sqlMembershipAppIdSecret = ConvertTo-SecureString -AsPlainText -Force $sqlMembershipAppID
124+
$sqlMembershipAppIdSecret = New-Object System.Security.SecureString
125+
$sqlMembershipAppId.ToCharArray() | ForEach-Object { $sqlMembershipAppIdSecret.AppendChar($_) }
126+
125127
Set-AzKeyVaultSecret -VaultName $keyVault.VaultName `
126128
-Name $sqlMembershipAppIdKeyVaultSecretName `
127129
-SecretValue $sqlMembershipAppIdSecret
@@ -131,7 +133,9 @@ function Set-GMMSqlMembershipAzureADApplication {
131133
$passwordCredential = New-AzADAppCredential -ObjectId $sqlMembershipApp.Id -StartDate (Get-Date).AddHours(-1) -EndDate (Get-Date).AddYears(1)
132134
$sqlMembershipAppPasswordCredentialValue = $passwordCredential.SecretText
133135
$sqlMembershipAppPasswordCredentialValueSecretName = "sqlMembershipAppPasswordCredentialValue"
134-
$sqlMembershipAppPasswordCredentialValueSecret = ConvertTo-SecureString -AsPlainText -Force $sqlMembershipAppPasswordCredentialValue
136+
$sqlMembershipAppPasswordCredentialValueSecret = New-Object System.Security.SecureString
137+
$sqlMembershipAppPasswordCredentialValue.ToCharArray() | ForEach-Object { $sqlMembershipAppPasswordCredentialValueSecret.AppendChar($_) }
138+
135139
Set-AzKeyVaultSecret -VaultName $keyVault.VaultName `
136140
-Name $sqlMembershipAppPasswordCredentialValueSecretName `
137141
-SecretValue $sqlMembershipAppPasswordCredentialValueSecret
@@ -147,7 +151,9 @@ function Set-GMMSqlMembershipAzureADApplication {
147151
}
148152

149153
$sqlMembershipAppServicePrincipalObjectIDKeyVaultSecretName = "sqlMembershipAppServicePrincipalObjectId"
150-
$sqlMembershipAppServicePrincipalObjectIDSecret = ConvertTo-SecureString -AsPlainText -Force $sqlMembershipAppServicePrincipal.Id
154+
$sqlMembershipAppServicePrincipalObjectIDSecret = New-Object System.Security.SecureString
155+
$sqlMembershipAppServicePrincipal.Id.ToCharArray() | ForEach-Object { $sqlMembershipAppServicePrincipalObjectIDSecret.AppendChar($_) }
156+
151157
Set-AzKeyVaultSecret -VaultName $keyVault.VaultName `
152158
-Name $sqlMembershipAppServicePrincipalObjectIDKeyVaultSecretName `
153159
-SecretValue $sqlMembershipAppServicePrincipalObjectIDSecret

‎Scripts/Set-GraphCredentialsAzureADApplication.ps1‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,8 @@ function Set-GraphAppKeyVaultSecrets {
250250

251251
Write-Verbose "Graph application (client) ID is $graphAppClientId"
252252
if($SkipPrompts){
253-
$graphClientIdSecret = ConvertTo-SecureString -String $graphAppClientId -AsPlainText -Force
253+
$graphClientIdSecret = New-Object System.Security.SecureString
254+
$graphAppClientId.ToCharArray() | ForEach-Object { $graphClientIdSecret.AppendChar($_) }
254255
} else {
255256
$graphClientIdSecret = Read-Host -AsSecureString -Prompt "Please take the graph application ID from above and paste it here"
256257
}
@@ -265,7 +266,8 @@ function Set-GraphAppKeyVaultSecrets {
265266

266267
Write-Verbose "Graph application client secret is $($graphAppClientSecret.SecretText)"
267268
if($SkipPrompts){
268-
$graphClientSecret = ConvertTo-SecureString -String $graphAppClientSecret.SecretText -AsPlainText -Force
269+
$graphClientSecret = New-Object System.Security.SecureString
270+
$graphAppClientSecret.SecretText.ToCharArray() | ForEach-Object { $graphClientSecret.AppendChar($_) }
269271
} else {
270272
$graphClientSecret = Read-Host -AsSecureString -Prompt "Please take the graph application client secret from above and paste it here"
271273
}
@@ -280,7 +282,8 @@ function Set-GraphAppKeyVaultSecrets {
280282

281283
Write-Verbose "Graph application tenant id is $graphAppTenantId"
282284
if($SkipPrompts){
283-
$graphTenantSecret = ConvertTo-SecureString -String $graphAppTenantId -AsPlainText -Force
285+
$graphTenantSecret = New-Object System.Security.SecureString
286+
$graphAppTenantId.ToCharArray() | ForEach-Object { $graphTenantSecret.AppendChar($_) }
284287
} else {
285288
$graphTenantSecret = Read-Host -AsSecureString -Prompt "Please take the graph application tenant id from above and paste it here"
286289
}
@@ -305,7 +308,8 @@ function Set-GraphAppKeyVaultSecrets {
305308
if($setGraphAppCertificate){
306309
Write-Verbose "Certificate name is $CertificateName"
307310
if($SkipPrompts){
308-
$graphAppCertificateSecret = ConvertTo-SecureString -String $CertificateName -AsPlainText -Force
311+
$graphAppCertificateSecret = New-Object System.Security.SecureString
312+
$CertificateName.ToCharArray() | ForEach-Object { $graphAppCertificateSecret.AppendChar($_) }
309313
} else {
310314
$graphAppCertificateSecret = Read-Host -AsSecureString -Prompt "Please take the certificate name from above and paste it here"
311315
}

‎Service/GroupMembershipManagement/Hosts/WebApi/Scripts/Set-WebApiAzureADApplication.ps1‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,8 @@ function Set-WebAPIKeyVaultSecrets {
295295

296296
Write-Verbose "WebApi application (client) ID is $webApiAppClientId"
297297
if($SkipPrompts){
298-
$webApiClientIdSecret = ConvertTo-SecureString -String $webApiAppClientId -AsPlainText -Force
298+
$webApiClientIdSecret = New-Object System.Security.SecureString
299+
$webApiAppClientId.ToCharArray() | ForEach-Object { $webApiClientIdSecret.AppendChar($_) }
299300
} else {
300301
$webApiClientIdSecret = Read-Host -AsSecureString -Prompt "Please take the WebApi application ID from above and paste it here"
301302
}
@@ -310,7 +311,8 @@ function Set-WebAPIKeyVaultSecrets {
310311

311312
Write-Verbose "WebApi application client secret is $($webApiAppClientSecret.SecretText)"
312313
if($SkipPrompts){
313-
$webApiClientSecret = ConvertTo-SecureString -String $webApiAppClientSecret.SecretText -AsPlainText -Force
314+
$webApiClientSecret = New-Object System.Security.SecureString
315+
$webApiAppClientSecret.SecretText.ToCharArray() | ForEach-Object { $webApiClientSecret.AppendChar($_) }
314316
} else {
315317
$webApiClientSecret = Read-Host -AsSecureString -Prompt "Please take the WebApi application client secret from above and paste it here"
316318
}
@@ -325,7 +327,8 @@ function Set-WebAPIKeyVaultSecrets {
325327

326328
Write-Verbose "WebApi tenant ID is $webApiAppTenantId"
327329
if($SkipPrompts){
328-
$webApiTenantSecret = ConvertTo-SecureString -String $webApiAppTenantId -AsPlainText -Force
330+
$webApiTenantSecret = New-Object System.Security.SecureString
331+
$webApiAppTenantId.ToCharArray() | ForEach-Object { $webApiTenantSecret.AppendChar($_) }
329332
} else {
330333
$webApiTenantSecret = Read-Host -AsSecureString -Prompt "Please take the WebApi tenant ID from above and paste it here"
331334
}
@@ -352,7 +355,8 @@ function Set-WebAPIKeyVaultSecrets {
352355

353356
Write-Verbose "Certificate name is $CertificateName"
354357
if($SkipPrompts){
355-
$webApiAppCertificateSecret = ConvertTo-SecureString -String $CertificateName -AsPlainText -Force
358+
$webApiAppCertificateSecret = New-Object System.Security.SecureString
359+
$CertificateName.ToCharArray() | ForEach-Object { $webApiAppCertificateSecret.AppendChar($_) }
356360
} else {
357361
$webApiAppCertificateSecret = Read-Host -AsSecureString -Prompt "Please take the certificate name from above and paste it here"
358362
}

‎UI/Scripts/Set-UIAzureADApplication.ps1‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,8 @@ function Set-UIKeyVaultSecrets {
253253

254254
Write-Verbose "UI application (client) ID is $uiAppClientId"
255255
if($SkipPrompts) {
256-
$uiAppIdSecret = ConvertTo-SecureString -String $uiAppClientId -AsPlainText -Force
256+
$uiAppIdSecret = New-Object System.Security.SecureString
257+
$uiAppClientId.ToCharArray() | ForEach-Object { $uiAppIdSecret.AppendChar($_) }
257258
} else {
258259
$uiAppIdSecret = Read-Host -AsSecureString -Prompt "Please take the UI application ID from above and paste it here"
259260
}
@@ -268,7 +269,8 @@ function Set-UIKeyVaultSecrets {
268269

269270
Write-Verbose "UI application client secret is $($uiAppClientSecret.SecretText)"
270271
if($SkipPrompts){
271-
$uiPasswordCredentialValue = ConvertTo-SecureString -String $uiAppClientSecret.SecretText -AsPlainText -Force
272+
$uiPasswordCredentialValue = New-Object System.Security.SecureString
273+
$uiAppClientSecret.SecretText.ToCharArray() | ForEach-Object { $uiPasswordCredentialValue.AppendChar($_) }
272274
} else {
273275
$uiPasswordCredentialValue = Read-Host -AsSecureString -Prompt "Please take the UI application client secret from above and paste it here"
274276
}
@@ -283,7 +285,8 @@ function Set-UIKeyVaultSecrets {
283285

284286
Write-Verbose "UI tenant ID is $uiAppTenantId"
285287
if($SkipPrompts){
286-
$uiTenantSecret = ConvertTo-SecureString -String $uiAppTenantId -AsPlainText -Force
288+
$uiTenantSecret = New-Object System.Security.SecureString
289+
$uiAppTenantId.ToCharArray() | ForEach-Object { $uiTenantSecret.AppendChar($_) }
287290
} else {
288291
$uiTenantSecret = Read-Host -AsSecureString -Prompt "Please take the UI tenant ID from above and paste it here"
289292
}

0 commit comments

Comments
 (0)