Merge remote-tracking branch 'azure-powershell/dev' into dev

Author: caln-microsoft

setup/azurecmdfiles.wxi

@@ -228,4 +228,10 @@
   <data name="DeprecatedEventTypeUsed" xml:space="preserve">
     <value>The use of any of these event types is deprecated: DataAccess, SchemaChanges, DataChanges, SecurityExceptions, RevokePermissions</value>
   </data>
+  <data name="DeprecatedCmdletUsageWarning" xml:space="preserve">
+    <value>The {0} cmdlet is deprecated and will be removed in a future release.</value>
+  </data>
+  <data name="NewDataMaskingRuleIdIsNotValid" xml:space="preserve">
+    <value>Rule Id cannot contain '&lt;,&gt;,+,=,#,*,%,&amp;,\,/,?' and cannot end with a '.'</value>
+  </data>
 </root>

src/ResourceManager/Sql/Commands.Sql/Properties/Resources.Designer.cs

@@ -32,16 +32,12 @@ public abstract class BuildAzureSqlDatabaseDataMaskingRule : SqlDatabaseDataMask
         /// <summary>
         /// Gets or sets the table name
         /// </summary>
-        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The table name.")]
-        [ValidateNotNullOrEmpty]
-        public string TableName { get; set; }
+        public virtual string TableName { get; set; }
 
         /// <summary>
         /// Gets or sets the column name
         /// </summary>
-        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The column name.")]
-        [ValidateNotNullOrEmpty]
-        public string ColumnName { get; set; }
+        public virtual string ColumnName { get; set; }
 
         /// <summary>
         /// Gets or sets the masking function - the definition of this property as a cmdlet parameter is done in the subclasses

src/ResourceManager/Sql/Commands.Sql/Properties/Resources.resx

@@ -19,6 +19,7 @@
 using System.Globalization;
 using System.Linq;
 using System.Management.Automation;
+using System.Text.RegularExpressions;
 
 namespace Microsoft.Azure.Commands.Sql.Security.Cmdlet.DataMasking
 {
@@ -28,6 +29,20 @@ namespace Microsoft.Azure.Commands.Sql.Security.Cmdlet.DataMasking
     [Cmdlet(VerbsCommon.New, "AzureSqlDatabaseDataMaskingRule")]
     public class NewAzureSqlDatabaseDataMaskingRule : BuildAzureSqlDatabaseDataMaskingRule
     {
+        /// <summary>
+        /// Gets or sets the column name
+        /// </summary>
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The column name.")]
+        [ValidateNotNullOrEmpty]
+        public override string ColumnName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the table name
+        /// </summary>
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The table name.")]
+        [ValidateNotNullOrEmpty]
+        public override string TableName { get; set; }
+
         /// <summary>
         /// Gets or sets the masking function
         /// </summary>
@@ -52,6 +67,12 @@ protected override IEnumerable<DatabaseDataMaskingRuleModel> GetEntity()
         /// <returns>An error message or null if all is fine</returns>
         protected override string ValidateOperation(IEnumerable<DatabaseDataMaskingRuleModel> rules)
         {
+            var ruleIdRegex = new Regex("^[^/\\\\#+=<>*%&:?]*[^/\\\\#+=<>*%&:?.]$");
+            
+            if (!ruleIdRegex.IsMatch(RuleId)) // an invalid rule name
+            {
+                return string.Format(CultureInfo.InvariantCulture, Resources.NewDataMaskingRuleIdIsNotValid, RuleId);
+            }
             if(rules.Any(r=> r.RuleId == RuleId))
             {
                 return string.Format(CultureInfo.InvariantCulture, Resources.NewDataMaskingRuleIdAlreadyExistError, RuleId);

src/ResourceManager/Sql/Commands.Sql/Security/Cmdlet/DataMasking/BuildAzureSqlDatabaseDataMaskingRule.cs

@@ -28,6 +28,20 @@ namespace Microsoft.Azure.Commands.Sql.Security.Cmdlet.DataMasking
     [Cmdlet(VerbsCommon.Set, "AzureSqlDatabaseDataMaskingRule")]
     public class SetAzureSqlDatabaseDataMaskingRule : BuildAzureSqlDatabaseDataMaskingRule
     {
+
+        /// <summary>
+        /// Gets or sets the column name
+        /// </summary>
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The column name.")]
+        public override string ColumnName { get; set; }
+        
+        /// <summary>
+        /// Gets or sets the table name
+        /// </summary>
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The table name.")]
+        public override string TableName { get; set; }
+
+
         /// <summary>
         /// Gets or sets the masking function
         /// </summary>

src/ResourceManager/Sql/Commands.Sql/Security/Cmdlet/DataMasking/NewAzureSqlDatabaseDataMaskingRule.cs

@@ -12,6 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.Azure.Commands.Sql.Properties;
 using Microsoft.Azure.Commands.Sql.Security.Model;
 using System.Management.Automation;
 
@@ -41,6 +42,8 @@ public class DisableAzureSqlDatabaseDirectAccess : SqlDatabaseSecureConnectionCm
         /// <param name="model">A model object</param>
         protected override DatabaseSecureConnectionPolicyModel ApplyUserInputToModel(DatabaseSecureConnectionPolicyModel model) 
         {
+
+            WriteWarning(string.Format(Resources.DeprecatedCmdletUsageWarning, "Disable-AzureSqlDatabaseDirectAccess"));
             model.SecureConnectionState = SecureConnectionStateType.Required;
             return model;
         }

src/ResourceManager/Sql/Commands.Sql/Security/Cmdlet/DataMasking/SetAzureSqlDatabaseDataMaskingRule.cs

@@ -12,6 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.Azure.Commands.Sql.Properties;
 using Microsoft.Azure.Commands.Sql.Security.Model;
 using System.Management.Automation;
 
@@ -41,6 +42,7 @@ public class EnableAzureSqlDatabaseDirectAccess : SqlDatabaseSecureConnectionCmd
         /// <param name="model">A model object</param>
         protected override DatabaseSecureConnectionPolicyModel ApplyUserInputToModel(DatabaseSecureConnectionPolicyModel model) 
         {
+            WriteWarning(string.Format(Resources.DeprecatedCmdletUsageWarning, "Enable-AzureSqlDatabaseDirectAccess"));
             model.SecureConnectionState = SecureConnectionStateType.Optional;
             return model;
         }