Cut 4960 eu tenant support

.github/workflows/powershell-module-ci.yml

@@ -64,7 +64,7 @@ jobs:
         run: |
           # validate release type variables
           $env:RELEASE_TYPE |  Should -BeIn @('major','minor','patch','manual')
-  Setup-Build-Dependancies:
+  Setup-Build-Dependencies:
     needs: ["Filter-Branch", "Check-PR-Labels", "Validate-Env-Variables"]
     runs-on: ubuntu-latest
     timeout-minutes: 10
@@ -75,7 +75,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: "/home/runner/.local/share/powershell/Modules/"
-          key: PS-Dependancies
+          key: PS-Dependencies
       - name: Install dependencies
         if: steps.cacher.outputs.cache-hit != 'true'
         shell: pwsh
@@ -98,9 +98,9 @@ jobs:
               'PlatyPS'                               = @{Repository = 'PSGallery'; RequiredVersion = '0.14.2' }
               'AWS.Tools.Common'                      = @{Repository = 'PSGallery'; RequiredVersion = '4.1.122' }
               'AWS.Tools.CodeArtifact'                = @{Repository = 'PSGallery'; RequiredVersion = '4.1.122' }
-              'JumpCloud.SDK.V1'                      = @{Repository = 'PSGallery'; RequiredVersion = 'latest'}
-              'JumpCloud.SDK.V2'                      = @{Repository = 'PSGallery'; RequiredVersion = 'latest'}
-              'JumpCloud.SDK.DirectoryInsights'       = @{Repository = 'PSGallery'; RequiredVersion = 'latest'}
+              'JumpCloud.SDK.V1'                      = @{Repository = 'PSGallery'; RequiredVersion = '0.1.1'}
+              'JumpCloud.SDK.V2'                      = @{Repository = 'PSGallery'; RequiredVersion = '0.1.1'}
+              'JumpCloud.SDK.DirectoryInsights'       = @{Repository = 'PSGallery'; RequiredVersion = '0.1.1'}
               'powershell-yaml'                       = @{Repository = 'PSGallery'; RequiredVersion = '0.4.7'}
           }
 
@@ -116,7 +116,7 @@ jobs:
           }
 
   Validate-Module:
-    needs: ["Setup-Build-Dependancies", "Check-PR-Labels"]
+    needs: ["Setup-Build-Dependencies", "Check-PR-Labels"]
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
@@ -128,14 +128,14 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: "/home/runner/.local/share/powershell/Modules/"
-          key: PS-Dependancies
+          key: PS-Dependencies
       - env:
           RELEASE_TYPE: ${{ needs.Check-PR-Labels.outputs.RELEASE_TYPE }}
         shell: pwsh
         run: |
           . "./PowerShell/JumpCloud Module/Tests/InvokePester.ps1" -ModuleValidation
   Setup-Org:
-    needs: ["Setup-Build-Dependancies", "Check-PR-Labels"]
+    needs: ["Setup-Build-Dependencies", "Check-PR-Labels"]
     runs-on: ubuntu-latest
     name: Setup Org Upload Variable Artifact
     steps:
@@ -147,7 +147,7 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: "/home/runner/.local/share/powershell/Modules/"
-          key: PS-Dependancies
+          key: PS-Dependencies
       - name: Setup Org Variables
         shell: pwsh
         env:
@@ -167,7 +167,7 @@ jobs:
           name: jumpcloud-vars
           path: /home/runner/.local/share/powershell/Modules/PesterVariables.json
   Test-Module:
-    needs: ["Setup-Build-Dependancies", "Check-PR-Labels", "Setup-Org"]
+    needs: ["Setup-Build-Dependencies", "Check-PR-Labels", "Setup-Org"]
     runs-on: ubuntu-latest
     timeout-minutes: 75
     strategy:
@@ -184,7 +184,7 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: "/home/runner/.local/share/powershell/Modules/"
-          key: PS-Dependancies
+          key: PS-Dependencies
       - uses: actions/download-artifact@v4
         with:
           name: jumpcloud-vars
@@ -194,6 +194,8 @@ jobs:
           PESTER_APIKEY: ${{ secrets.PESTER_APIKEY }}
           PESTER_ORGID: ${{ secrets.PESTER_ORGID }}
           PESTER_MSP_APIKEY: ${{ secrets.PESTER_MSP_APIKEY }}
+          PESTER_EU_APIKEY: ${{ secrets.PESTER_EU_APIKEY }}
+          PESTER_EU_ORGID: ${{ secrets.PESTER_EU_ORGID }}
         run: |
           # Setup Variables for Pester Run
           $env:job_group = ${{ matrix.job_group }}
@@ -206,7 +208,8 @@ jobs:
             }
           }
           Set-Variable -Name PesterParams_ApiKey -Value "$env:PESTER_APIKEY" -Scope Global
-
+          Set-Variable -Name PesterParams_EU_ApiKey -Value "$env:PESTER_EU_APIKEY" -Scope Global
+          Set-Variable -Name PesterParams_EU_OrgID -Value "$env:PESTER_EU_ORGID" -Scope Global
           # Import JC Module
           Import-Module "${{github.workspace}}/PowerShell/JumpCloud Module/JumpCloud.psd1"
 
@@ -216,7 +219,7 @@ jobs:
           # Invoke Pester
           . "./PowerShell/JumpCloud Module/Tests/InvokePester.ps1" -JumpCloudApiKey "$env:PESTER_APIKEY" -ExcludeTagList "ModuleValidation", "JCDeployment", "MSP", "JCModule" -IncludeTagList "*" -RequiredModulesRepo "PSGallery"
   Test-Module-MSP:
-    needs: ["Setup-Build-Dependancies", "Check-PR-Labels"]
+    needs: ["Setup-Build-Dependencies", "Check-PR-Labels"]
     runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
@@ -228,7 +231,7 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: "/home/runner/.local/share/powershell/Modules/"
-          key: PS-Dependancies
+          key: PS-Dependencies
       - shell: pwsh
         env:
           PESTER_APIKEY: ${{ secrets.PESTER_APIKEY }}

.vscode/settings.json

@@ -1,12 +1,12 @@
 {
     "cSpell.language": "en",
     "cSpell.enabled": true,
-    "cSpell.enableFiletypes": [
-    "latex",
-    "markdown",
-    "plaintext",
-    "powershell"
-    ],
+    "cSpell.enabledFileTypes": {
+        "latex": true,
+        "markdown": true,
+        "plaintext": true,
+        "powershell": true
+    },
     // todo highlight settings:
     "todohighlight.isEnable": true,
     "todohighlight.isCaseSensitive": true,
@@ -65,7 +65,25 @@
     "editor.formatOnSave": true,
     "files.trimTrailingWhitespace": true,
     // powershell settings
-    "powershell.codeFormatting.preset": "OTBS",
+	"powershell.codeFormatting.addWhitespaceAroundPipe": true,
+	"powershell.codeFormatting.alignPropertyValuePairs": true,
+	"powershell.codeFormatting.autoCorrectAliases": true,
+	"powershell.codeFormatting.avoidSemicolonsAsLineTerminators": false,
+	"powershell.codeFormatting.ignoreOneLineBlock": true,
+	"powershell.codeFormatting.newLineAfterCloseBrace": true,
+	"powershell.codeFormatting.newLineAfterOpenBrace": true,
+	"powershell.codeFormatting.openBraceOnSameLine": true,
+	"powershell.codeFormatting.pipelineIndentationStyle": "IncreaseIndentationForFirstPipeline",
+	"powershell.codeFormatting.preset": "OTBS",
+	"powershell.codeFormatting.trimWhitespaceAroundPipe": true,
+	"powershell.codeFormatting.useConstantStrings": false,
+	"powershell.codeFormatting.useCorrectCasing": true,
+	"powershell.codeFormatting.whitespaceAfterSeparator": true,
+	"powershell.codeFormatting.whitespaceAroundOperator": true,
+	"powershell.codeFormatting.whitespaceBeforeOpenBrace": true,
+	"powershell.codeFormatting.whitespaceBeforeOpenParen": true,
+	"powershell.codeFormatting.whitespaceBetweenParameters": true,
+	"powershell.codeFormatting.whitespaceInsideBrace": true,
     "powershell.scriptAnalysis.enable": true,
     "powershell.scriptAnalysis.settingsPath": "PowerShell/JumpCloud Module/Tests/ModuleValidation/PSScriptAnalyzerSettings.psd1",
 }

PowerShell/Deploy/Build-HelpFiles.ps1

@@ -1,4 +1,4 @@
-Param(
+param(
     [Parameter(Mandatory = $true, ValueFromPipelineByPropertyName = $true, HelpMessage = 'Name of module')][ValidateNotNullOrEmpty()][System.String]$ModuleName = 'JumpCloud'
     , [Parameter(Mandatory = $true, ValueFromPipelineByPropertyName = $true, HelpMessage = 'Path to module root')][ValidateNotNullOrEmpty()][System.String]$ModulePath = './PowerShell/JumpCloud Module' # $PSScriptRoot
     , [Parameter(Mandatory = $false, ValueFromPipelineByPropertyName = $true, HelpMessage = 'Which parameter set to be used for New-MarkdownHelp')][ValidateNotNullOrEmpty()][ValidateSet('FromCommand', 'FromModule')][System.String]$NewMarkdownHelpParamSet = 'FromCommand'
@@ -61,7 +61,7 @@ $FolderPath_Docs = "$ModulePath/Docs"
 $FolderPath_enUS = "$ModulePath/$Locale"
 $FilePath_ModulePagePath = "$FolderPath_Docs/$ModuleName.md"
 Write-Host ("[status]Creating/Updating help files")
-Try {
+try {
     Write-Host ("[status]Installing module: PlatyPS")
     Install-Module -Repository:('PSGallery') -Name:('PlatyPS') -Force
     # Import module
@@ -74,7 +74,7 @@ Try {
     #########################################################
     ############### Adding Comment based help ###############
     #########################################################
-    If ($AddCommentBasedHelp) {
+    if ($AddCommentBasedHelp) {
         $FolderPath_Public = "$ModulePath/Public"
         # Move the help contents from docs files to ps1 files
         $DocFiles = Get-ChildItem $FolderPath_Docs
@@ -88,15 +88,15 @@ Try {
                     $description = ".Description`r`n" + ($help.description.text).Trim()
                     $examples = $help.examples.example | ForEach-Object {
                         $Example = $_
-                        $ExampleCode = If ($Example.code -like '*C:\>*') {
+                        $ExampleCode = if ($Example.code -like '*C:\>*') {
                             ($Example.code).split(">")[1]
-                        } Else {
+                        } else {
                             $Example.code
                         }
                         (".Example`r`n" + ($ExampleCode).Trim() + "`r`n`r`n" + ($Example.remarks.text).Trim())
                     }
-                    $notes = If ($help.alertSet.alert.text) { ".Notes`r`n" + ($help.alertSet.alert.text).Trim() }
-                    $link = If ($help.relatedLinks.navigationLink.uri) { ".Link`r`n" + ($help.relatedLinks.navigationLink.uri).Trim() }
+                    $notes = if ($help.alertSet.alert.text) { ".Notes`r`n" + ($help.alertSet.alert.text).Trim() }
+                    $link = if ($help.relatedLinks.navigationLink.uri) { ".Link`r`n" + ($help.relatedLinks.navigationLink.uri).Trim() }
                     Set-Content $file.FullName -Value "<#", $synopsis, $description, $examples, $notes, $link, "#>"
                     Add-Content $file.FullName -Value $content
                 }
@@ -110,16 +110,16 @@ Try {
     #########################################################
     #########################################################
     # If not exist create: .\Docs\about_$ModuleName.md
-    If (-not (Test-Path -Path:("$($FolderPath_Docs)/about_$($ModuleName).md"))) {
+    if (-not (Test-Path -Path:("$($FolderPath_Docs)/about_$($ModuleName).md"))) {
         Write-Host ("[status]Creating New-MarkdownAboutHelp")
         New-MarkdownAboutHelp -OutputFolder:($FolderPath_Docs) -AboutName:($ModuleName)
     }
     # Creating help files: .\Docs\*.md
     Write-Host ("[status]Creating help files: .\Docs\*.md")
-    Switch ($NewMarkdownHelpParamSet) {
+    switch ($NewMarkdownHelpParamSet) {
         'FromCommand' {
             $Psd1.FunctionsToExport | ForEach-Object {
-                If (-not (Test-Path -Path:("$($FolderPath_Docs)/$($_).md"))) {
+                if (-not (Test-Path -Path:("$($FolderPath_Docs)/$($_).md"))) {
                     $parameters = @{
                         Command               = $_
                         Force                 = $true
@@ -133,6 +133,7 @@ Try {
                         # Session               = '<PSSession>'
                         # Metadata              = '<Hashtable>'
                     }
+                    Write-Host ("[status]Creating help file for command: $($_)")
                     New-MarkdownHelp @parameters
                 }
             }
@@ -155,9 +156,10 @@ Try {
                 # Session               = '<PSSession>'
                 # Metadata              = '<Hashtable>'
             }
+            Write-Host ("[status]Creating help file for command: $($_)")
             New-MarkdownHelp @parameters
         }
-        Default {
+        default {
             Write-Error ("Unknown `$NewMarkdownHelpParamSet value: $NewMarkdownHelpParamSet")
         }
     }
@@ -171,13 +173,15 @@ Try {
         UpdateInputOutput     = $true
         Force                 = $true
         ExcludeDontShow       = $true
-        # LogPath               = "$FolderPath_Docs\PlatyPS.log"
-        # LogAppend             = $true
+        LogPath               = "$FolderPath_Docs\PlatyPS.log"
+        LogAppend             = $true
         # Encoding              = '<Encoding>'
         # Session               = '<PSSession>'
     }
+    Write-Host ("[status]Updating help files: .\Docs\*.md")
     Update-MarkdownHelpModule @parameters
     # Manually updating specific feilds within JumpCloud.md
+    Write-Host ("[status]Updating JumpCloud.md")
     $ModulePageContent = Get-Content -Path:($FilePath_ModulePagePath) -Raw
     $ModulePageContent = $ModulePageContent.Replace("`r", '')
     $ModulePageContent = $ModulePageContent.Replace("## Description`n{{ Fill in the Description }}", "## Description`n$($Psd1.Description)")
@@ -223,7 +227,7 @@ Try {
     (Get-Content -Path "$FolderPath_enUS/$ModuleName-help.xml" -Raw).Replace($ProgressActionXML1, '') | Set-Content "$FolderPath_enUS/$ModuleName-help.xml"
     (Get-Content -Path "$FolderPath_enUS/$ModuleName-help.xml" -Raw).Replace($ProgressActionXML2, '') | Set-Content "$FolderPath_enUS/$ModuleName-help.xml"
 
-} Catch {
+} catch {
     Write-Error ($_)
 }
 

PowerShell/Deploy/SdkSync/jcapiToSupportSync.ps1

@@ -113,10 +113,10 @@ $PSD1_Module = Test-ModuleManifest -Path:("$FilePath_psd1")
 
 Get-Module -Refresh -ListAvailable -All | Out-Null
 $Modules = Get-Module -Name:($Psd1.RequiredModules | Where-Object { $_ -in $ApprovedFunctions.Keys })
-If (-not [System.String]::IsNullOrEmpty($Modules)) {
-    ForEach ($Module In $Modules) {
+if (-not [System.String]::IsNullOrEmpty($Modules)) {
+    foreach ($Module in $Modules) {
         $ModuleName = $Module.Name
-        ForEach ($Function In $ApprovedFunctions.$ModuleName) {
+        foreach ($Function in $ApprovedFunctions.$ModuleName) {
             $FunctionName = $Function.Name
             $FunctionDestination = $Function.Destination
             $OutputPath = Join-Path -Path $JumpCloudModulePath -ChildPath $FunctionDestination #"$JumpCloudModulePath/$FunctionDestination"
@@ -128,7 +128,7 @@ If (-not [System.String]::IsNullOrEmpty($Modules)) {
                 # Get content from sdk function
                 $CommandFilePath = $individualCommand.ScriptBlock.File
                 $CommandFilePathContent = Get-Content -Path:($CommandFilePath) -Raw
-                $FunctionContent = If ($CommandFilePath -like '*ProxyCmdletDefinitions.ps1') {
+                $FunctionContent = if ($CommandFilePath -like '*ProxyCmdletDefinitions.ps1') {
                     <# When the autorest generated module has been installed and imported from the PSGallery all the
                     cmdlets will exist in a single ProxyCmdletDefinitions.ps1 file. We need to parse
                     out the specific function in order to gather the parts we need to copy over. #>
@@ -140,15 +140,15 @@ If (-not [System.String]::IsNullOrEmpty($Modules)) {
                             $functionSplit
                         }
                     }
-                } Else {
+                } else {
                     <# When the autorest generated module has been imported from a local psd1 module the function will
                     remain in their individual files. #>
                     $CommandFilePathContent
                 }
                 # Extract the sections we want to copy over to our new function.
                 $PSScriptInfo = ($FunctionContent | Select-String -Pattern:([regex]'(?s)(<#)(.*?)(#>)')).Matches.Value
                 $Params = $FunctionContent | Select-String -Pattern:([regex]'(?s)(    \[Parameter)(.*?)(\})') -AllMatches
-                $ParameterContent = ($Params.Matches.Value | Where-Object { $_ -notlike '*DontShow*' -and $_ -notlike '${Limit}' -and $_ -notlike '*${Skip}*' })
+                $ParameterContent = ($Params.Matches.Value | Where-Object { $_ -notlike '*DontShow*' -and $_ -notlike '${Limit}' -and $_ -notlike '*${Skip}*' -and $_ -notlike '*${apiHost}*' -and $_ -notlike '*${consoleHost}*' })
 
                 # Check if there is only one parameter
                 if ($ParameterContent -is [string]) {
@@ -166,7 +166,7 @@ If (-not [System.String]::IsNullOrEmpty($Modules)) {
                 # declare param here string
                 $paramString = @"
 "@
-                ForEach ($line in $($ParameterContent -split "`n")) {
+                foreach ($line in $($ParameterContent -split "`n")) {
                     # for the last item don't add a new line:
                     if ($line -eq $($ParameterContent -split "`n")[-1] ) {
                         $line = $line -replace '(^\s+|\s+$)', ''
@@ -183,7 +183,7 @@ If (-not [System.String]::IsNullOrEmpty($Modules)) {
                 }
                 $OutputType = (($FunctionContent | Select-String -Pattern:([regex]'(\[OutputType)(.*?)(\]\s+)')).Matches.Value).TrimEnd()
                 $CmdletBinding = (($FunctionContent | Select-String -Pattern:([regex]'(\[CmdletBinding)(.*?)(\]\s+)')).Matches.Value).TrimEnd()
-                If (-not [System.String]::IsNullOrEmpty($PSScriptInfo)) {
+                if (-not [System.String]::IsNullOrEmpty($PSScriptInfo)) {
                     $PSScriptInfo = $PSScriptInfo.Replace($SdkPrefix, $JumpCloudModulePrefix)
                     $PSScriptInfo = $PSScriptInfo.Replace("$NewCommandName.md", "$FunctionName.md")
                 }
@@ -226,21 +226,21 @@ $paramString
                 $NewScript | Out-File -FilePath:($OutputFilePath) -Force
                 # Validate script syntax
                 $ScriptAnalyzerResult = Invoke-ScriptAnalyzer -Path:($OutputFilePath) -Recurse -ExcludeRule PSShouldProcess, PSAvoidTrailingWhitespace, PSAvoidUsingWMICmdlet, PSAvoidUsingPlainTextForPassword, PSAvoidUsingUsernameAndPasswordParams, PSAvoidUsingInvokeExpression, PSUseDeclaredVarsMoreThanAssignments, PSUseSingularNouns, PSAvoidGlobalVars, PSUseShouldProcessForStateChangingFunctions, PSAvoidUsingWriteHost, PSAvoidUsingPositionalParameters
-                If ($ScriptAnalyzerResult) {
+                if ($ScriptAnalyzerResult) {
                     $ScriptAnalyzerResults += $ScriptAnalyzerResult
                 }
 
                 # Copy tests?
                 # Copy-Item -Path:($AutoRest_Tests) -Destination:($JCModule_Tests) -Force
                 # Update .Psd1 file
-                If ($NewCommandName -notin $PSD1_Module.ExportedFunctions.keys) {
+                if ($NewCommandName -notin $PSD1_Module.ExportedFunctions.keys) {
                     $Psd1.FunctionsToExport += $NewCommandName
                     Update-ModuleManifest -Path:($FilePath_psd1) -FunctionsToExport:($Psd1.FunctionsToExport)
                 }
 
             }
         }
     }
-} Else {
+} else {
     Write-Error ('No modules found!')
 }

PowerShell/JumpCloud Module/.gitignore

@@ -1 +1,2 @@
-Tests/*-TestResults.xml
+Tests/*-TestResults.xml
+PlatyPS.log

PowerShell/JumpCloud Module/Docs/Connect-JCOnline.md

@@ -70,7 +70,7 @@ Specific to JumpCloud development team to connect to staging dev environment.
 Type: System.String
 Parameter Sets: (All)
 Aliases:
-Accepted values: production, staging
+Accepted values: STANDARD, staging, EU
 
 Required: False
 Position: 3

PowerShell/JumpCloud Module/Docs/Get-JCCommand.md

@@ -188,7 +188,7 @@ Allows you to return select properties on JumpCloud user objects. Specifying wha
 Type: System.String[]
 Parameter Sets: SearchFilter
 Aliases:
-Accepted values: command, name, launchType, commandType, trigger, scheduleRepeatType, listensTo, organization, commandRunners, schedule, shell, timeout, sudo, template, scheduleYear, timeToLiveSeconds, files, user, systems, description, filesS3
+Accepted values: aiGenerated, command, name, launchType, commandType, trigger, scheduleRepeatType, listensTo, organization, commandRunners, schedule, shell, timeout, sudo, template, scheduleYear, timeToLiveSeconds, files, user, systems, description, filesS3
 
 Required: False
 Position: Named