Merge pull request #9 from webmd-health-services/feature/prism-0.9.0

Change to the layout of internal nested dependencies.
webmd-health-services · Dec 3, 2024 · 140773f · 140773f
2 parents 4530e90 + 69e8a9b
commit 140773f
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 /.output
-/Carbon.Security/Carbon.*
-/Carbon.Security/PureInvoke
 /.vscode
+/Carbon.Security/Modules/
 /Carbon.Security/CHANGELOG.md
 /Carbon.Security/LICENSE.txt
 /Carbon.Security/NOTICE.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,13 @@
 # Carbon.Security Changelog
 
+## 1.0.3
+
+Change to the layout of internal nested dependencies.
+
 ## 1.0.2
 
+> Released 19 Nov 2024
+
 Decreasing depth of nested dependencies. Missed one.
 
 ## 1.0.1

diff --git a/Carbon.Security/Carbon.Security.psd1 b/Carbon.Security/Carbon.Security.psd1
@@ -18,7 +18,7 @@
     RootModule = 'Carbon.Security.psm1'
 
     # Version number of this module.
-    ModuleVersion = '1.0.2'
+    ModuleVersion = '1.0.3'
 
     # ID used to uniquely identify this module
     GUID = 'd957c669-307c-409a-bb28-83fb666b5c6f'

diff --git a/Carbon.Security/Carbon.Security.psm1 b/Carbon.Security/Carbon.Security.psm1
@@ -25,7 +25,7 @@ Set-StrictMode -Version 'Latest'
 # module in development has its functions in the Functions directory.
 $script:moduleRoot = $PSScriptRoot
 
-$psModulesDirPath = $script:moduleRoot
+$psModulesDirPath = Join-Path -Path $script:moduleRoot -ChildPath 'Modules' -Resolve
 Import-Module -Name (Join-Path -Path $psModulesDirPath -ChildPath 'Carbon.Core') `
               -Function @('Get-CPathProvider') `
               -Verbose:$false

diff --git a/Carbon.Security/Functions/Get-CPrivilege.ps1 b/Carbon.Security/Functions/Get-CPrivilege.ps1
@@ -7,7 +7,17 @@ function Get-CPrivilege
 
     .DESCRIPTION
     The `Get-CPrivilege` function gets an account's rights and privileges. These privileges are usually managed by Group
-    Policy and control the system operations and types of logons an account can perform.
+    Policy and control the system operations and types of logons an account can perform. Only privileges directly
+    granted to the account are returned. If an account is granted a privilege through a group, those privileges are
+    *not* returned.
+
+    [Windows privileges can be in one of three states:](https://superuser.com/a/1254265/45274)
+
+    * not granted
+    * granted and enabled
+    * granted and disabled
+
+    The `Get-CPrivilege` function returns granted privileges, regardless if they are enabled or disabled.
 
     .OUTPUTS
     System.String

diff --git a/Carbon.Security/prism.lock.json b/Carbon.Security/prism.lock.json
@@ -2,7 +2,7 @@
   "PSModules": [
     {
       "name": "Carbon.Accounts",
-      "version": "2.0.1",
+      "version": "2.0.2",
       "repositorySourceLocation": "https://www.powershellgallery.com/api/v2"
     },
     {

diff --git a/Tests/Grant-CPermission.Tests.ps1 b/Tests/Grant-CPermission.Tests.ps1
@@ -9,7 +9,7 @@ BeforeAll {
 
     & (Join-Path -Path $PSScriptRoot -ChildPath 'Initialize-Test.ps1' -Resolve)
 
-    $psModulesSharedPath = Join-Path -Path $PSScriptRoot -ChildPath '..\Carbon.Security' -Resolve
+    $psModulesSharedPath = Join-Path -Path $PSScriptRoot -ChildPath '..\Carbon.Security\Modules' -Resolve
     Import-Module -Name (Join-Path -Path $psModulesSharedPath -ChildPath 'Carbon.Core' -Resolve) `
                   -Function ('Get-CPathProvider') `
                   -Global `

diff --git a/whiskey.yml b/whiskey.yml
@@ -2,12 +2,11 @@
 Build:
 - PowerShell:
     ExceptDuring: Clean
-    ScriptBlock: prism install | Format-Table -Auto
+    ScriptBlock: |
+        prism install | Format-Table -Auto
+        prism install -Path .\Carbon.Security | Format-Table -Auto
 
-- PowerShell:
-    ExceptDuring: Clean
-    WorkingDirectory: Carbon.Security
-    ScriptBlock: prism install | Format-Table -Auto
+        Get-Module | Format-Table
 
 - Version:
     Path: Carbon.Security\Carbon.Security.psd1