Merge MySql enhancement from generation to master

src/MySql/Az.MySql.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 12/3/2020
+# Generated on: 1/7/2021
 #
 
 @{
@@ -12,13 +12,13 @@
 RootModule = './Az.MySql.psm1'
 
 # Version number of this module.
-ModuleVersion = '0.3.1'
+ModuleVersion = '0.1.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
 
 # ID used to uniquely identify this module
-GUID = '8c7c6fcd-a96f-460b-89e2-ff822a3246c8'
+GUID = '0b8ac9f4-b926-4ac8-b73f-937a0d218521'
 
 # Author of this module
 Author = 'Microsoft Corporation'
@@ -45,7 +45,7 @@ PowerShellVersion = '5.1'
 DotNetFrameworkVersion = '4.7.2'
 
 # Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
-# CLRVersion = ''
+# ClrVersion = ''
 
 # Processor architecture (None, X86, Amd64) required by this module
 # ProcessorArchitecture = ''
@@ -54,7 +54,7 @@ DotNetFrameworkVersion = '4.7.2'
 RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.2.3'; })
 
 # Assemblies that must be loaded prior to importing this module
-RequiredAssemblies = './bin/Az.MySql.private.dll'
+RequiredAssemblies = 'bin\Az.MySql.private.dll'
 
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.
 # ScriptsToProcess = @()
@@ -72,8 +72,10 @@ FormatsToProcess = 'Az.MySql.format.ps1xml'
 FunctionsToExport = 'Get-AzMySqlConfiguration', 'Get-AzMySqlConnectionString', 
                'Get-AzMySqlFirewallRule', 'Get-AzMySqlFlexibleServer', 
                'Get-AzMySqlFlexibleServerConfiguration', 
+               'Get-AzMySqlFlexibleServerConnectionString', 
                'Get-AzMySqlFlexibleServerDatabase', 
                'Get-AzMySqlFlexibleServerFirewallRule', 
+               'Get-AzMySqlFlexibleServerLocationBasedCapability', 
                'Get-AzMySqlFlexibleServerReplica', 'Get-AzMySqlReplica', 
                'Get-AzMySqlServer', 'Get-AzMySqlVirtualNetworkRule', 
                'New-AzMySqlFirewallRule', 'New-AzMySqlFlexibleServer', 
@@ -130,7 +132,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Fixed secure string issue'
+        # ReleaseNotes = ''
 
         # Prerelease string of this module
         # Prerelease = ''

src/MySql/Az.MySql.psm1

@@ -24,17 +24,17 @@
       }
     }
     if(-not $accountsModule) {
-      $hasAdequateVersion = (Get-Module -Name $accountsName -ListAvailable | Where-Object { $_.Version -ge [System.Version]'1.8.1' } | Measure-Object).Count -gt 0
+      $hasAdequateVersion = (Get-Module -Name $accountsName -ListAvailable | Where-Object { $_.Version -ge [System.Version]'2.2.3' } | Measure-Object).Count -gt 0
       if($hasAdequateVersion) {
-        $accountsModule = Import-Module -Name $accountsName -MinimumVersion 1.8.1 -Scope Global -PassThru
+        $accountsModule = Import-Module -Name $accountsName -MinimumVersion 2.2.3 -Scope Global -PassThru
       }
     }
   }
 
   if(-not $accountsModule) {
-    Write-Error "`nThis module requires $accountsName version 1.8.1 or greater. For installation instructions, please see: https://docs.microsoft.com/en-us/powershell/azure/install-az-ps" -ErrorAction Stop
-  } elseif (($accountsModule.Version -lt [System.Version]'1.8.1') -and (-not $localAccounts)) {
-    Write-Error "`nThis module requires $accountsName version 1.8.1 or greater. An earlier version of Az.Accounts is imported in the current PowerShell session. If you are running test, please try to remove '.PSSharedModules' in your home directory. Otherwise please open a new PowerShell session and import this module again.`nAdditionally, this error could indicate that multiple incompatible versions of Azure PowerShell modules are installed on your system. For troubleshooting information, please see: https://aka.ms/azps-version-error" -ErrorAction Stop
+    Write-Error "`nThis module requires $accountsName version 2.2.3 or greater. For installation instructions, please see: https://docs.microsoft.com/en-us/powershell/azure/install-az-ps" -ErrorAction Stop
+  } elseif (($accountsModule.Version -lt [System.Version]'2.2.3') -and (-not $localAccounts)) {
+    Write-Error "`nThis module requires $accountsName version 2.2.3 or greater. An earlier version of Az.Accounts is imported in the current PowerShell session. If you are running test, please try to remove '.PSSharedModules' in your home directory. Otherwise please open a new PowerShell session and import this module again.`nAdditionally, this error could indicate that multiple incompatible versions of Azure PowerShell modules are installed on your system. For troubleshooting information, please see: https://aka.ms/azps-version-error" -ErrorAction Stop
   }
   Write-Information "Loaded Module '$($accountsModule.Name)'"
 

src/MySql/ChangeLog.md

@@ -18,6 +18,9 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Updated New-AzMySqlFlexibleServer cmdlet to provide easy resource group and network management within RDBMS flexible server management
+* Added new cmdlets Get-AzMySqlFlexibleServerLocationBasedCapability and Get-AzMySqlConnectionString
+* Added parameter MinimalTlsVersion
 
 ## Version 0.3.1
 * Fixed secure string issue

src/MySql/build-module.ps1

@@ -122,7 +122,7 @@ $null = New-Item -ItemType Directory -Force -Path $examplesFolder
 
 if($NoDocs) {
   Write-Host -ForegroundColor Green 'Creating exports...'
-  Export-ProxyCmdlet -ModuleName $moduleName -ModulePath $modulePaths -ExportsFolder $exportsFolder -InternalFolder $internalFolder -ExcludeDocs
+  Export-ProxyCmdlet -ModuleName $moduleName -ModulePath $modulePaths -ExportsFolder $exportsFolder -InternalFolder $internalFolder -ExcludeDocs -ExamplesFolder $examplesFolder
 } else {
   Write-Host -ForegroundColor Green 'Creating exports and docs...'
   $moduleDescription = 'Microsoft Azure PowerShell: MySql cmdlets'

src/MySql/check-dependencies.ps1

@@ -46,7 +46,7 @@ if(Test-Path -Path $localModulesPath) {
   $env:PSModulePath = "$localModulesPath$([IO.Path]::PathSeparator)$env:PSModulePath"
 }
 
-DownloadModule -predicate ($all -or $Accounts) -path $localModulesPath -moduleName 'Az.Accounts' -versionMinimum '1.8.1'
+DownloadModule -predicate ($all -or $Accounts) -path $localModulesPath -moduleName 'Az.Accounts' -versionMinimum '2.2.3'
 DownloadModule -predicate ($all -or $Pester) -path $localModulesPath -moduleName 'Pester' -requiredVersion '4.10.1'
 
 $tools = Join-Path $PSScriptRoot 'tools'
@@ -56,7 +56,7 @@ $resourceModule = Join-Path $HOME '.PSSharedModules\Resources\Az.Resources.TestS
 if ($Resources.IsPresent -and (-not (Test-Path -Path $resourceModule))) {
   Write-Host -ForegroundColor Green "Building local Resource module used for test..."
   Set-Location $resourceDir
-  $null = autorest-beta .\readme.md --output-folder=$HOME/.PSSharedModules/Resources
+  $null = autorest .\readme.md --use:@autorest/[email protected] --output-folder=$HOME/.PSSharedModules/Resources
   $null = Copy-Item custom/* $HOME/.PSSharedModules/Resources/custom/
   Set-Location $HOME/.PSSharedModules/Resources
   $null = .\build-module.ps1

src/MySql/custom/FlexibleServer.cs

@@ -0,0 +1,28 @@
+namespace Microsoft.Azure.PowerShell.Cmdlets.MySql.Models.Api20200701Preview
+{
+    using static Microsoft.Azure.PowerShell.Cmdlets.MySql.Runtime.Extensions;
+    using System.Security;
+
+    /// <summary>Represents a server.</summary>
+    public partial class ServerAutoGenerated
+    {
+        private SecureString _SecuredPassword;
+        // <summary> The user password in secure string. Convert the secure string into plain text if necessary. </summary>
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.Origin(Microsoft.Azure.PowerShell.Cmdlets.MySql.PropertyOrigin.Inlined)]
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.DoNotFormat]
+        public SecureString SecuredPassword {get => this._SecuredPassword; set => this._SecuredPassword = value;}
+
+        private string _FirewallRuleName;
+        // <summary> The name of the firewall rule of the server </summary>
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.Origin(Microsoft.Azure.PowerShell.Cmdlets.MySql.PropertyOrigin.Inlined)]
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.DoNotFormat]
+        public string FirewallRuleName {get => this._FirewallRuleName; set => this._FirewallRuleName = value;}
+
+        private string _DatabaseName;
+        // <summary> The name of the default database created for the server </summary>
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.Origin(Microsoft.Azure.PowerShell.Cmdlets.MySql.PropertyOrigin.Inlined)]
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.DoNotFormat]
+        public string DatabaseName {get => this._DatabaseName; set => this._DatabaseName = value;}
+
+    }
+}

src/MySql/custom/Get-AzMySqlConnectionString.ps1

@@ -34,7 +34,7 @@ function Get-AzMySqlConnectionString {
         [System.String]
         ${SubscriptionId},
 
-        [Parameter(ParameterSetName='GetViaIdentity', Mandatory, ValueFromPipeline, HelpMessage = 'The source server object to create replica from.')]
+        [Parameter(ParameterSetName='GetViaIdentity', Mandatory, ValueFromPipeline, HelpMessage = 'The server for the connection string.')]
         [Microsoft.Azure.PowerShell.Cmdlets.MySql.Category('Body')]
         [Microsoft.Azure.PowerShell.Cmdlets.MySql.Models.Api20171201.IServer]
         ${InputObject},

src/MySql/custom/Get-AzMySqlFlexibleServerConnectionString.ps1

@@ -0,0 +1,144 @@
+# ----------------------------------------------------------------------------------
+#
+# Copyright Microsoft Corporation
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ----------------------------------------------------------------------------------
+
+<#
+.Synopsis
+Get the connection string according to client connection provider.
+.Description
+Get the connection string according to client connection provider.
+#>
+
+function Get-AzMySqlFlexibleServerConnectionString {
+    [OutputType([System.String])]
+    [CmdletBinding(DefaultParameterSetName='Get', PositionalBinding=$false)]
+    [Microsoft.Azure.PowerShell.Cmdlets.MySql.Description('Get the connection string according to client connection provider.')]
+    param(
+        [Parameter(ParameterSetName='Get', Mandatory, HelpMessage = 'The name of the server.')]
+        [Alias('ServerName')]
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.Category('Path')]
+        [System.String]
+        ${Name},
+
+        [Parameter(ParameterSetName='Get', Mandatory,  HelpMessage = 'The name of the resource group that contains the resource, You can obtain this value from the Azure Resource Manager API or the portal.')]
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.Category('Path')]
+        [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(Mandatory, HelpMessage = 'Client connection provider.')]
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.Category('Path')]
+        [Validateset('ADO.NET', 'JDBC', 'Node.js', 'PHP', 'Python', 'Ruby', 'WebApp')]
+        [System.String]
+        ${Client},
+
+        [Parameter(ParameterSetName='GetViaIdentity', Mandatory, ValueFromPipeline, HelpMessage = 'The server for the connection string.')]
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.Category('Body')]
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.Models.IMySqlIdentity]
+        ${InputObject},
+
+        [Parameter(HelpMessage = 'The credentials, account, tenant, and subscription used for communication with Azure.')]
+        [Alias('AzureRMContext', 'AzureCredential')]
+        [ValidateNotNull()]
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.Category('Azure')]
+        [System.Management.Automation.PSObject]
+        ${DefaultProfile},
+
+        [Parameter(DontShow, HelpMessage = 'Wait for .NET debugger to attach.')]
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.Category('Runtime')]
+        [System.Management.Automation.SwitchParameter]
+        ${Break},
+
+        [Parameter(DontShow)]
+        [ValidateNotNull()]
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.Category('Runtime')]
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.Runtime.SendAsyncStep[]]
+        # SendAsync Pipeline Steps to be appended to the front of the pipeline.
+        ${HttpPipelineAppend},
+
+        [Parameter(DontShow)]
+        [ValidateNotNull()]
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.Category('Runtime')]
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.Runtime.SendAsyncStep[]]
+        # SendAsync Pipeline Steps to be prepended to the front of the pipeline.
+        ${HttpPipelinePrepend},
+
+        [Parameter(DontShow)]
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.Category('Runtime')]
+        [System.Uri]
+        # The URI for the proxy server to use.
+        ${Proxy},
+
+        [Parameter(DontShow)]
+        [ValidateNotNull()]
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.Category('Runtime')]
+        [System.Management.Automation.PSCredential]
+        # Credentials for a proxy server to use for the remote call.
+        ${ProxyCredential},
+
+        [Parameter(DontShow)]
+        [Microsoft.Azure.PowerShell.Cmdlets.MySql.Category('Runtime')]
+        [System.Management.Automation.SwitchParameter]
+        # Use the default credentials for the proxy.
+        ${ProxyUseDefaultCredentials}
+    )
+
+    process {
+        function GetConnectionStringSslPart {
+            param(
+                [Parameter()]
+                [string]
+                ${Client},
+                [Parameter()]
+                [string]
+                ${SslEnforcement}
+            )
+            $SslEnforcementTemplateMap = @{
+            'ADO.NET' = 'SslMode=MySqlSslMode.Required;SslCa="{ca-cert filename}"'
+            'JDBC' = '?useSSL=true'
+            'Node.js' = ', ssl:{ca:fs.readFileSync({ca-cert filename})}'
+            'PHP' = 'mysqli_ssl_set($con, NULL, NULL, {ca-cert filename}, NULL, NULL);'
+            'Python' = ', ssl_ca={ca-cert filename}, ssl_verify_cert=true'
+            'Ruby' = ', sslca:{ca-cert filename}, sslverify:false, sslcipher:"AES256-SHA"'
+            'WebApp' = ''
+           }
+           if ($SslEnforcement -eq 'Enabled') {
+               return $SslEnforcementTemplateMap[$Client]
+           }
+           return ''
+        }
+
+        $clientConnection = $PSBoundParameters['Client']
+        $null = $PSBoundParameters.Remove('Client')
+        $mySqlServer = Az.MySql\Get-AzMySqlFlexibleServer @PSBoundParameters
+        $DBHost = $mySqlServer.FullyQualifiedDomainName
+        $DBPort = 3306
+        $adminName = $mySqlServer.AdministratorLogin
+        $SslConnectionString = GetConnectionStringSslPart -Client $clientConnection -SslEnforcement $mySqlServer.SslEnforcement
+        $ConnectionStringMap = @{
+            'ADO.NET' = "Server=${DBHost}; Port=${DBPort}; Database={your_database}; UserID=${adminName}; Password={your_password}; $SslConnectionString"
+            'JDBC' = "String url =`"jdbc:mysql://${DBHost}:${DBPort}/{your_database}$SslConnectionString`"; myDbConn = DriverManager.getConnection(url, `"${adminName}`", {your_password});"
+            'Node.js' = "var conn = mysql.createConnection({host: `"${DBHost}`", user: `"${adminName}`", password: {your_password}, database: {your_database}, port: ${DBPort}$SslConnectionString});"
+            'PHP' = "`$con=mysqli_init();$SslConnectionString mysqli_real_connect(`$con, `"${DBHost}`", `"${adminName}`", {your_password}, {your_database}, ${DBPort});"
+            'Python' = "cnx = mysql.connector.connect(user=`"${adminName}`", password={your_password}, host=`"${DBHost}`", port=${DBPort}, database={your_database}$SslConnectionString)"
+            'Ruby' = "client = Mysql2::Client.new(username: `"${adminName}`", password: {your_password}, database: {your_database}, host: `"${DBHost}`", port: ${DBPort}$SslConnectionString)"
+        }
+        return $ConnectionStringMap[$Client]
+    }
+}
+