Fix MySql test cases failure (#11536)

* Resolve Conflict

* Update MySql Test

* Fix merge issue: restore SubnetId Change

* Fix Get-AzMySqlServer test jsonfile input & output issue

* Fix test case failure

1. Add SubsriptionId to serveral cmdlets
2. Remove piping in the test cases of AzMySqlConnectionString for the test framework limitation.

* Change module initial version.

Co-authored-by: Harvey Chen <[email protected]>

Author: msJinLei

src/MySql/custom/Get-AzMySqlConnectionString.ps1

@@ -28,6 +28,12 @@ function Get-AzMySqlConnectionString {
         [System.String]
         ${ResourceGroupName},
 
+        [Parameter(ParameterSetName='Get', HelpMessage='The subscription ID that identifies an Azure subscription.')]
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.Category('Path')]
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.Runtime.DefaultInfo(Script='(Get-AzContext).Subscription.Id')]
+        [System.String]
+        ${SubscriptionId},
+
         [Parameter(ParameterSetName='GetViaIdentity', Mandatory, ValueFromPipeline, HelpMessage = 'The source server object to create replica from.')]
         [Microsoft.Azure.PowerShell.Cmdlets.MySql.Category('Body')]
         [Microsoft.Azure.PowerShell.Cmdlets.MySql.Models.Api20171201.IServer]

src/MySql/custom/New-AzMySqlServerReplica.ps1

@@ -29,6 +29,12 @@ function New-AzMySqlServerReplica {
         [System.String]
         ${ResourceGroupName},
 
+        [Parameter(HelpMessage='The subscription ID that identifies an Azure subscription.')]
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.Category('Path')]
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.Runtime.DefaultInfo(Script='(Get-AzContext).Subscription.Id')]
+        [System.String]
+        ${SubscriptionId},
+
         [Parameter(Mandatory, ValueFromPipeline, HelpMessage = 'The source server object to create replica from.')]
         [Microsoft.Azure.PowerShell.Cmdlets.MySql.Category('Body')]
         [Microsoft.Azure.PowerShell.Cmdlets.MySql.Models.Api20171201.IServer]

src/MySql/custom/Restore-AzMySqlServer_GeoRestore.ps1

@@ -29,6 +29,12 @@ function Restore-AzMySqlServer_GeoRestore {
         [System.String]
         ${ResourceGroupName},
 
+        [Parameter(HelpMessage='The subscription ID that identifies an Azure subscription.')]
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.Category('Path')]
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.Runtime.DefaultInfo(Script='(Get-AzContext).Subscription.Id')]
+        [System.String]
+        ${SubscriptionId},
+
         [Parameter(Mandatory, ValueFromPipeline, HelpMessage = 'The source server object to restore from.')]
         [Microsoft.Azure.PowerShell.Cmdlets.MySql.Category('Body')]
         [Microsoft.Azure.PowerShell.Cmdlets.MySql.Models.Api20171201.IServer]

src/MySql/custom/Restore-AzMySqlServer_PointInTimeRestore.ps1

@@ -29,6 +29,12 @@ function Restore-AzMySqlServer_PointInTimeRestore {
         [System.String]
         ${ResourceGroupName},
 
+        [Parameter(HelpMessage='The subscription ID that identifies an Azure subscription.')]
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.Category('Path')]
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.Runtime.DefaultInfo(Script='(Get-AzContext).Subscription.Id')]
+        [System.String]
+        ${SubscriptionId},
+
         [Parameter(Mandatory, HelpMessage = 'The location the resource resides in.')]
         [Microsoft.Azure.PowerShell.Cmdlets.MySql.Category('Body')]
         [System.DateTime]

src/MySql/docs/Get-AzMySqlConnectionString.md

@@ -15,7 +15,7 @@ Get the connection string according to client connection provider.
 ### Get (Default)
 ```
 Get-AzMySqlConnectionString -Client <String> -Name <String> -ResourceGroupName <String>
- [-DefaultProfile <PSObject>] [<CommonParameters>]
+ [-SubscriptionId <String>] [-DefaultProfile <PSObject>] [<CommonParameters>]
 ```
 
 ### GetViaIdentity
@@ -130,6 +130,22 @@ Accept wildcard characters: False
 Dynamic: False
 ```
 
+### -SubscriptionId
+The subscription ID that identifies an Azure subscription.
+
+```yaml
+Type: System.String
+Parameter Sets: Get
+Aliases:
+
+Required: False
+Position: Named
+Default value: (Get-AzContext).Subscription.Id
+Accept pipeline input: False
+Accept wildcard characters: False
+Dynamic: False
+```
+
 ### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
 

src/MySql/docs/New-AzMySqlServerReplica.md

@@ -14,8 +14,8 @@ Creates a new replica from an existing database.
 
 ```
 New-AzMySqlServerReplica -Name <String> -ResourceGroupName <String> -InputObject <IServer>
- [-Location <String>] [-Sku <String>] [-DefaultProfile <PSObject>] [-AsJob] [-NoWait] [-Confirm] [-WhatIf]
- [<CommonParameters>]
+ [-SubscriptionId <String>] [-Location <String>] [-Sku <String>] [-DefaultProfile <PSObject>] [-AsJob]
+ [-NoWait] [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -166,6 +166,22 @@ Accept wildcard characters: False
 Dynamic: False
 ```
 
+### -SubscriptionId
+The subscription ID that identifies an Azure subscription.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: (Get-AzContext).Subscription.Id
+Accept pipeline input: False
+Accept wildcard characters: False
+Dynamic: False
+```
+
 ### -Confirm
 Prompts you for confirmation before running the cmdlet.
 

src/MySql/docs/New-AzMySqlVirtualNetworkRule.md

@@ -14,7 +14,7 @@ Creates or updates an existing virtual network rule.
 
 ```
 New-AzMySqlVirtualNetworkRule -Name <String> -ResourceGroupName <String> -ServerName <String>
- -VirtualNetworkSubnetId <String> [-SubscriptionId <String>] [-IgnoreMissingVnetServiceEndpoint]
+ -SubnetId <String> [-SubscriptionId <String>] [-IgnoreMissingVnetServiceEndpoint]
  [-DefaultProfile <PSObject>] [-AsJob] [-NoWait] [-PassThru] [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
@@ -166,33 +166,33 @@ Accept wildcard characters: False
 Dynamic: False
 ```
 
-### -SubscriptionId
-The ID of the target subscription.
+### -SubnetId
+The ARM resource id of the virtual network subnet.
 
 ```yaml
 Type: System.String
 Parameter Sets: (All)
 Aliases:
 
-Required: False
+Required: True
 Position: Named
-Default value: (Get-AzContext).Subscription.Id
+Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
 Dynamic: False
 ```
 
-### -VirtualNetworkSubnetId
-The ARM resource id of the virtual network subnet.
+### -SubscriptionId
+The ID of the target subscription.
 
 ```yaml
 Type: System.String
 Parameter Sets: (All)
 Aliases:
 
-Required: True
+Required: False
 Position: Named
-Default value: None
+Default value: (Get-AzContext).Subscription.Id
 Accept pipeline input: False
 Accept wildcard characters: False
 Dynamic: False

src/MySql/docs/Restore-AzMySqlServer.md

@@ -15,15 +15,16 @@ Restore a server from an existing backup
 ### GeoRestore (Default)
 ```
 Restore-AzMySqlServer -Name <String> -ResourceGroupName <String> -InputObject <IServer> -UseGeoRestore
- [-Location <String>] [-Sku <String>] [-Tag <Hashtable>] [-DefaultProfile <PSObject>] [-AsJob] [-NoWait]
- [-Confirm] [-WhatIf] [<CommonParameters>]
+ [-SubscriptionId <String>] [-Location <String>] [-Sku <String>] [-Tag <Hashtable>]
+ [-DefaultProfile <PSObject>] [-AsJob] [-NoWait] [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
 ### PointInTimeRestore
 ```
 Restore-AzMySqlServer -Name <String> -ResourceGroupName <String> -InputObject <IServer>
- -RestorePointInTime <DateTime> -UsePointInTimeRestore [-Location <String>] [-Sku <String>] [-Tag <Hashtable>]
- [-DefaultProfile <PSObject>] [-AsJob] [-NoWait] [-Confirm] [-WhatIf] [<CommonParameters>]
+ -RestorePointInTime <DateTime> -UsePointInTimeRestore [-SubscriptionId <String>] [-Location <String>]
+ [-Sku <String>] [-Tag <Hashtable>] [-DefaultProfile <PSObject>] [-AsJob] [-NoWait] [-Confirm] [-WhatIf]
+ [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -202,6 +203,22 @@ Accept wildcard characters: False
 Dynamic: False
 ```
 
+### -SubscriptionId
+The subscription ID that identifies an Azure subscription.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: (Get-AzContext).Subscription.Id
+Accept pipeline input: False
+Accept wildcard characters: False
+Dynamic: False
+```
+
 ### -Tag
 Application-specific metadata in the form of key-value pairs.
 

src/MySql/docs/Update-AzMySqlVirtualNetworkRule.md

@@ -15,13 +15,13 @@ Creates or updates an existing virtual network rule.
 ### UpdateExpanded (Default)
 ```
 Update-AzMySqlVirtualNetworkRule -Name <String> -ResourceGroupName <String> -ServerName <String>
- -VirtualNetworkSubnetId <String> [-SubscriptionId <String>] [-IgnoreMissingVnetServiceEndpoint]
+ -SubnetId <String> [-SubscriptionId <String>] [-IgnoreMissingVnetServiceEndpoint]
  [-DefaultProfile <PSObject>] [-AsJob] [-NoWait] [-PassThru] [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
 ### UpdateViaIdentityExpanded
 ```
-Update-AzMySqlVirtualNetworkRule -InputObject <IMySqlIdentity> -VirtualNetworkSubnetId <String>
+Update-AzMySqlVirtualNetworkRule -InputObject <IMySqlIdentity> -SubnetId <String>
  [-IgnoreMissingVnetServiceEndpoint] [-DefaultProfile <PSObject>] [-AsJob] [-NoWait] [-PassThru] [-Confirm]
  [-WhatIf] [<CommonParameters>]
 ```
@@ -204,33 +204,33 @@ Accept wildcard characters: False
 Dynamic: False
 ```
 
-### -SubscriptionId
-The ID of the target subscription.
+### -SubnetId
+The ARM resource id of the virtual network subnet.
 
 ```yaml
 Type: System.String
-Parameter Sets: UpdateExpanded
+Parameter Sets: (All)
 Aliases:
 
-Required: False
+Required: True
 Position: Named
-Default value: (Get-AzContext).Subscription.Id
+Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
 Dynamic: False
 ```
 
-### -VirtualNetworkSubnetId
-The ARM resource id of the virtual network subnet.
+### -SubscriptionId
+The ID of the target subscription.
 
 ```yaml
 Type: System.String
-Parameter Sets: (All)
+Parameter Sets: UpdateExpanded
 Aliases:
 
-Required: True
+Required: False
 Position: Named
-Default value: None
+Default value: (Get-AzContext).Subscription.Id
 Accept pipeline input: False
 Accept wildcard characters: False
 Dynamic: False

src/MySql/readme.md

@@ -51,7 +51,7 @@ require:
   - $(this-folder)/../readme.azure.noprofile.md
 input-file:
   - $(repo)/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/mysql.json
-module-version: 0.0.1
+module-version: 0.1.0
 title: MySQL
 subject-prefix: 'MySQL'
 
@@ -90,7 +90,7 @@ directive:
     hide: true
   - where:
       parameter-name: VirtualNetworkSubnetId
-      subject: VirtualNetwork
+      subject: VirtualNetworkRule
     set:
       parameter-name: SubnetId
   - where:

src/MySql/test/Get-AzMySqlConfiguration.Recording.json

@@ -19,12 +19,12 @@ Describe 'Get-AzMySqlConfiguration' {
 
     It 'Get' {
         $config = Get-AzMySqlConfiguration -Name time_zone -ResourceGroupName $env.resourceGroup -ServerName $env.serverName
-        $config.Count | Should -Be 1
+        $config.Name | Should -Be time_zone
     }
 
     It 'GetViaIdentity' {
         $ID = "/subscriptions/$($env.SubscriptionId)/resourceGroups/$($env.resourceGroup)/providers/Microsoft.DBforMySQL/servers/$($env.serverName)/configurations/server_id"
         $config = Get-AzMySqlConfiguration -InputObject $ID 
-        $config.Count | Should -Be 1
+        $config.Name | Should -Be server_id
     }
 }