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.

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

Break up private functions & search menu bugfix #152

Merged
merged 73 commits into from
Jan 29, 2025
Merged
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
cc8907b
copied functions into new directory
jworkmanjc Jan 7, 2025
31b398a
Move Start Migration
jworkmanjc Jan 7, 2025
817cc8a
remove functions from start-migration
jworkmanjc Jan 7, 2025
c5db822
move form
jworkmanjc Jan 8, 2025
08ed3ff
Changes for Form
jworkmanjc Jan 8, 2025
c3236b4
move progress form
jworkmanjc Jan 8, 2025
96c5bd3
process by owner changes
jworkmanjc Jan 8, 2025
b2ef6ce
progress forms changes
jworkmanjc Jan 8, 2025
61f2c05
Assets file for forms
jworkmanjc Jan 8, 2025
51fd784
Get-ImageFromB64
jworkmanjc Jan 8, 2025
e383850
Function Names
jworkmanjc Jan 8, 2025
4df5df2
rename Build-Exe
jworkmanjc Jan 8, 2025
129ef6b
2.7.11 version + build module functions
jworkmanjc Jan 13, 2025
8d2d16a
change patch for new-admuTemplate
jworkmanjc Jan 13, 2025
70f387e
pester tests
jworkmanjc Jan 13, 2025
3595d22
CI changes for functions location
jworkmanjc Jan 13, 2025
472cd52
functions tests
jworkmanjc Jan 13, 2025
fb4aa8d
update several variable names in test /ci
jworkmanjc Jan 13, 2025
1af77a5
paths for tests
jworkmanjc Jan 13, 2025
f97c47d
update Build tests
jworkmanjc Jan 13, 2025
442a021
Update VS Settings
jworkmanjc Jan 13, 2025
471b218
paths for tests
jworkmanjc Jan 13, 2025
7a43474
Get-SID replace
jworkmanjc Jan 13, 2025
cb9d51f
migration tests paths
jworkmanjc Jan 14, 2025
b95d193
migration tests paths
jworkmanjc Jan 14, 2025
3eff0e1
remove start-jcadmu.ps1 file
jworkmanjc Jan 14, 2025
fa4de49
escape $pid
jworkmanjc Jan 14, 2025
44a9393
write out log content
jworkmanjc Jan 15, 2025
7a0a8e8
skip tests and validate log location in build runner
jworkmanjc Jan 15, 2025
0badb28
not tail log lines
jworkmanjc Jan 15, 2025
ad25854
Write-ToLog shouldn't terminate when writing an error
jworkmanjc Jan 15, 2025
2de84e1
order in error messages
jworkmanjc Jan 15, 2025
796f4de
skip functions tests + why are we using silentlyContinue?
jworkmanjc Jan 15, 2025
07c01ab
can't skip functions tests
jworkmanjc Jan 15, 2025
4c98122
write-error should be write-warnings until final throw message
jworkmanjc Jan 15, 2025
55eeade
tail and validate local users
jworkmanjc Jan 16, 2025
4bc5b90
version of artifact action
jworkmanjc Jan 16, 2025
3b96f20
add param to build [skip ci]
jworkmanjc Jan 16, 2025
f96388c
write out additional debugging
jworkmanjc Jan 16, 2025
ac80704
CUT-4541 - reinstall search/ start appx for all devices (not just win…
jworkmanjc Jan 16, 2025
cb7d1a9
fixed migration tests by importing the module instead of calling star…
jworkmanjc Jan 16, 2025
bc6033f
variable names and logging changes
jworkmanjc Jan 16, 2025
c4c5db1
set systemKey in migration tests
jworkmanjc Jan 16, 2025
ed36b4b
Variable names
jworkmanjc Jan 17, 2025
a57a074
form elements, update to xaml form for MTP selection
jworkmanjc Jan 20, 2025
c30257b
manual tests for uwp + selection form
jworkmanjc Jan 21, 2025
f1a812d
mtp selection form background + size
jworkmanjc Jan 21, 2025
200cbc2
form changes for selecting another MTP org, manual tests
jworkmanjc Jan 21, 2025
d90f04c
Form changes, test-button function updated to test various cases in h…
jworkmanjc Jan 22, 2025
6b481a8
automate tests for selection form Test-MigrationButton
jworkmanjc Jan 22, 2025
439fc7f
test the selection form in ci
jworkmanjc Jan 22, 2025
3fee339
mock names
jworkmanjc Jan 22, 2025
a79a9cb
Only show option to change ORG is MTP admin is returned
jworkmanjc Jan 24, 2025
831a247
CUT-4589 Test for selection form on non-valid SID users
jworkmanjc Jan 24, 2025
63c41b0
change placeholder text in progress form
jworkmanjc Jan 24, 2025
94732fc
update form to declare form elements before submission
jworkmanjc Jan 24, 2025
b6c41c1
Add focus controls to prevent checking the name each time a character…
jworkmanjc Jan 24, 2025
92c3034
CUT-4589 Test-LocalUsername fix
jworkmanjc Jan 24, 2025
3d7d908
resolve changes with Get-MtpOrganization tests
jworkmanjc Jan 24, 2025
639a781
skip migration tests
jworkmanjc Jan 24, 2025
86006c7
manual tests + changes to form, no default password
jworkmanjc Jan 24, 2025
adc719b
updates for local-username tests
jworkmanjc Jan 24, 2025
0a08bbe
test local username changes
jworkmanjc Jan 27, 2025
f0e0359
build date
jworkmanjc Jan 27, 2025
49bfbf6
update start-migration for Get-MtpOrganization changes
jworkmanjc Jan 27, 2025
423ac0b
Update form changes/ test-localUsername
jworkmanjc Jan 28, 2025
6dfd9af
remove throw in Test-LocalUserName, some devices might not have a use…
jworkmanjc Jan 28, 2025
774ee9a
variable name
jworkmanjc Jan 28, 2025
1792882
update test-localUsernames after user is created
jworkmanjc Jan 28, 2025
3211051
temp password should show valid when first viewing the selection form
jworkmanjc Jan 29, 2025
f6df79f
incorrectly defined manual test
jworkmanjc Jan 29, 2025
686859a
show error for username matching hostname
jworkmanjc Jan 29, 2025
f9bd1f4
space in mtp selection
jworkmanjc Jan 29, 2025
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
update several variable names in test /ci
  • Loading branch information
jworkmanjc committed Jan 13, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit fb4aa8d8c83b5f097d63bcaab8f959c8f519ea4a
14 changes: 7 additions & 7 deletions .github/workflows/admu-ci.yml
Original file line number Diff line number Diff line change
@@ -57,7 +57,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: windows-latest
timeout-minutes: 10
@@ -68,7 +68,7 @@ jobs:
uses: actions/cache@v4
with:
path: 'C:\Users\runneradmin\Documents\PowerShell\Modules\'
key: PS-Dependancies
key: PS-Dependencies
- name: Install dependencies
if: steps.cacher.outputs.cache-hit != 'true'
shell: pwsh
@@ -79,7 +79,7 @@ jobs:
Write-Host ('[status]Installing package provider NuGet');
Install-PackageProvider -Name:('NuGet') -Scope:('CurrentUser') -Force
}
# define dependancies for this ci workflow:
# define dependencies for this ci workflow:
$PSDependencies = @{
'PowerShellGet' = @{Repository = 'PSGallery'; RequiredVersion = '3.0.12-beta' }
'ps2exe' = @{Repository = 'PSGallery'; RequiredVersion = '1.0.13' }
@@ -106,15 +106,15 @@ jobs:
}
}
Build-Module:
needs: ["Setup-Build-Dependancies", "Check-PR-Labels"]
needs: ["Setup-Build-Dependencies", "Check-PR-Labels"]
runs-on: windows-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v4
- uses: actions/cache@v4
with:
path: 'C:\Users\runneradmin\Documents\PowerShell\Modules\'
key: PS-Dependancies
key: PS-Dependencies
- name: Build ADMU Module
shell: powershell
env:
@@ -135,7 +135,7 @@ jobs:
${{ github.workspace }}/Jumpcloud-ADMU/JumpCloud.ADMU.psm1
retention-days: 1
Test-Module:
needs: ["Setup-Build-Dependancies", "Check-PR-Labels", "Build-Module"]
needs: ["Setup-Build-Dependencies", "Check-PR-Labels", "Build-Module"]
runs-on: windows-latest
timeout-minutes: 75
strategy:
@@ -151,7 +151,7 @@ jobs:
- uses: actions/cache@v4
with:
path: 'C:\Users\runneradmin\Documents\PowerShell\Modules\'
key: PS-Dependancies
key: PS-Dependencies
- name: Test PWSH Module
shell: powershell
env:
10 changes: 5 additions & 5 deletions .github/workflows/admu-release.yml
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ jobs:
}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Setup-Build-Dependancies:
Setup-Build-Dependencies:
needs: ["Filter-Branch", "Check-PR-Labels"]
runs-on: windows-latest
timeout-minutes: 10
@@ -65,7 +65,7 @@ jobs:
uses: actions/cache@v4
with:
path: 'C:\Users\runneradmin\Documents\PowerShell\Modules\'
key: PS-Dependancies
key: PS-Dependencies
- name: Install dependencies
if: steps.cacher.outputs.cache-hit != 'true'
shell: pwsh
@@ -76,7 +76,7 @@ jobs:
Write-Host ('[status]Installing package provider NuGet');
Install-PackageProvider -Name:('NuGet') -Scope:('CurrentUser') -Force
}
# define dependancies for this ci workflow:
# define dependencies for this ci workflow:
$PSDependencies = @{
'PowerShellGet' = @{Repository = 'PSGallery'; RequiredVersion = '3.0.12-beta' }
'ps2exe' = @{Repository = 'PSGallery'; RequiredVersion = '1.0.13' }
@@ -104,14 +104,14 @@ jobs:
}
Build-Sign-ADMU:
runs-on: windows-latest
needs: ["Setup-Build-Dependancies", "Check-PR-Labels"]
needs: ["Setup-Build-Dependencies", "Check-PR-Labels"]
environment: Production
steps:
- uses: actions/checkout@v4
- uses: actions/cache@v4
with:
path: "/home/runner/.local/share/powershell/Modules/"
key: PS-Dependancies
key: PS-Dependencies
- name: Build ADMU Module
shell: powershell
env:
4 changes: 2 additions & 2 deletions Deploy/Get-Config.ps1
Original file line number Diff line number Diff line change
@@ -11,8 +11,8 @@ Write-Host "======= Begin Get-Config ======="
$env:ModuleVersionType = $ModuleVersionType
$env:MODULENAME = $ModuleName
# Populate variables
$ModuleFolderName = "$PSScriptroot/../JumpCloud-ADMU/"
$DEPLOYFOLDER = "$PSScriptroot"
$ModuleFolderName = "$PSScriptRoot/../JumpCloud-ADMU/"
$DEPLOYFOLDER = "$PSScriptRoot"
$RELEASETYPE = $ModuleVersionType
$GitHubWikiUrl = 'https://github.com/TheJumpCloud/jumpcloud-ADMU/wiki/'
$ScriptRoot = Switch ($env:DEPLOYFOLDER) {
4 changes: 2 additions & 2 deletions jumpcloud-ADMU/Powershell/Tests/Migration.Tests.ps1
Original file line number Diff line number Diff line change
@@ -127,7 +127,7 @@ Describe 'Migration Test Scenarios' {

# check that the FTA/PTA lists contain the $fileType and $protocol variable from the job
Context 'Start-Migration on local accounts (Test Functionallity)' {
It "username extists for testing" {
It "username exists for testing" {
foreach ($user in $userTestingHash.Values) {
$user.username | Should -Not -BeNullOrEmpty
$user.JCusername | Should -Not -BeNullOrEmpty
@@ -176,7 +176,7 @@ Describe 'Migration Test Scenarios' {
It "Test UWP_JCADMU was downloaded & exists" {
Test-Path "C:\Windows\uwp_jcadmu.exe" | Should -Be $true
}
It "Account of a prior migration can be sucessfully migrated again and not overwrite registry backup files" {
It "Account of a prior migration can be successfully migrated again and not overwrite registry backup files" {
$Password = "Temp123!"
$user1 = "ADMU_" + -join ((65..90) + (97..122) | Get-Random -Count 5 | ForEach-Object { [char]$_ })
$user2 = "ADMU_" + -join ((65..90) + (97..122) | Get-Random -Count 5 | ForEach-Object { [char]$_ })
2 changes: 1 addition & 1 deletion jumpcloud-ADMU/Powershell/Tests/SetupAgent.ps1
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ Function InitUser {
New-LocalUserProfile -username "$($UserName)" -ErrorVariable profileInit
if ($profileInit) {
Write-Log -Message:("$profileInit")
Write-Log -Message:("The user: $($UserName) could not be initalized, exiting")
Write-Log -Message:("The user: $($UserName) could not be initialized, exiting")
exit 1
}
}