Skip to content
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

Fix input schema validation for RebootPending resource #488

Merged
merged 11 commits into from
Sep 26, 2024
+51 −18
Merged

Fix input schema validation for RebootPending resource #488

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d96a317
Add empty input schema for RebootPending
anmenaga Jul 12, 2024
232316e
Add empty input schema for RebootPending
anmenaga Jul 12, 2024
f42dbb0
Merge branch 'issue_485' of https://github.com/anmenaga/DSC-New into …
anmenaga Jul 13, 2024
a8a25d2
updated reboot_pending.dsc.resource.json
anmenaga Jul 13, 2024
51adf7a
Add empty input schema for RebootPending
anmenaga Jul 12, 2024
7c6d12a
updated reboot_pending.dsc.resource.json
anmenaga Jul 13, 2024
b6f3150
Update reboot_pending/reboot_pending.dsc.resource.json
anmenaga Jul 16, 2024
0777706
updated pproperty to camelCasing
anmenaga Jul 16, 2024
a1cf39f
updated pproperty to camelCasing
anmenaga Jul 16, 2024
c459c9d
Merge branch 'main' into issue_485
anmenaga Sep 26, 2024
b0ffd4d
added tests for config
anmenaga Sep 26, 2024
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
updated pproperty to camelCasing
@anmenaga
anmenaga committed Jul 16, 2024
commit 0777706147bf2088a9ce37f38b0c40086118833e
4 changes: 2 additions & 2 deletions reboot_pending/reboot_pending.dsc.resource.json
View file
Original file line number Diff line number Diff line change
@@ -16,9 +16,9 @@
"schema": {
"embedded": {
"$schema": "https://json-schema.org/draft/2020-12/schema",
"type": "null",
"type": "[object, null]",
"properties": {
"RebootPending": {
"rebootPending": {
"type": "boolean"
}
}
10 changes: 5 additions & 5 deletions reboot_pending/reboot_pending.resource.ps1
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Reg keys are documented here: https://learn.microsoft.com/en-us/mem/configmgr/core/servers/deploy/install/list-of-prerequisite-checks#pending-system-restart
if (Get-ChildItem "HKLM:\Software\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootPending" -EA Ignore) { return @{ RebootPending = $true } | ConvertTo-Json -Compress }
if (Get-Item "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired" -EA Ignore) { return @{ RebootPending = $true } | ConvertTo-Json -Compress }
if (Get-ItemProperty "HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager" -Name PendingFileRenameOperations -EA Ignore) { return @{ RebootPending = $true } | ConvertTo-Json -Compress }
if (Get-ChildItem "HKLM:\Software\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootPending" -EA Ignore) { return @{ rebootPending = $true } | ConvertTo-Json -Compress }
if (Get-Item "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired" -EA Ignore) { return @{ rebootPending = $true } | ConvertTo-Json -Compress }
if (Get-ItemProperty "HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager" -Name PendingFileRenameOperations -EA Ignore) { return @{ rebootPending = $true } | ConvertTo-Json -Compress }
try {
$util = [wmiclass]"\\.\root\ccm\clientsdk:CCM_ClientUtilities"
$status = $util.DetermineIfRebootPending()
if(($status -ne $null) -and $status.RebootPending){
return @{ RebootPending = $true } | ConvertTo-Json -Compress
return @{ rebootPending = $true } | ConvertTo-Json -Compress
}
}catch{}

return @{ RebootPending = $false } | ConvertTo-Json -Compress
return @{ rebootPending = $false } | ConvertTo-Json -Compress