Retargeting master pull request to release branch

src/Sql/Sql/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+Fix New-AzSqlDatabaseSecondary cmdlet to check for PartnerDatabaseName existence instead of DatabaseName existence.
 
 ## Version 2.1.2
 * Fix vulnerability assessment set baseline cmdlets functionality to work on master db for azure database and limit it on managed instance system databases.

src/Sql/Sql/Replication/Cmdlet/NewAzureSqlDatabaseSecondary.cs

@@ -156,7 +156,7 @@ protected override IEnumerable<AzureReplicationLinkModel> GetEntity()
             // We try to get the database.  Since this is a create secondary database operation, we don't want the secondary database to already exist
             try
             {
-                ModelAdapter.GetDatabase(this.PartnerResourceGroupName, this.PartnerServerName, this.DatabaseName);
+                ModelAdapter.GetDatabase(this.PartnerResourceGroupName, this.PartnerServerName, GetEffectivePartnerDatabaseName(this.DatabaseName, this.PartnerDatabaseName));
             }
             catch (CloudException ex)
             {
@@ -195,7 +195,7 @@ protected override IEnumerable<AzureReplicationLinkModel> ApplyUserInputToModel(
                 DatabaseName = this.DatabaseName,
                 PartnerResourceGroupName = this.PartnerResourceGroupName,
                 PartnerServerName = this.PartnerServerName,
-                PartnerDatabaseName = string.IsNullOrWhiteSpace(this.PartnerDatabaseName) ? this.DatabaseName : this.PartnerDatabaseName,
+                PartnerDatabaseName = GetEffectivePartnerDatabaseName(this.DatabaseName, this.PartnerDatabaseName),
                 SecondaryElasticPoolName = this.SecondaryElasticPoolName,
                 AllowConnections = this.AllowConnections,
                 Tags = TagsConversionHelper.CreateTagDictionary(Tags, validate: true),
@@ -240,5 +240,16 @@ protected override IEnumerable<AzureReplicationLinkModel> PersistChanges(IEnumer
                 ModelAdapter.CreateLinkWithNewSdk(entity.First().PartnerResourceGroupName, entity.First().PartnerServerName, entity.First())
             };
         }
+
+        /// <summary>
+        /// Returns the partner database name to be used in request based on input
+        /// </summary>
+        /// <param name="database">Source database name</param>
+        /// <param name="partnerDatabase">Partner database name if given</param>
+        /// <returns>The input entity</returns>
+        private string GetEffectivePartnerDatabaseName(string database, string partnerDatabase)
+        {
+            return string.IsNullOrEmpty(partnerDatabase) ? database : partnerDatabase;
+        }
     }
 }