Skip to content

Resolve duplicate command names in Users.Functions #2291

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Sep 7, 2023
Merged

Resolve duplicate command names in Users.Functions #2291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb82fd5
chore: Resolve duplicate command in Users.Functions
peombwa Sep 5, 2023
b1a5c40
Merge branch 'dev' into po/ResolveCmdletName
peombwa Sep 6, 2023
35eda6c
Merge branch 'dev' into po/ResolveCmdletName
peombwa Sep 6, 2023
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
8 changes: 8 additions & 0 deletions .azure-pipelines/generation-templates/workload-modules.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@ steps:
script: |
. $(System.DefaultWorkingDirectory)/tools/GenerateModules.ps1 -SkipGeneration -Test

- task: PowerShell@2
displayName: Find Duplicate Commands
inputs:
targetType: inline
pwsh: true
script: |
. $(System.DefaultWorkingDirectory)/tools/PostGeneration/FindDuplicateCommand.ps1 -SourcePath "$(System.DefaultWorkingDirectory)/src/"

- ${{ if eq(parameters.Sign, true) }}:
- template: ../common-templates/esrp/strongname.yml
parameters:
Expand Down
4 changes: 2 additions & 2 deletions src/Users.Functions/Users.Functions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ directive:
subject: $1AllowedCalendarSharingRoles
- where:
verb: Get
subject: ^(UserChatMessage)$
subject: ^(User)(ChatMessage|OnlineMeetingTranscript|OnlineMeetingRecording)$
set:
subject: All$1
subject: All$1$2
```
8 changes: 4 additions & 4 deletions tools/PostGeneration/FindDuplicateCommand.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ if (!(Test-Path $SourcePath)) {
Write-Error "SourcePath is not valid or does not exist. Please ensure that $SourcePath exists then try again."
}

$psd1s = Get-ChildItem -Path $SourcePath -Filter "Microsoft.Graph.*.psd1" -Recurse | where { $_.BaseName -ne "Microsoft.Graph.Authentication" }
$allModules = (Invoke-Expression (($psd1s.FullName | ForEach-Object{ Get-Content $_}) | Out-String ))
$psd1s = Get-ChildItem -Path $SourcePath -Filter "Microsoft.Graph.*.psd1" -Recurse | Where-Object { $_.BaseName -ne "Microsoft.Graph.Authentication" }
$allModules = Import-PowerShellDataFile $psd1s.FullName
$unique = $allModules.FunctionsToExport | Select-Object -unique
$duplicates = Compare-object -ReferenceObject $unique -DifferenceObject $allModules.FunctionsToExport

if ($duplicates.Count -gt 0) {
Write-Host "The following functions are duplicated in the psd1 files:"
$duplicates.InputObject | %{
$duplicates.InputObject | ForEach-Object {
$duplicateCommand = $_
Write-Host "$duplicateCommand is duplicated in:"
Write-Host ($allModules | where { $_.FunctionsToExport -contains $duplicateCommand }).RootModule
Write-Host ($allModules | Where-Object { $_.FunctionsToExport -contains $duplicateCommand }).RootModule
Write-Host "********************************"
}
Write-Error "Please ensure that the functions are unique and try again."
Expand Down