Fixed SoftDeleteRetentionDays computation (#29038)

Co-authored-by: Yash <55773468+notyashhh@users.noreply.github.com>

Author: rambabu-yalla

src/KeyVault/KeyVault/SecurityDomain/Models/CertKey.cs

@@ -49,7 +49,7 @@ public void Load(KeyPath path)
         public RSA GetKey() { return _key; }
         public X509Certificate2 GetCert() { return _cert; }
 
-        static RSAParameters RsaParamsFromPem(string path, string password)  //CodeQL [SM02205] BouncyCastle is the only API available because we need to be at netstandard2.0
+        static RSAParameters RsaParamsFromPem(string path, string password)  // CodeQL [SM02205] BouncyCastle is the only API available because we need to be at netstandard2.0
         {
             using (var stream = File.OpenText(path))
             {

src/Sql/Sql/Server/Cmdlet/AzureSqlServerCmdletBase.cs

@@ -72,34 +72,16 @@ protected void ValidateSoftDeleteParameters(int? softDeleteRetentionDays, bool?
         /// </summary>
         /// <param name="softDeleteRetentionDays">The explicitly provided retention days</param>
         /// <param name="enableSoftDelete">The enable soft delete flag</param>
-        /// <param name="existingValue">The existing retention days value (for Set operations)</param>
         /// <returns>The computed retention days value</returns>
-        protected int? ComputeSoftDeleteRetentionDays(int? softDeleteRetentionDays, bool? enableSoftDelete, int? existingValue = null)
+        protected int? ComputeSoftDeleteRetentionDays(int? softDeleteRetentionDays, bool? enableSoftDelete)
         {
             if (softDeleteRetentionDays.HasValue)
-            {
-                // SoftDeleteRetentionDays was explicitly provided, use it
                 return softDeleteRetentionDays.Value;
-            }
-            else if (enableSoftDelete.HasValue)
-            {
-                // Only EnableSoftDelete was provided
-                if (enableSoftDelete == true)
-                {
-                    // Enabling soft-delete without specifying days, default to 7
-                    return SoftDeleteRetentionDaysMaximum;
-                }
-                else
-                {
-                    // Disabling soft-delete, set to 0
-                    return SoftDeleteRetentionDaysDisabled;
-                }
-            }
-            else
-            {
-                // Neither parameter specified, return existing value or null
-                return existingValue;
-            }
+
+            if (enableSoftDelete.HasValue)
+                return enableSoftDelete.Value ? SoftDeleteRetentionDaysMaximum : SoftDeleteRetentionDaysDisabled;
+
+            return null;
         }
     }
 }

src/Sql/Sql/Server/Cmdlet/SetAzureSqlServer.cs

@@ -195,7 +195,9 @@ public override void ExecuteCmdlet()
             updateData[0].PrimaryUserAssignedIdentityId = this.PrimaryUserAssignedIdentityId ?? model.FirstOrDefault().PrimaryUserAssignedIdentityId;
             updateData[0].KeyId = this.KeyId ?? updateData[0].KeyId;
             updateData[0].FederatedClientId = this.FederatedClientId ?? updateData[0].FederatedClientId;
-            updateData[0].SoftDeleteRetentionDays = ComputeSoftDeleteRetentionDays(this.SoftDeleteRetentionDays, this.EnableSoftDelete, updateData[0].SoftDeleteRetentionDays);
+            // Compute SoftDeleteRetentionDays from user input or null to preserve existing value.
+            // Don't pass existing value back since API returns 0 for both null and explicitly disabled.
+            updateData[0].SoftDeleteRetentionDays = ComputeSoftDeleteRetentionDays(this.SoftDeleteRetentionDays, this.EnableSoftDelete);
 
             return updateData;
         }