From 2d4adb1f72c89bfdb8af5c7e0bf69666049ff30e Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Sun, 30 Jun 2024 21:31:50 +0200 Subject: [PATCH 01/10] Add nightly run workflow --- .github/workflows/Nightly-Run.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/workflows/Nightly-Run.yml diff --git a/.github/workflows/Nightly-Run.yml b/.github/workflows/Nightly-Run.yml new file mode 100644 index 000000000..e131216bb --- /dev/null +++ b/.github/workflows/Nightly-Run.yml @@ -0,0 +1,11 @@ +name: Nightly run + +on: + workflow_dispatch: + schedule: + - cron: '0 0 * * *' + +jobs: + Process-PSModule: + uses: PSModule/Process-PSModule/.github/workflows/workflow.yml@v1 + secrets: inherit From 690fc709c6228fcff9daac16441c927bf10acfdf Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Sun, 30 Jun 2024 21:32:06 +0200 Subject: [PATCH 02/10] Add path filter to Process-PSModule --- .github/workflows/Process-PSModule.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/Process-PSModule.yml b/.github/workflows/Process-PSModule.yml index 22aef7c0c..467871e49 100644 --- a/.github/workflows/Process-PSModule.yml +++ b/.github/workflows/Process-PSModule.yml @@ -6,6 +6,10 @@ on: pull_request: branches: - main + paths: + - .github/workflows/Process-PSModule.yml + - src/** + - tests/** types: - closed - opened From e8355e28e124fa8b7ee47030556ae23d4aadb1db Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Sun, 30 Jun 2024 22:21:35 +0200 Subject: [PATCH 03/10] Add permissions --- .github/workflows/Nightly-Run.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/Nightly-Run.yml b/.github/workflows/Nightly-Run.yml index e131216bb..8c86f0176 100644 --- a/.github/workflows/Nightly-Run.yml +++ b/.github/workflows/Nightly-Run.yml @@ -5,6 +5,10 @@ on: schedule: - cron: '0 0 * * *' +permissions: + contents: read + issues: write + jobs: Process-PSModule: uses: PSModule/Process-PSModule/.github/workflows/workflow.yml@v1 From 05e78acc10fc7ab45c5b45ee8c9c2811f4a39c08 Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Mon, 1 Jul 2024 00:03:37 +0200 Subject: [PATCH 04/10] fix --- .github/workflows/Nightly-Run.yml | 4 +++- .github/workflows/Process-PSModule.yml | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Nightly-Run.yml b/.github/workflows/Nightly-Run.yml index 8c86f0176..f220edb38 100644 --- a/.github/workflows/Nightly-Run.yml +++ b/.github/workflows/Nightly-Run.yml @@ -6,8 +6,10 @@ on: - cron: '0 0 * * *' permissions: - contents: read + contents: write issues: write + pull-requests: write + statuses: write jobs: Process-PSModule: diff --git a/.github/workflows/Process-PSModule.yml b/.github/workflows/Process-PSModule.yml index 467871e49..22aef7c0c 100644 --- a/.github/workflows/Process-PSModule.yml +++ b/.github/workflows/Process-PSModule.yml @@ -6,10 +6,6 @@ on: pull_request: branches: - main - paths: - - .github/workflows/Process-PSModule.yml - - src/** - - tests/** types: - closed - opened From 62a5addc54fef6f0924d3fd9d718f405754a0889 Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Mon, 1 Jul 2024 21:01:07 +0200 Subject: [PATCH 05/10] Pester issue --- src/public/Actions/Enable-GitHubWorkflow.ps1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/public/Actions/Enable-GitHubWorkflow.ps1 b/src/public/Actions/Enable-GitHubWorkflow.ps1 index 59e59c9e5..9a577fe53 100644 --- a/src/public/Actions/Enable-GitHubWorkflow.ps1 +++ b/src/public/Actions/Enable-GitHubWorkflow.ps1 @@ -23,6 +23,5 @@ Method = 'PUT' } - Invoke-GitHubAPI @inputObject | Out-Null - + $null = Invoke-GitHubAPI @inputObject } From a6d0aa294bafc48e796aac64156c63f71bdb4f34 Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Mon, 1 Jul 2024 21:17:08 +0200 Subject: [PATCH 06/10] Process { -> process { --- src/private/Gitignore/Get-GitHubGitignoreByName.ps1 | 2 +- src/private/License/Get-GitHubLicenseByName.ps1 | 2 +- src/private/License/Get-GitHubRepositoryLicense.ps1 | 2 +- .../Repositories/Repositories/New-GitHubRepositoryOrg.ps1 | 2 +- .../Repositories/Repositories/New-GitHubRepositoryUser.ps1 | 2 +- src/public/Gitignore/Get-GitHubGitignore.ps1 | 2 +- src/public/License/Get-GitHubLicense.ps1 | 2 +- src/public/Repositories/Repositories/Get-GitHubRepository.ps1 | 2 +- src/public/Repositories/Repositories/New-GitHubRepository.ps1 | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/private/Gitignore/Get-GitHubGitignoreByName.ps1 b/src/private/Gitignore/Get-GitHubGitignoreByName.ps1 index f4259c994..76d7c2194 100644 --- a/src/private/Gitignore/Get-GitHubGitignoreByName.ps1 +++ b/src/private/Gitignore/Get-GitHubGitignoreByName.ps1 @@ -23,7 +23,7 @@ filter Get-GitHubGitignoreByName { [string] $Name ) - Process { + process { $inputObject = @{ APIEndpoint = "/gitignore/templates/$Name" Accept = 'application/vnd.github.raw+json' diff --git a/src/private/License/Get-GitHubLicenseByName.ps1 b/src/private/License/Get-GitHubLicenseByName.ps1 index 77afc3d7a..b091d7219 100644 --- a/src/private/License/Get-GitHubLicenseByName.ps1 +++ b/src/private/License/Get-GitHubLicenseByName.ps1 @@ -26,7 +26,7 @@ filter Get-GitHubLicenseByName { [string] $Name ) - Process { + process { $inputObject = @{ APIEndpoint = "/licenses/$Name" Accept = 'application/vnd.github+json' diff --git a/src/private/License/Get-GitHubRepositoryLicense.ps1 b/src/private/License/Get-GitHubRepositoryLicense.ps1 index 403c62a8f..b3db1c4c2 100644 --- a/src/private/License/Get-GitHubRepositoryLicense.ps1 +++ b/src/private/License/Get-GitHubRepositoryLicense.ps1 @@ -29,7 +29,7 @@ filter Get-GitHubRepositoryLicense { [string] $Repo = (Get-GitHubConfig -Name Repo) ) - Process { + process { $inputObject = @{ APIEndpoint = "/repos/$Owner/$Repo/license" Accept = 'application/vnd.github+json' diff --git a/src/private/Repositories/Repositories/New-GitHubRepositoryOrg.ps1 b/src/private/Repositories/Repositories/New-GitHubRepositoryOrg.ps1 index cbdcd6da7..3ba53ef89 100644 --- a/src/private/Repositories/Repositories/New-GitHubRepositoryOrg.ps1 +++ b/src/private/Repositories/Repositories/New-GitHubRepositoryOrg.ps1 @@ -211,7 +211,7 @@ filter New-GitHubRepositoryOrg { $LicenseTemplate = $PSBoundParameters['LicenseTemplate'] } - Process { + process { $PSCmdlet.MyInvocation.MyCommand.Parameters.GetEnumerator() | ForEach-Object { $paramName = $_.Key $paramDefaultValue = Get-Variable -Name $paramName -ValueOnly -ErrorAction SilentlyContinue diff --git a/src/private/Repositories/Repositories/New-GitHubRepositoryUser.ps1 b/src/private/Repositories/Repositories/New-GitHubRepositoryUser.ps1 index ac4c95763..6dd4d27fd 100644 --- a/src/private/Repositories/Repositories/New-GitHubRepositoryUser.ps1 +++ b/src/private/Repositories/Repositories/New-GitHubRepositoryUser.ps1 @@ -205,7 +205,7 @@ filter New-GitHubRepositoryUser { $LicenseTemplate = $PSBoundParameters['LicenseTemplate'] } - Process { + process { $PSCmdlet.MyInvocation.MyCommand.Parameters.GetEnumerator() | ForEach-Object { $paramName = $_.Key diff --git a/src/public/Gitignore/Get-GitHubGitignore.ps1 b/src/public/Gitignore/Get-GitHubGitignore.ps1 index 2b1effd7e..cc4edf2ea 100644 --- a/src/public/Gitignore/Get-GitHubGitignore.ps1 +++ b/src/public/Gitignore/Get-GitHubGitignore.ps1 @@ -43,7 +43,7 @@ filter Get-GitHubGitignore { return $DynamicParamDictionary } - Process { + process { $Name = $PSBoundParameters['Name'] switch ($PSCmdlet.ParameterSetName) { 'List' { diff --git a/src/public/License/Get-GitHubLicense.ps1 b/src/public/License/Get-GitHubLicense.ps1 index a1e28880f..6992f5b7d 100644 --- a/src/public/License/Get-GitHubLicense.ps1 +++ b/src/public/License/Get-GitHubLicense.ps1 @@ -61,7 +61,7 @@ filter Get-GitHubLicense { return $DynamicParamDictionary } - Process { + process { $Name = $PSBoundParameters['Name'] switch ($PSCmdlet.ParameterSetName) { 'List' { diff --git a/src/public/Repositories/Repositories/Get-GitHubRepository.ps1 b/src/public/Repositories/Repositories/Get-GitHubRepository.ps1 index 0863db475..24c2f8ac2 100644 --- a/src/public/Repositories/Repositories/Get-GitHubRepository.ps1 +++ b/src/public/Repositories/Repositories/Get-GitHubRepository.ps1 @@ -161,7 +161,7 @@ filter Get-GitHubRepository { $Type = $PSBoundParameters['Type'] } - Process { + process { switch ($PSCmdlet.ParameterSetName) { 'MyRepos_Type' { $params = @{ diff --git a/src/public/Repositories/Repositories/New-GitHubRepository.ps1 b/src/public/Repositories/Repositories/New-GitHubRepository.ps1 index 40da1d11a..e0bb88a9a 100644 --- a/src/public/Repositories/Repositories/New-GitHubRepository.ps1 +++ b/src/public/Repositories/Repositories/New-GitHubRepository.ps1 @@ -327,7 +327,7 @@ filter New-GitHubRepository { $LicenseTemplate = $PSBoundParameters['LicenseTemplate'] } - Process { + process { if ($PSCmdlet.ParameterSetName -in 'user', 'org') { $params = @{ Owner = $Owner From 1dff31739052079086970ef09188c4a1c8caa123 Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Mon, 1 Jul 2024 22:19:34 +0200 Subject: [PATCH 07/10] DynamicParam -> dynamicparam --- .../Repositories/Repositories/New-GitHubRepositoryOrg.ps1 | 2 +- .../Repositories/Repositories/New-GitHubRepositoryUser.ps1 | 2 +- src/public/Gitignore/Get-GitHubGitignore.ps1 | 2 +- src/public/License/Get-GitHubLicense.ps1 | 2 +- src/public/Repositories/Repositories/Get-GitHubRepository.ps1 | 2 +- src/public/Repositories/Repositories/New-GitHubRepository.ps1 | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/private/Repositories/Repositories/New-GitHubRepositoryOrg.ps1 b/src/private/Repositories/Repositories/New-GitHubRepositoryOrg.ps1 index 3ba53ef89..e3e71f67d 100644 --- a/src/private/Repositories/Repositories/New-GitHubRepositoryOrg.ps1 +++ b/src/private/Repositories/Repositories/New-GitHubRepositoryOrg.ps1 @@ -182,7 +182,7 @@ filter New-GitHubRepositoryOrg { [string] $MergeCommitMessage ) - DynamicParam { + dynamicparam { $DynamicParamDictionary = New-DynamicParamDictionary $dynParam = @{ diff --git a/src/private/Repositories/Repositories/New-GitHubRepositoryUser.ps1 b/src/private/Repositories/Repositories/New-GitHubRepositoryUser.ps1 index 6dd4d27fd..da8f77c55 100644 --- a/src/private/Repositories/Repositories/New-GitHubRepositoryUser.ps1 +++ b/src/private/Repositories/Repositories/New-GitHubRepositoryUser.ps1 @@ -176,7 +176,7 @@ filter New-GitHubRepositoryUser { [string] $MergeCommitMessage ) - DynamicParam { + dynamicparam { $DynamicParamDictionary = New-DynamicParamDictionary $dynParam = @{ diff --git a/src/public/Gitignore/Get-GitHubGitignore.ps1 b/src/public/Gitignore/Get-GitHubGitignore.ps1 index cc4edf2ea..8d04f9664 100644 --- a/src/public/Gitignore/Get-GitHubGitignore.ps1 +++ b/src/public/Gitignore/Get-GitHubGitignore.ps1 @@ -27,7 +27,7 @@ filter Get-GitHubGitignore { [CmdletBinding(DefaultParameterSetName = 'List')] param () - DynamicParam { + dynamicparam { $DynamicParamDictionary = New-DynamicParamDictionary $dynParam = @{ diff --git a/src/public/License/Get-GitHubLicense.ps1 b/src/public/License/Get-GitHubLicense.ps1 index 6992f5b7d..a27207286 100644 --- a/src/public/License/Get-GitHubLicense.ps1 +++ b/src/public/License/Get-GitHubLicense.ps1 @@ -45,7 +45,7 @@ filter Get-GitHubLicense { [string] $Repo = (Get-GitHubConfig -Name Repo) ) - DynamicParam { + dynamicparam { $DynamicParamDictionary = New-DynamicParamDictionary $dynParam = @{ diff --git a/src/public/Repositories/Repositories/Get-GitHubRepository.ps1 b/src/public/Repositories/Repositories/Get-GitHubRepository.ps1 index 24c2f8ac2..81e721b35 100644 --- a/src/public/Repositories/Repositories/Get-GitHubRepository.ps1 +++ b/src/public/Repositories/Repositories/Get-GitHubRepository.ps1 @@ -126,7 +126,7 @@ filter Get-GitHubRepository { ) - DynamicParam { + dynamicparam { $DynamicParamDictionary = New-DynamicParamDictionary if ($PSCmdlet.ParameterSetName -in 'MyRepos_Type', 'ListByOrg', 'ListByUser') { diff --git a/src/public/Repositories/Repositories/New-GitHubRepository.ps1 b/src/public/Repositories/Repositories/New-GitHubRepository.ps1 index e0bb88a9a..55d5817c4 100644 --- a/src/public/Repositories/Repositories/New-GitHubRepository.ps1 +++ b/src/public/Repositories/Repositories/New-GitHubRepository.ps1 @@ -298,7 +298,7 @@ filter New-GitHubRepository { [string] $MergeCommitMessage ) - DynamicParam { + dynamicparam { $DynamicParamDictionary = New-DynamicParamDictionary $dynParam = @{ From a8bf985825718f7364f52217f2692f3d38c88c31 Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Mon, 1 Jul 2024 22:43:24 +0200 Subject: [PATCH 08/10] Begin to begin --- src/public/Repositories/Repositories/Get-GitHubRepository.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/public/Repositories/Repositories/Get-GitHubRepository.ps1 b/src/public/Repositories/Repositories/Get-GitHubRepository.ps1 index 81e721b35..a8c77b765 100644 --- a/src/public/Repositories/Repositories/Get-GitHubRepository.ps1 +++ b/src/public/Repositories/Repositories/Get-GitHubRepository.ps1 @@ -157,7 +157,7 @@ filter Get-GitHubRepository { return $DynamicParamDictionary } - Begin { + begin { $Type = $PSBoundParameters['Type'] } From f4e9c093f4da95a8f3836f5674d25e67026182ef Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Mon, 8 Jul 2024 20:03:01 +0200 Subject: [PATCH 09/10] Skip copy paste detection in linter --- .github/workflows/Linter.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Linter.yml b/.github/workflows/Linter.yml index 5c9f300c3..52daecd5a 100644 --- a/.github/workflows/Linter.yml +++ b/.github/workflows/Linter.yml @@ -27,3 +27,4 @@ jobs: uses: super-linter/super-linter@latest env: GITHUB_TOKEN: ${{ github.token }} + VALIDATE_JSCPD: false From df04543b16873869152751a463c28360d8524621 Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Mon, 8 Jul 2024 20:24:25 +0200 Subject: [PATCH 10/10] Substitute ternary with if/else --- .../Repositories/New-GitHubRepositoryOrg.ps1 | 22 ++++---- .../Repositories/New-GitHubRepositoryUser.ps1 | 22 ++++---- .../Hashtable/ConvertTo-HashTable.ps1 | 2 +- src/public/Auth/Connect-GitHubAccount.ps1 | 2 +- .../Releases/Releases/Set-GitHubRelease.ps1 | 4 +- .../Repositories/Update-GitHubRepository.ps1 | 50 +++++++++++-------- 6 files changed, 54 insertions(+), 48 deletions(-) diff --git a/src/private/Repositories/Repositories/New-GitHubRepositoryOrg.ps1 b/src/private/Repositories/Repositories/New-GitHubRepositoryOrg.ps1 index e3e71f67d..e57659948 100644 --- a/src/private/Repositories/Repositories/New-GitHubRepositoryOrg.ps1 +++ b/src/private/Repositories/Repositories/New-GitHubRepositoryOrg.ps1 @@ -231,17 +231,17 @@ filter New-GitHubRepositoryOrg { Remove-HashtableEntry -Hashtable $body -RemoveNames 'Owner' -RemoveTypes 'SwitchParameter' $body['private'] = $Visibility -eq 'private' - $body['has_issues'] = $HasIssues.IsPresent ? $HasIssues : $false - $body['has_wiki'] = $HasWiki.IsPresent ? $HasWiki : $false - $body['has_projects'] = $HasProjects.IsPresent ? $HasProjects : $false - $body['has_downloads'] = $HasDownloads.IsPresent ? $HasDownloads : $false - $body['is_template'] = $IsTemplate.IsPresent ? $IsTemplate : $false - $body['auto_init'] = $AutoInit.IsPresent ? $AutoInit : $false - $body['allow_squash_merge'] = $AllowSquashMerge.IsPresent ? $AllowSquashMerge : $false - $body['allow_merge_commit'] = $AllowMergeCommit.IsPresent ? $AllowMergeCommit : $false - $body['allow_rebase_merge'] = $AllowRebaseMerge.IsPresent ? $AllowRebaseMerge : $false - $body['allow_auto_merge'] = $AllowAutoMerge.IsPresent ? $AllowAutoMerge : $false - $body['delete_branch_on_merge'] = $DeleteBranchOnMerge.IsPresent ? $DeleteBranchOnMerge : $false + $body['has_issues'] = if ($HasIssues.IsPresent) { $HasIssues } else { $false } + $body['has_wiki'] = if ($HasWiki.IsPresent) { $HasWiki } else { $false } + $body['has_projects'] = if ($HasProjects.IsPresent) { $HasProjects } else { $false } + $body['has_downloads'] = if ($HasDownloads.IsPresent) { $HasDownloads } else { $false } + $body['is_template'] = if ($IsTemplate.IsPresent) { $IsTemplate } else { $false } + $body['auto_init'] = if ($AutoInit.IsPresent) { $AutoInit } else { $false } + $body['allow_squash_merge'] = if ($AllowSquashMerge.IsPresent) { $AllowSquashMerge } else { $false } + $body['allow_merge_commit'] = if ($AllowMergeCommit.IsPresent) { $AllowMergeCommit } else { $false } + $body['allow_rebase_merge'] = if ($AllowRebaseMerge.IsPresent) { $AllowRebaseMerge } else { $false } + $body['allow_auto_merge'] = if ($AllowAutoMerge.IsPresent) { $AllowAutoMerge } else { $false } + $body['delete_branch_on_merge'] = if ($DeleteBranchOnMerge.IsPresent) { $DeleteBranchOnMerge } else { $false } Remove-HashtableEntry -Hashtable $body -NullOrEmptyValues diff --git a/src/private/Repositories/Repositories/New-GitHubRepositoryUser.ps1 b/src/private/Repositories/Repositories/New-GitHubRepositoryUser.ps1 index da8f77c55..f013f68b8 100644 --- a/src/private/Repositories/Repositories/New-GitHubRepositoryUser.ps1 +++ b/src/private/Repositories/Repositories/New-GitHubRepositoryUser.ps1 @@ -226,17 +226,17 @@ filter New-GitHubRepositoryUser { Remove-HashtableEntry -Hashtable $body -RemoveNames 'visibility' -RemoveTypes 'SwitchParameter' $body['private'] = $Visibility -eq 'private' - $body['has_issues'] = $HasIssues.IsPresent ? $HasIssues : $false - $body['has_wiki'] = $HasWiki.IsPresent ? $HasWiki : $false - $body['has_projects'] = $HasProjects.IsPresent ? $HasProjects : $false - $body['has_downloads'] = $HasDownloads.IsPresent ? $HasDownloads : $false - $body['is_template'] = $IsTemplate.IsPresent ? $IsTemplate : $false - $body['auto_init'] = $AutoInit.IsPresent ? $AutoInit : $false - $body['allow_squash_merge'] = $AllowSquashMerge.IsPresent ? $AllowSquashMerge : $false - $body['allow_merge_commit'] = $AllowMergeCommit.IsPresent ? $AllowMergeCommit : $false - $body['allow_rebase_merge'] = $AllowRebaseMerge.IsPresent ? $AllowRebaseMerge : $false - $body['allow_auto_merge'] = $AllowAutoMerge.IsPresent ? $AllowAutoMerge : $false - $body['delete_branch_on_merge'] = $DeleteBranchOnMerge.IsPresent ? $DeleteBranchOnMerge : $false + $body['has_issues'] = if ($HasIssues.IsPresent) { $HasIssues } else { $false } + $body['has_wiki'] = if ($HasWiki.IsPresent) { $HasWiki } else { $false } + $body['has_projects'] = if ($HasProjects.IsPresent) { $HasProjects } else { $false } + $body['has_downloads'] = if ($HasDownloads.IsPresent) { $HasDownloads } else { $false } + $body['is_template'] = if ($IsTemplate.IsPresent) { $IsTemplate } else { $false } + $body['auto_init'] = if ($AutoInit.IsPresent) { $AutoInit } else { $false } + $body['allow_squash_merge'] = if ($AllowSquashMerge.IsPresent) { $AllowSquashMerge } else { $false } + $body['allow_merge_commit'] = if ($AllowMergeCommit.IsPresent) { $AllowMergeCommit } else { $false } + $body['allow_rebase_merge'] = if ($AllowRebaseMerge.IsPresent) { $AllowRebaseMerge } else { $false } + $body['allow_auto_merge'] = if ($AllowAutoMerge.IsPresent) { $AllowAutoMerge } else { $false } + $body['delete_branch_on_merge'] = if ($DeleteBranchOnMerge.IsPresent) { $DeleteBranchOnMerge } else { $false } Remove-HashtableEntry -Hashtable $body -NullOrEmptyValues diff --git a/src/private/Utilities/Hashtable/ConvertTo-HashTable.ps1 b/src/private/Utilities/Hashtable/ConvertTo-HashTable.ps1 index 8b9023554..e61d573bd 100644 --- a/src/private/Utilities/Hashtable/ConvertTo-HashTable.ps1 +++ b/src/private/Utilities/Hashtable/ConvertTo-HashTable.ps1 @@ -60,7 +60,7 @@ [hashtable]$hashtable = @{} foreach ($item in $InputObject.PSObject.Properties) { - $name = $NameCasingStyle ? ($item.Name | Convert-StringCasingStyle -To $NameCasingStyle) : $item.Name + $name = if ($NameCasingStyle) { ($item.Name | Convert-StringCasingStyle -To $NameCasingStyle) } else { $item.Name } $hashtable[$name] = $item.Value } $hashtable diff --git a/src/public/Auth/Connect-GitHubAccount.ps1 b/src/public/Auth/Connect-GitHubAccount.ps1 index 211045e2c..a80bdc7ec 100644 --- a/src/public/Auth/Connect-GitHubAccount.ps1 +++ b/src/public/Auth/Connect-GitHubAccount.ps1 @@ -102,7 +102,7 @@ Write-Verbose "GitHub token: [$gitHubToken]" $gitHubTokenPresent = $gitHubToken.count -gt 0 Write-Verbose "GitHub token present: [$gitHubTokenPresent]" - $AuthType = $gitHubTokenPresent ? 'sPAT' : $PSCmdlet.ParameterSetName + $AuthType = if ($gitHubTokenPresent) { 'sPAT' } else { $PSCmdlet.ParameterSetName } Write-Verbose "AuthType: [$AuthType]" switch ($AuthType) { 'DeviceFlow' { diff --git a/src/public/Releases/Releases/Set-GitHubRelease.ps1 b/src/public/Releases/Releases/Set-GitHubRelease.ps1 index 27b777176..34d378bff 100644 --- a/src/public/Releases/Releases/Set-GitHubRelease.ps1 +++ b/src/public/Releases/Releases/Set-GitHubRelease.ps1 @@ -78,8 +78,8 @@ $requestBody = $PSBoundParameters | ConvertFrom-HashTable | ConvertTo-HashTable -NameCasingStyle snake_case Remove-HashtableEntry -Hashtable $requestBody -RemoveNames 'Owner', 'Repo', 'Draft', 'Prerelease' $requestBody = Join-Object -AsHashtable -Main $requestBody -Overrides @{ - draft = $Draft.IsPresent ? $Draft : $false - prerelease = $Prerelease.IsPresent ? $Prerelease : $false + draft = if ($Draft.IsPresent) { $Draft } else { $false } + prerelease = if ($Prerelease.IsPresent) { $Prerelease } else { $false } } $inputObject = @{ diff --git a/src/public/Repositories/Repositories/Update-GitHubRepository.ps1 b/src/public/Repositories/Repositories/Update-GitHubRepository.ps1 index 9224108af..a95b7c121 100644 --- a/src/public/Repositories/Repositories/Update-GitHubRepository.ps1 +++ b/src/public/Repositories/Repositories/Update-GitHubRepository.ps1 @@ -184,28 +184,34 @@ merge_commit_title = $MergeCommitTitle merge_commit_message = $MergeCommitMessage - advanced_security = $EnableAdvancedSecurity.IsPresent ? @{ - status = $EnableAdvancedSecurity ? 'enabled' : 'disabled' - } : $null - secret_scanning = $EnableSecretScanning.IsPresent ? @{ - status = $EnableSecretScanning ? 'enabled' : 'disabled' - } : $null - secret_scanning_push_protection = $EnableSecretScanningPushProtection.IsPresent ? @{ - status = $EnableSecretScanningPushProtection ? 'enabled' : 'disabled' - } : $null - has_issues = $HasIssues.IsPresent ? $HasIssues : $null - has_projects = $HasProjects.IsPresent ? $HasProjects : $null - has_wiki = $HasWiki.IsPresent ? $HasWiki : $null - is_template = $IsTemplate.IsPresent ? $IsTemplate : $null - allow_squash_merge = $AllowSquashMerge.IsPresent ? $AllowSquashMerge : $null - allow_merge_commit = $AllowMergeCommit.IsPresent ? $AllowMergeCommit : $null - allow_rebase_merge = $AllowRebaseMerge.IsPresent ? $AllowRebaseMerge : $null - allow_auto_merge = $AllowAutoMerge.IsPresent ? $AllowAutoMerge : $null - allow_update_branch = $AllowUpdateMerge.IsPresent ? $AllowUpdateMerge : $null - delete_branch_on_merge = $DeleteBranchOnMerge.IsPresent ? $DeleteBranchOnMerge : $null - archived = $Archived.IsPresent ? $Archived : $null - allow_forking = $AllowForking.IsPresent ? $AllowForking : $null - web_commit_signoff_required = $WebCommitSignoffRequired.IsPresent ? $WebCommitSignoffRequired : $null + advanced_security = if ($EnableAdvancedSecurity.IsPresent) { + @{ + status = if ($EnableAdvancedSecurity) { 'enabled' } else { 'disabled' } + } + } else { $null } + secret_scanning = if ($EnableSecretScanning.IsPresent) { + @{ + status = if ($EnableSecretScanning) { 'enabled' } else { 'disabled' } + } + } else { $null } + secret_scanning_push_protection = if ($EnableSecretScanningPushProtection.IsPresent) { + @{ + status = if ($EnableSecretScanningPushProtection) { 'enabled' } else { 'disabled' } + } + } else { $null } + has_issues = if ($HasIssues.IsPresent) { $HasIssues } else { $null } + has_projects = if ($HasProjects.IsPresent) { $HasProjects } else { $null } + has_wiki = if ($HasWiki.IsPresent) { $HasWiki } else { $null } + is_template = if ($IsTemplate.IsPresent) { $IsTemplate } else { $null } + allow_squash_merge = if ($AllowSquashMerge.IsPresent) { $AllowSquashMerge } else { $null } + allow_merge_commit = if ($AllowMergeCommit.IsPresent) { $AllowMergeCommit } else { $null } + allow_rebase_merge = if ($AllowRebaseMerge.IsPresent) { $AllowRebaseMerge } else { $null } + allow_auto_merge = if ($AllowAutoMerge.IsPresent) { $AllowAutoMerge } else { $null } + allow_update_branch = if ($AllowUpdateMerge.IsPresent) { $AllowUpdateMerge } else { $null } + delete_branch_on_merge = if ($DeleteBranchOnMerge.IsPresent) { $DeleteBranchOnMerge } else { $null } + archived = if ($Archived.IsPresent) { $Archived } else { $null } + allow_forking = if ($AllowForking.IsPresent) { $AllowForking } else { $null } + web_commit_signoff_required = if ($WebCommitSignoffRequired.IsPresent) { $WebCommitSignoffRequired } else { $null } } Remove-HashtableEntry -Hashtable $body -NullOrEmptyValues