SmbShare: Remove duplicate code

[johlju]

Details of the scenario you tried and the problem that is occurring

The helper function Add-SmbShareAccessPermission is using duplicated code blocks. We should make the code simpler and reduce code management by removing the duplicated code.

Duplicated code blocks:

$currentSmbShareAccessPermissions = Get-SmbShareAccess -Name $Name

    if ($PSBoundParameters.ContainsKey('ChangeAccess'))
    {
        # Get already added account names.
        $smbShareChangeAccessObjects = $currentSmbShareAccessPermissions | Where-Object -FilterScript {
            $_.AccessControlType -eq 'Allow' `
            -and $_.AccessRight -eq 'Change'
        }

        # Get a collection of just the account names.
        $changeAccessAccountNames = @($smbShareChangeAccessObjects.AccountName)

        $newAccountsToHaveChangeAccess = $ChangeAccess | Where-Object -FilterScript {
            $_ -notin $changeAccessAccountNames
        }

        $accessRight = 'Change'

        # Add new accounts that should have change permission.
        $newAccountsToHaveChangeAccess | ForEach-Object {
            Write-Verbose -Message ($script:localizedData.GrantAccess -f $accessRight, $_, $Name)

            Grant-SmbShareAccess -Name $Name -AccountName $_ -AccessRight $accessRight -Force -ErrorAction 'Stop'
        }
    }

    if ($PSBoundParameters.ContainsKey('ReadAccess'))
    {
        # Get already added account names.
        $smbShareReadAccessObjects = $currentSmbShareAccessPermissions | Where-Object -FilterScript {
            $_.AccessControlType -eq 'Allow' `
            -and $_.AccessRight -eq 'Read'
        }

        # Get a collection of just the account names.
        $readAccessAccountNames = @($smbShareReadAccessObjects.AccountName)

        $newAccountsToHaveReadAccess = $ReadAccess | Where-Object -FilterScript {
            $_ -notin $readAccessAccountNames
        }

        $accessRight = 'Read'

        # Add new accounts that should have read permission.
        $newAccountsToHaveReadAccess | ForEach-Object {
            Write-Verbose -Message ($script:localizedData.GrantAccess -f $accessRight, $_, $Name)

            Grant-SmbShareAccess -Name $Name -AccountName $_ -AccessRight $accessRight -Force -ErrorAction 'Stop'
        }
    }

    if ($PSBoundParameters.ContainsKey('FullAccess'))
    {
        # Get already added account names.
        $smbShareFullAccessObjects = $currentSmbShareAccessPermissions | Where-Object -FilterScript {
            $_.AccessControlType -eq 'Allow' `
            -and $_.AccessRight -eq 'Full'
        }

        # Get a collection of just the account names.
        $fullAccessAccountNames = @($smbShareFullAccessObjects.AccountName)

        $newAccountsToHaveFullAccess = $FullAccess | Where-Object -FilterScript {
            $_ -notin $fullAccessAccountNames
        }

        $accessRight = 'Full'

        # Add new accounts that should have full permission.
        $newAccountsToHaveFullAccess | ForEach-Object {
            Write-Verbose -Message ($script:localizedData.GrantAccess -f $accessRight, $_, $Name)

            Grant-SmbShareAccess -Name $Name -AccountName $_ -AccessRight $accessRight -Force -ErrorAction 'Stop'
        }
    }

Verbose logs showing the problem

Not applicable

Suggested solution to the issue

Add a new helper function so each code path called the helper functions with parameters instead.

The DSC configuration that is used to reproduce the issue (as detailed as possible)

# not applicable

The operating system the target node is running

n/a

Version and build of PowerShell the target node is running

n/a

Version of the DSC module that was used ('dev' if using current dev branch)

dev