Fix/export connect cmdlet (#69)

* Fix cmdlet export
cloudyspells · Dec 10, 2023 · 6d9e20a · 6d9e20a
1 parent 5df6208
commit 6d9e20a
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 41 deletions.
diff --git a/src/PSRule.Rules.AzureDevOps/PSRule.Rules.AzureDevOps.psd1 b/src/PSRule.Rules.AzureDevOps/PSRule.Rules.AzureDevOps.psd1
@@ -69,7 +69,7 @@ RequiredModules = @('PSRule')
 # NestedModules = @()
 
 # Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
-FunctionsToExport   = @('Export-AzDevOpsRuleData','*')
+FunctionsToExport   = @('Export-AzDevOpsRuleData','Export-AzDevOpsOrganizationRuleData','Connect-AzDevOps','Disconnect-AzDevOps','*')
 
 # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
 CmdletsToExport = @()

diff --git a/src/PSRule.Rules.AzureDevOps/PSRule.Rules.AzureDevOps.psm1 b/src/PSRule.Rules.AzureDevOps/PSRule.Rules.AzureDevOps.psm1
@@ -14,45 +14,6 @@ Get-ChildItem -Path "$PSScriptRoot/Functions/*.ps1" | ForEach-Object {
     . $_.FullName
 }
 
-# Define the types to export with type accelerators.
-$ExportableTypes =@(
-    [AzureDevOpsConnection]
-)
-# Get the internal TypeAccelerators class to use its static methods.
-$TypeAcceleratorsClass = [psobject].Assembly.GetType(
-    'System.Management.Automation.TypeAccelerators'
-)
-# Ensure none of the types would clobber an existing type accelerator.
-# If a type accelerator with the same name exists, throw an exception.
-$ExistingTypeAccelerators = $TypeAcceleratorsClass::Get
-foreach ($Type in $ExportableTypes) {
-    if ($Type.FullName -in $ExistingTypeAccelerators.Keys) {
-        $Message = @(
-            "Unable to register type accelerator '$($Type.FullName)'"
-            'Accelerator already exists.'
-        ) -join ' - '
-
-        throw [System.Management.Automation.ErrorRecord]::new(
-            [System.InvalidOperationException]::new($Message),
-            'TypeAcceleratorAlreadyExists',
-            [System.Management.Automation.ErrorCategory]::InvalidOperation,
-            $Type.FullName
-        )
-    }
-}
-# Add type accelerators for every exportable type.
-foreach ($Type in $ExportableTypes) {
-    $TypeAcceleratorsClass::Add($Type.FullName, $Type) | Out-Null
-}
-# Remove type accelerators when the module is removed.
-$MyInvocation.MyCommand.ScriptBlock.Module.OnRemove = {
-    foreach($Type in $ExportableTypes) {
-        $TypeAcceleratorsClass::Remove($Type.FullName) | Out-Null
-    }
-}.GetNewClosure()
-
-
-
 <#
     .SYNOPSIS
     Run all JSON export functions for Azure DevOps for analysis by PSRule
@@ -126,4 +87,41 @@ Export-ModuleMember -Function Export-AzDevOpsOrganizationRuleData
 
 Export-ModuleMember -Function Get-AzDevOpsProjects
 Export-ModuleMember -Function Connect-AzDevOps
-Export-ModuleMember -Function Disconnect-AzDevOps
+Export-ModuleMember -Function Disconnect-AzDevOps
+
+# Define the types to export with type accelerators.
+$ExportableTypes =@(
+    [AzureDevOpsConnection]
+)
+# Get the internal TypeAccelerators class to use its static methods.
+$TypeAcceleratorsClass = [psobject].Assembly.GetType(
+    'System.Management.Automation.TypeAccelerators'
+)
+# Ensure none of the types would clobber an existing type accelerator.
+# If a type accelerator with the same name exists, throw an exception.
+$ExistingTypeAccelerators = $TypeAcceleratorsClass::Get
+foreach ($Type in $ExportableTypes) {
+    if ($Type.FullName -in $ExistingTypeAccelerators.Keys) {
+        $Message = @(
+            "Unable to register type accelerator '$($Type.FullName)'"
+            'Accelerator already exists.'
+        ) -join ' - '
+
+        throw [System.Management.Automation.ErrorRecord]::new(
+            [System.InvalidOperationException]::new($Message),
+            'TypeAcceleratorAlreadyExists',
+            [System.Management.Automation.ErrorCategory]::InvalidOperation,
+            $Type.FullName
+        )
+    }
+}
+# Add type accelerators for every exportable type.
+foreach ($Type in $ExportableTypes) {
+    $TypeAcceleratorsClass::Add($Type.FullName, $Type) | Out-Null
+}
+# Remove type accelerators when the module is removed.
+$MyInvocation.MyCommand.ScriptBlock.Module.OnRemove = {
+    foreach($Type in $ExportableTypes) {
+        $TypeAcceleratorsClass::Remove($Type.FullName) | Out-Null
+    }
+}.GetNewClosure()