From 602472fa2a205e08cf87b345544a364eea09a5dd Mon Sep 17 00:00:00 2001 From: mrohera Date: Tue, 16 Jul 2019 08:32:59 -0700 Subject: [PATCH] Fix to make sure Windows installer can setup with symmetric key provisioning mode (#1446) (#1447) The fix entails removing the "device_id" from the yaml selection regex. Device id was removed from the provisioning settings however was left behind in this install script. This issue was discovered in E2E tests as part of test coverage improvements. --- scripts/windows/setup/IotEdgeSecurityDaemon.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/windows/setup/IotEdgeSecurityDaemon.ps1 b/scripts/windows/setup/IotEdgeSecurityDaemon.ps1 index bf0d1e47c2e..2fe7628ff43 100644 --- a/scripts/windows/setup/IotEdgeSecurityDaemon.ps1 +++ b/scripts/windows/setup/IotEdgeSecurityDaemon.ps1 @@ -1557,7 +1557,7 @@ function Set-ProvisioningMode { } else { $attestationMethod = Get-DpsProvisioningSettings - $selectionRegex = '(?:[^\S\n]*#[^\S\n]*)?provisioning:\s*#?\s*source:\s*".*"\s*#?\s*global_endpoint:\s*".*"\s*#?\s*scope_id:\s*".*"\s*#?\s*attestation:\s*#?\s*method:\s*"' + $attestationMethod + '"\s*#?\s*registration_id:\s*".*"\s*#?\s*device_id:\s*".*"' + $selectionRegex = '(?:[^\S\n]*#[^\S\n]*)?provisioning:\s*#?\s*source:\s*".*"\s*#?\s*global_endpoint:\s*".*"\s*#?\s*scope_id:\s*".*"\s*#?\s*attestation:\s*#?\s*method:\s*"' + $attestationMethod + '"\s*#?\s*registration_id:\s*".*"' if ($attestationMethod -eq 'symmetric_key') { $selectionRegex += '\s*#?\s*symmetric_key:\s".*"'