[Get|Start|Stop|Restart]-DbaService - Add parameter SqlInstance

functions/Get-DbaService.ps1

@@ -9,10 +9,15 @@ function Get-DbaService {
         Requires Local Admin rights on destination computer(s).
 
     .PARAMETER ComputerName
-        The target SQL Server instance or instances.
+        The target computer(s).
 
     .PARAMETER InstanceName
-        Only returns services that belong to the specific instances.
+        Only returns services that belong to the specific instances on all target computers.
+
+    .PARAMETER SqlInstance
+        Use a combination of computername and instancename to get the SQL Server related services for specific instances on specific computers.
+
+        Parameters ComputerName and InstanceName will be ignored if SqlInstance is used.
 
     .PARAMETER Credential
         Credential object used to connect to the computer as a different user.
@@ -66,6 +71,11 @@ function Get-DbaService {
 
         Gets the SQL Server related services related to the default instance MSSQLSERVER on computers sql1 and sql2.
 
+    .EXAMPLE
+        PS C:\> Get-DbaService -SqlInstance sql1, sql1\test, sql2\test
+
+        Gets the SQL Server related services related to the default instance MSSQLSERVER on computers sql1, the named instances test on sql1 and sql2.
+
     .EXAMPLE
         PS C:\> Get-DbaService -ComputerName $MyServers -Type SSRS
 
@@ -97,6 +107,8 @@ function Get-DbaService {
         [Parameter(ParameterSetName = "Search")]
         [Alias("Instance")]
         [string[]]$InstanceName,
+        [Parameter(ParameterSetName = "Search")]
+        [DbaInstanceParameter[]]$SqlInstance,
         [PSCredential]$Credential,
         [Parameter(ParameterSetName = "Search")]
         [ValidateSet("Agent", "Browser", "Engine", "FullText", "SSAS", "SSIS", "SSRS", "PolyBase", "Launchpad")]
@@ -108,6 +120,11 @@ function Get-DbaService {
     )
 
     begin {
+        if ($SqlInstance) {
+            # If SqlInstance is used, we select the list of computers for ComputerName
+            $ComputerName = $SqlInstance | Select-Object -ExpandProperty ComputerName -Unique
+        }
+
         #Dictionary to transform service type IDs into the names from Microsoft.SqlServer.Management.Smo.Wmi.ManagedComputer.Services.Type
         $ServiceIdMap = @(
             @{ Name = "Engine"; Id = 1 },
@@ -147,6 +164,11 @@ function Get-DbaService {
     }
     process {
         foreach ($computer in $ComputerName.ComputerName) {
+            if ($SqlInstance) {
+                # If SqlInstance is used, we select the list of instances for the current computer
+                $InstanceName = $SqlInstance | Where-Object ComputerName -eq $computer | Select-Object -ExpandProperty InstanceName
+            }
+
             try {
                 $resolvedComputerName = (Resolve-DbaNetworkName -ComputerName $computer -Credential $Credential -EnableException).FullComputerName
                 $null = Get-DbaCmObject -ComputerName $resolvedComputerName -Credential $Credential -Namespace root\Microsoft -ClassName __NAMESPACE -EnableException

functions/Restart-DbaService.ps1

@@ -14,6 +14,11 @@ function Restart-DbaService {
     .PARAMETER InstanceName
         Only affects services that belong to the specific instances.
 
+    .PARAMETER SqlInstance
+        Use a combination of computername and instancename to get the SQL Server related services for specific instances on specific computers.
+
+        Parameters ComputerName and InstanceName will be ignored if SqlInstance is used.
+
     .PARAMETER Credential
         Credential object used to connect to the computer as a different user.
 
@@ -87,6 +92,8 @@ function Restart-DbaService {
         [DbaInstanceParameter[]]$ComputerName = $env:COMPUTERNAME,
         [Alias("Instance")]
         [string[]]$InstanceName,
+        [Parameter(ParameterSetName = "Server")]
+        [DbaInstanceParameter[]]$SqlInstance,
         [ValidateSet("Agent", "Browser", "Engine", "FullText", "SSAS", "SSIS", "SSRS", "PolyBase", "Launchpad")]
         [string[]]$Type,
         [parameter(ValueFromPipeline, Mandatory, ParameterSetName = "Service")]
@@ -102,6 +109,7 @@ function Restart-DbaService {
         if ($PsCmdlet.ParameterSetName -eq "Server") {
             $serviceParams = @{ ComputerName = $ComputerName }
             if ($InstanceName) { $serviceParams.InstanceName = $InstanceName }
+            if ($SqlInstance) { $serviceParams.SqlInstance = $SqlInstance }
             if ($Type) { $serviceParams.Type = $Type }
             if ($Credential) { $serviceParams.Credential = $Credential }
             if ($EnableException) { $serviceParams.EnableException = $EnableException }

functions/Start-DbaService.ps1

@@ -14,6 +14,11 @@ function Start-DbaService {
     .PARAMETER InstanceName
         Only affects services that belong to the specific instances.
 
+    .PARAMETER SqlInstance
+        Use a combination of computername and instancename to get the SQL Server related services for specific instances on specific computers.
+
+        Parameters ComputerName and InstanceName will be ignored if SqlInstance is used.
+
     .PARAMETER Credential
         Credential object used to connect to the computer as a different user.
 
@@ -79,6 +84,8 @@ function Start-DbaService {
         [DbaInstanceParameter[]]$ComputerName = $env:COMPUTERNAME,
         [Alias("Instance")]
         [string[]]$InstanceName,
+        [Parameter(ParameterSetName = "Server")]
+        [DbaInstanceParameter[]]$SqlInstance,
         [ValidateSet("Agent", "Browser", "Engine", "FullText", "SSAS", "SSIS", "SSRS")]
         [string[]]$Type,
         [parameter(ValueFromPipeline, Mandatory, ParameterSetName = "Service")]
@@ -93,6 +100,7 @@ function Start-DbaService {
         if ($PsCmdlet.ParameterSetName -eq "Server") {
             $serviceParams = @{ ComputerName = $ComputerName }
             if ($InstanceName) { $serviceParams.InstanceName = $InstanceName }
+            if ($SqlInstance) { $serviceParams.SqlInstance = $SqlInstance }
             if ($Type) { $serviceParams.Type = $Type }
             if ($Credential) { $serviceParams.Credential = $Credential }
             if ($EnableException) { $serviceParams.EnableException = $EnableException }

functions/Stop-DbaService.ps1

@@ -14,6 +14,11 @@ function Stop-DbaService {
     .PARAMETER InstanceName
         Only affects services that belong to the specific instances.
 
+    .PARAMETER SqlInstance
+        Use a combination of computername and instancename to get the SQL Server related services for specific instances on specific computers.
+
+        Parameters ComputerName and InstanceName will be ignored if SqlInstance is used.
+
     .PARAMETER Credential
         Credential object used to connect to the computer as a different user.
 
@@ -87,6 +92,8 @@ function Stop-DbaService {
         [DbaInstanceParameter[]]$ComputerName = $env:COMPUTERNAME,
         [Alias("Instance")]
         [string[]]$InstanceName,
+        [Parameter(ParameterSetName = "Server")]
+        [DbaInstanceParameter[]]$SqlInstance,
         [ValidateSet("Agent", "Browser", "Engine", "FullText", "SSAS", "SSIS", "SSRS")]
         [string[]]$Type,
         [parameter(ValueFromPipeline, Mandatory, ParameterSetName = "Service")]
@@ -103,6 +110,7 @@ function Stop-DbaService {
         if ($PsCmdlet.ParameterSetName -eq "Server") {
             $serviceParams = @{ ComputerName = $ComputerName }
             if ($InstanceName) { $serviceParams.InstanceName = $InstanceName }
+            if ($SqlInstance) { $serviceParams.SqlInstance = $SqlInstance }
             if ($Type) { $serviceParams.Type = $Type }
             if ($Credential) { $serviceParams.Credential = $Credential }
             if ($EnableException) { $serviceParams.EnableException = $EnableException }

tests/Get-DbaService.Tests.ps1

@@ -5,7 +5,7 @@ Write-Host -Object "Running $PSCommandpath" -ForegroundColor Cyan
 Describe "$CommandName Unit Tests" -Tag 'UnitTests' {
     Context "Validate parameters" {
         [object[]]$params = (Get-Command $CommandName).Parameters.Keys | Where-Object {$_ -notin ('whatif', 'confirm')}
-        [object[]]$knownParameters = 'ComputerName', 'InstanceName', 'Credential', 'Type', 'ServiceName', 'AdvancedProperties', 'EnableException'
+        [object[]]$knownParameters = 'ComputerName', 'InstanceName', 'SqlInstance', 'Credential', 'Type', 'ServiceName', 'AdvancedProperties', 'EnableException'
         $knownParameters += [System.Management.Automation.PSCmdlet]::CommonParameters
         It "Should only contain our specific parameters" {
             (@(Compare-Object -ReferenceObject ($knownParameters | Where-Object {$_}) -DifferenceObject $params).Count ) | Should Be 0
@@ -73,4 +73,12 @@ Describe "$commandname Integration Tests" -Tags "IntegrationTests" {
             $results.StartMode | Should Be 'Automatic'
         }
     }
+    Context "Command actually works with SqlInstance" {
+        $results = @( )
+        $results += Get-DbaService -SqlInstance $script:instance2 -Type Engine
+
+        It "shows exactly one service" {
+            $results.Count | Should Be 1
+        }
+    }
 }

tests/Restart-DbaService.Tests.ps1

@@ -5,7 +5,7 @@ Write-Host -Object "Running $PSCommandPath" -ForegroundColor Cyan
 Describe "$CommandName Unit Tests" -Tag 'UnitTests' {
     Context "Validate parameters" {
         [object[]]$params = (Get-Command $CommandName).Parameters.Keys | Where-Object {$_ -notin ('whatif', 'confirm')}
-        [object[]]$knownParameters = 'ComputerName', 'InstanceName', 'Type', 'InputObject', 'Timeout', 'Credential', 'Force', 'EnableException'
+        [object[]]$knownParameters = 'ComputerName', 'InstanceName', 'SqlInstance', 'Type', 'InputObject', 'Timeout', 'Credential', 'Force', 'EnableException'
         $knownParameters += [System.Management.Automation.PSCmdlet]::CommonParameters
         It "Should only contain our specific parameters" {
             (@(Compare-Object -ReferenceObject ($knownParameters | Where-Object {$_}) -DifferenceObject $params).Count ) | Should Be 0

tests/Start-DbaService.Tests.ps1

@@ -5,7 +5,7 @@ Write-Host -Object "Running $PSCommandPath" -ForegroundColor Cyan
 Describe "$CommandName Unit Tests" -Tag 'UnitTests' {
     Context "Validate parameters" {
         [object[]]$params = (Get-Command $CommandName).Parameters.Keys | Where-Object {$_ -notin ('whatif', 'confirm')}
-        [object[]]$knownParameters = 'ComputerName', 'InstanceName', 'Type', 'InputObject', 'Timeout', 'Credential', 'EnableException'
+        [object[]]$knownParameters = 'ComputerName', 'InstanceName', 'SqlInstance', 'Type', 'InputObject', 'Timeout', 'Credential', 'EnableException'
         $knownParameters += [System.Management.Automation.PSCmdlet]::CommonParameters
         It "Should only contain our specific parameters" {
             (@(Compare-Object -ReferenceObject ($knownParameters | Where-Object {$_}) -DifferenceObject $params).Count ) | Should Be 0

tests/Stop-DbaService.Tests.ps1

@@ -5,7 +5,7 @@ Write-Host -Object "Running $PSCommandPath" -ForegroundColor Cyan
 Describe "$CommandName Unit Tests" -Tag 'UnitTests' {
     Context "Validate parameters" {
         [object[]]$params = (Get-Command $CommandName).Parameters.Keys | Where-Object {$_ -notin ('whatif', 'confirm')}
-        [object[]]$knownParameters = 'ComputerName', 'InstanceName', 'Type', 'InputObject', 'Timeout', 'Credential', 'Force', 'EnableException'
+        [object[]]$knownParameters = 'ComputerName', 'InstanceName', 'SqlInstance', 'Type', 'InputObject', 'Timeout', 'Credential', 'Force', 'EnableException'
         $knownParameters += [System.Management.Automation.PSCmdlet]::CommonParameters
         It "Should only contain our specific parameters" {
             (@(Compare-Object -ReferenceObject ($knownParameters | Where-Object {$_}) -DifferenceObject $params).Count ) | Should Be 0

tests/Test-DbaInstanceName.Tests.ps1

@@ -4,7 +4,7 @@ Write-Host -Object "Running $PSCommandPath" -ForegroundColor Cyan
 Describe "$CommandName Unit Tests" -Tag 'UnitTests' {
     Context "Validate parameters" {
         [object[]]$params = (Get-Command $CommandName).Parameters.Keys | Where-Object { $_ -notin ('whatif', 'confirm') }
-        [object[]]$knownParameters = 'Blockers', 'ComputerName', 'InstanceName', 'NewServerName', 'RenameRequired', 'ServerName', 'SqlInstance', 'Updatable', 'Warnings'
+        [object[]]$knownParameters = 'SqlInstance', 'SqlCredential', 'ExcludeSsrs', 'EnableException'
         $knownParameters += [System.Management.Automation.PSCmdlet]::CommonParameters
         It "Should only contain our specific parameters" {
             (@(Compare-Object -ReferenceObject ($knownParameters | Where-Object { $_ }) -DifferenceObject $params).Count ) | Should Be 0
@@ -21,7 +21,7 @@ Describe "$commandname Integration Tests" -Tags "IntegrationTests" {
         }
 
         It "returns the correct properties" {
-            $ExpectedProps = 'ComputerName,ServerName,RenameRequired,Updatable,Warnings,Blockers,SqlInstance,InstanceName'.Split(',')
+            $ExpectedProps = 'ComputerName,InstanceName,SqlInstance,ServerName,NewServerName,RenameRequired,Updatable,Warnings,Blockers'.Split(',')
             ($results.PsObject.Properties.Name | Sort-Object) | Should -Be ($ExpectedProps | Sort-Object)
         }
     }