c890e5b46c
Phase 5 + 6 of the gea-shopfloor-* rename.
Get-PCProfile.ps1: when the legacy profileKey ("Standard-Machine",
"CMM", etc.) is missing from siteConfig.pcProfiles, walks the alias
group and returns the first matching new key ("gea-shopfloor-collections",
"gea-shopfloor-cmm", etc.). Vice versa: a fleet PC writing the new
string finds its profile under the old key. Same alias map shape as
GE-Enforce + Install-FromManifest, kept in sync manually for now -
extract to shared file later if drift becomes a problem.
matrix.json: adds 3 new rows for gea-shopfloor-nocollections,
gea-shopfloor-common (Timeclock+Lab merge), gea-shopfloor-heattreat
(placeholder). Existing rows for legacy names retained; the new
verify-state alias resolution lets either be requested.
verify-state.ps1: Test-MatrixEntryMatches walks the alias map so
harness invocation with "Standard Machine" or "gea-shopfloor-collections"
both resolve to the same matrix row.
Smoke-tested via qga-as-SYSTEM on win11: legacy Standard/Machine,
new gea-shopfloor-collections, and new gea-shopfloor-nocollections
all return 10/10 pass against current VM state.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
112 lines
4.5 KiB
PowerShell
112 lines
4.5 KiB
PowerShell
# Get-PCProfile.ps1 - Shared helper for resolving the active PC profile
|
|
# from site-config.json. Dot-source this from any script that needs
|
|
# profile-aware configuration:
|
|
#
|
|
# . "$PSScriptRoot\lib\Get-PCProfile.ps1" (from Shopfloor\ scripts)
|
|
# . "$PSScriptRoot\Get-PCProfile.ps1" (from lib\ scripts)
|
|
#
|
|
# After dot-sourcing, these variables are available:
|
|
# $siteConfig - full parsed site-config.json (or $null)
|
|
# $pcType - from pc-type.txt (e.g. "Standard", "CMM", "Display")
|
|
# $pcSubtype - from pc-subtype.txt (e.g. "Timeclock", "Machine", "Lobby")
|
|
# $profileKey - lookup key (e.g. "Standard-Machine", "CMM", "Display-Lobby")
|
|
# $pcProfile - the matched profile object from pcProfiles, or $null
|
|
#
|
|
# Resolution order for any config key (e.g. startupItems):
|
|
# 1. $pcProfile.startupItems (profile-specific override)
|
|
# 2. $siteConfig.startupItems (site-wide default)
|
|
# 3. (hardcoded fallback in the calling script)
|
|
#
|
|
# Usage pattern in consuming scripts:
|
|
# $items = Get-ProfileValue 'startupItems'
|
|
# if ($null -ne $items) { ... } else { <hardcoded fallback> }
|
|
#
|
|
# Get-ProfileValue distinguishes "not set" ($null) from "explicitly empty"
|
|
# (@()) so a profile can opt out of a site-wide default by setting the
|
|
# key to []. Do NOT use truthiness checks like `if ($pcProfile.startupItems)`
|
|
# because an empty array is falsy and would fall through to site defaults.
|
|
|
|
function Get-ProfileValue {
|
|
param([Parameter(Mandatory)][string]$Key)
|
|
if ($pcProfile -and ($pcProfile.PSObject.Properties.Name -contains $Key)) {
|
|
return ,@($pcProfile.$Key)
|
|
}
|
|
if ($siteConfig -and ($siteConfig.PSObject.Properties.Name -contains $Key)) {
|
|
return ,@($siteConfig.$Key)
|
|
}
|
|
return $null
|
|
}
|
|
|
|
function Get-SiteConfig {
|
|
$configPath = 'C:\Enrollment\site-config.json'
|
|
if (-not (Test-Path -LiteralPath $configPath)) {
|
|
Write-Host "site-config.json not found - using defaults" -ForegroundColor DarkGray
|
|
return $null
|
|
}
|
|
try {
|
|
return (Get-Content -LiteralPath $configPath -Raw -ErrorAction Stop | ConvertFrom-Json)
|
|
} catch {
|
|
Write-Warning "Failed to parse site-config.json: $_"
|
|
return $null
|
|
}
|
|
}
|
|
|
|
$siteConfig = Get-SiteConfig
|
|
|
|
# Read PC type + sub-type from the files startnet.cmd wrote during imaging
|
|
$pcType = ''
|
|
$pcSubtype = ''
|
|
$typeFile = 'C:\Enrollment\pc-type.txt'
|
|
$subtypeFile = 'C:\Enrollment\pc-subtype.txt'
|
|
|
|
if (Test-Path -LiteralPath $typeFile) {
|
|
$pcType = (Get-Content -LiteralPath $typeFile -First 1 -ErrorAction SilentlyContinue).Trim()
|
|
}
|
|
if (Test-Path -LiteralPath $subtypeFile) {
|
|
$pcSubtype = (Get-Content -LiteralPath $subtypeFile -First 1 -ErrorAction SilentlyContinue).Trim()
|
|
}
|
|
|
|
# Build the profile key: "Standard-Machine", "CMM", "Display-Lobby", etc.
|
|
$profileKey = if ($pcSubtype) { "$pcType-$pcSubtype" } else { $pcType }
|
|
|
|
# 2026-05-03 rename: when the legacy key (e.g. "Standard-Machine") is not
|
|
# present in pcProfiles, fall through to the new gea-shopfloor-* equivalent
|
|
# (e.g. "gea-shopfloor-collections"). Vice versa: a fleet PC that already
|
|
# writes "gea-shopfloor-collections" finds its profile under either key.
|
|
$pcProfileAliasGroups = @(
|
|
@('Standard-Machine', 'gea-shopfloor-collections', 'gea-shopfloor-nocollections'),
|
|
@('Standard-Timeclock', 'gea-shopfloor-common'),
|
|
@('Lab', 'gea-shopfloor-common'),
|
|
@('CMM', 'gea-shopfloor-cmm'),
|
|
@('Keyence', 'gea-shopfloor-keyence'),
|
|
@('WaxAndTrace', 'gea-shopfloor-waxtrace'),
|
|
@('Genspect', 'gea-shopfloor-genspect'),
|
|
@('Display', 'gea-shopfloor-display'),
|
|
@('Heattreat', 'gea-shopfloor-heattreat')
|
|
)
|
|
|
|
# Look up the profile in pcProfiles. Fall back to $null (callers use
|
|
# site-wide defaults or hardcoded values).
|
|
$pcProfile = $null
|
|
if ($siteConfig -and $siteConfig.pcProfiles -and $profileKey) {
|
|
$pcProfile = $siteConfig.pcProfiles.$profileKey
|
|
if (-not $pcProfile) {
|
|
foreach ($g in $pcProfileAliasGroups) {
|
|
if ($g -icontains $profileKey) {
|
|
foreach ($alias in $g) {
|
|
if ($alias -ieq $profileKey) { continue }
|
|
$candidate = $siteConfig.pcProfiles.$alias
|
|
if ($candidate) { $pcProfile = $candidate; break }
|
|
}
|
|
break
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if ($pcProfile) {
|
|
Write-Host "PC profile: $profileKey" -ForegroundColor Cyan
|
|
} elseif ($profileKey) {
|
|
Write-Host "PC profile '$profileKey' not found in site-config.json - using site defaults" -ForegroundColor DarkGray
|
|
}
|