Merge pull request #7 from webmd-health-services/feature/reduce-nesting

Reducing depth of nested modules.
webmd-health-services · Nov 19, 2024 · 760c462 · 760c462
2 parents ef323b7 + cef6f71
commit 760c462
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,9 @@
 /.output
-/PSModules
+/Carbon.Security/Carbon.*
+/Carbon.Security/PureInvoke
 /.vscode
 /Carbon.Security/CHANGELOG.md
 /Carbon.Security/LICENSE.txt
 /Carbon.Security/NOTICE.txt
 /Carbon.Security/README.md
-/Carbon.Security/Modules/
+/PSModules
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,13 @@
 # Carbon.Security Changelog
 
+## 1.0.1
+
+Decreasing depth of nested dependencies.
+
 ## 1.0.0
 
+> Released 10 Jun 2024
+
 ### Upgrade Instructions
 
 If switching from Carbon, the `Get-CPermission`, `Grant-CPermission`, `Revoke-CPermission`, and `Test-CPermission`

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.0'
+    ModuleVersion = '1.0.1'
 
     # 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
@@ -23,16 +23,16 @@ Set-StrictMode -Version 'Latest'
 # Functions should use $moduleRoot as the relative root from which to find
 # things. A published module has its function appended to this file, while a
 # module in development has its functions in the Functions directory.
-$moduleRoot = $PSScriptRoot
+$script:moduleRoot = $PSScriptRoot
 
-$psModulesRoot = Join-Path -Path $PSScriptRoot -ChildPath 'Modules' -Resolve
-Import-Module -Name (Join-Path -Path $psModulesRoot -ChildPath 'Carbon.Core') `
+$psModulesDirPath = $script:moduleRoot
+Import-Module -Name (Join-Path -Path $psModulesDirPath -ChildPath 'Carbon.Core') `
               -Function @('Get-CPathProvider') `
               -Verbose:$false
-Import-Module -Name (Join-Path -Path $psModulesRoot -ChildPath 'Carbon.Accounts') `
+Import-Module -Name (Join-Path -Path $psModulesDirPath -ChildPath 'Carbon.Accounts') `
               -Function @('Resolve-CIdentity', 'Resolve-CIdentityName', 'Test-CIdentity') `
               -Verbose:$false
-Import-Module -Name (Join-Path -Path $psModulesRoot -ChildPath 'PureInvoke' -Resolve) `
+Import-Module -Name (Join-Path -Path $psModulesDirPath -ChildPath 'PureInvoke' -Resolve) `
               -Function @(
                     'Invoke-AdvApiLookupPrivilegeName'
                     'Invoke-AdvApiLookupPrivilegeValue',
@@ -59,7 +59,7 @@ if (-not (Test-Path -Path 'variable:IsWindows'))
 # this file, so only dot-source files that exist on the file system. This allows
 # developers to work on a module without having to build it first. Grab all the
 # functions that are in their own files.
-$functionsPath = Join-Path -Path $moduleRoot -ChildPath 'Functions\*.ps1'
+$functionsPath = Join-Path -Path $script:moduleRoot -ChildPath 'Functions\*.ps1'
 if( (Test-Path -Path $functionsPath) )
 {
     foreach( $functionPath in (Get-Item $functionsPath) )

diff --git a/Carbon.Security/prism.json b/Carbon.Security/prism.json
@@ -1,18 +1,17 @@
 {
-	"PSModules": [
+  "PSModules": [
     {
       "Name": "Carbon.Accounts",
-      "Version": "1.*-*"
+      "Version": "1.*"
     },
     {
       "Name": "Carbon.Core",
-      "Version": "1.*-*"
+      "Version": "1.*"
     },
     {
       "Name": "PureInvoke",
-      "Version": "1.*-*"
+      "Version": "1.*",
+      "AllowPrerelease": true
     }
-	],
-
-  "PSModulesDirectoryName": "Modules"
+  ]
 }
diff --git a/Carbon.Security/prism.lock.json b/Carbon.Security/prism.lock.json
@@ -2,17 +2,17 @@
   "PSModules": [
     {
       "name": "Carbon.Accounts",
-      "version": "1.0.0-rc5",
+      "version": "1.0.0",
       "repositorySourceLocation": "https://www.powershellgallery.com/api/v2"
     },
     {
       "name": "Carbon.Core",
-      "version": "1.4.0-rc1",
+      "version": "1.4.0",
       "repositorySourceLocation": "https://www.powershellgallery.com/api/v2"
     },
     {
       "name": "PureInvoke",
-      "version": "1.0.0-rc7",
+      "version": "1.0.0-rc10",
       "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\Modules' -Resolve
+    $psModulesSharedPath = Join-Path -Path $PSScriptRoot -ChildPath '..\Carbon.Security' -Resolve
     Import-Module -Name (Join-Path -Path $psModulesSharedPath -ChildPath 'Carbon.Core' -Resolve) `
                   -Function ('Get-CPathProvider') `
                   -Global `

diff --git a/prism.lock.json b/prism.lock.json
@@ -7,7 +7,7 @@
     },
     {
       "name": "Carbon.Registry",
-      "version": "1.1.0",
+      "version": "1.2.0",
       "repositorySourceLocation": "https://www.powershellgallery.com/api/v2"
     }
   ]