Add parametrs names to SecurityConstants

ayeletshpigelman · ayeletshpigelman · commit 47823fd62a0a · 2017-02-15T12:19:52.000+02:00
diff --git a/src/ResourceManager/Sql/Commands.Sql/Auditing/Cmdlet/SetAzureSqlDatabaseAuditingPolicy.cs b/src/ResourceManager/Sql/Commands.Sql/Auditing/Cmdlet/SetAzureSqlDatabaseAuditingPolicy.cs
@@ -129,25 +129,25 @@ private void ApplyUserInputToBlobAuditingModel(DatabaseBlobAuditingPolicyModel m
                 model.StorageAccountName = StorageAccountName;
             }
 
-            if (MyInvocation.BoundParameters.ContainsKey("StorageKeyType"))
+            if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.StorageKeyType))
             {
                 // the user enter a key type - we use it (and override the previously defined key type)
                 model.StorageKeyType = (StorageKeyType == SecurityConstants.Primary)
                     ? StorageKeyKind.Primary
                     : StorageKeyKind.Secondary;
             }
 
-            if (AuditActionGroup != null &&  AuditActionGroup.Length != 0)
+            if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.AuditActionGroup))
             {
                 model.AuditActionGroup = AuditActionGroup;
             }
 
-            if (AuditAction != null && AuditAction.Length != 0)
+            if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.AuditAction))
             {
                 model.AuditAction = AuditAction;
             }
 
-            if (MyInvocation.BoundParameters.ContainsKey("EventType")) // Event types are relevant only for Table auditing
+            if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.EventType)) // Event types are relevant only for Table auditing
             {
                 throw new Exception(string.Format(Properties.Resources.EventTypeConfiguringIrrelevantForBlobAuditingPolicy));
             }
@@ -163,7 +163,7 @@ private void ApplyUserInputToTableAuditingModel(DatabaseAuditingPolicyModel mode
                 model.StorageAccountName = StorageAccountName;
                 ModelAdapter.ClearStorageDetailsCache();
             }
-            if (!string.IsNullOrEmpty(StorageKeyType))
+            if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.StorageKeyType))
             {
                 // the user enter a key type - we use it (and override the previously defined key type)
                 model.StorageKeyType = (StorageKeyType == SecurityConstants.Primary)
@@ -173,7 +173,7 @@ private void ApplyUserInputToTableAuditingModel(DatabaseAuditingPolicyModel mode
 
             EventType = Util.ProcessAuditEvents(EventType);
 
-            if (MyInvocation.BoundParameters.ContainsKey("EventType")) // the user provided Table auditing event types
+            if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.EventType)) // the user provided Table auditing event types
             {
                 model.EventType = EventType.Select(s => SecurityConstants.AuditEventsToAuditEventType[s]).ToArray();
             }
@@ -196,12 +196,12 @@ private void ApplyUserInputToTableAuditingModel(DatabaseAuditingPolicyModel mode
                 model.TableIdentifier = TableIdentifier;
             }
 
-            if (AuditAction != null) // Audit Actions are relevant only for Blob auditing
+            if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.AuditAction)) // Audit Actions are relevant only for Blob auditing
             {
                 throw new Exception(string.Format(Properties.Resources.AuditActionsConfiguringIrrelevantForTableAuditingPolicy));
             }
 
-            if (AuditActionGroup != null) // Audit Action Groups are relevant only for Blob auditing
+            if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.AuditActionGroup)) // Audit Action Groups are relevant only for Blob auditing
             {
                 throw new Exception(string.Format(Properties.Resources.AuditActionGroupsConfiguringIrrelevantForTableAuditingPolicy));
             }
diff --git a/src/ResourceManager/Sql/Commands.Sql/Auditing/Cmdlet/SetAzureSqlServerAuditingPolicy.cs b/src/ResourceManager/Sql/Commands.Sql/Auditing/Cmdlet/SetAzureSqlServerAuditingPolicy.cs
@@ -124,14 +124,14 @@ private void ApplyUserInputToTableAuditingModel(ServerAuditingPolicyModel model)
                 model.StorageAccountName = StorageAccountName;
                 ModelAdapter.ClearStorageDetailsCache();
             }
-            if (!string.IsNullOrEmpty(StorageKeyType)) // the user enter a key type - we use it (and running over the previously defined key type)
+            if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.StorageKeyType)) // the user enter a key type - we use it (and running over the previously defined key type)
             {
                 model.StorageKeyType = (StorageKeyType == SecurityConstants.Primary) ? StorageKeyKind.Primary : StorageKeyKind.Secondary;
             }
 
             EventType = Util.ProcessAuditEvents(EventType);
 
-            if (MyInvocation.BoundParameters.ContainsKey("EventType")) // the user provided event types to audit
+            if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.EventType)) // the user provided event types to audit
             {
                 model.EventType = EventType.Select(s => SecurityConstants.AuditEventsToAuditEventType[s]).ToArray();
             }
@@ -154,7 +154,7 @@ private void ApplyUserInputToTableAuditingModel(ServerAuditingPolicyModel model)
                 model.TableIdentifier = TableIdentifier;
             }
 
-            if (MyInvocation.BoundParameters.ContainsKey("AuditActionGroups")) //AuditActionGroup is relevant only for blob auditing
+            if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.AuditActionGroup)) //AuditActionGroup is relevant only for blob auditing
             {
                 throw new Exception(string.Format(Properties.Resources.AuditActionGroupsConfiguringIrrelevantForTableAuditingPolicy));
             }
@@ -173,17 +173,17 @@ private void ApplyUserInputToBlobAuditingModel(ServerBlobAuditingPolicyModel mod
                 model.StorageAccountName = StorageAccountName;
             }
 
-            if (!string.IsNullOrEmpty(StorageKeyType)) // the user enter a key type - we use it (and running over the previously defined key type)
+            if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.StorageKeyType)) // the user enter a key type - we use it (and running over the previously defined key type)
             {
                 model.StorageKeyType = (StorageKeyType == SecurityConstants.Primary) ? StorageKeyKind.Primary : StorageKeyKind.Secondary;
             }
 
-            if (AuditActionGroup != null && AuditActionGroup.Length != 0)
+            if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.AuditActionGroup))
             {
                 model.AuditActionGroup = AuditActionGroup;
             }
 
-            if (MyInvocation.BoundParameters.ContainsKey("EventType")) // EventType is relevant only for table auditing
+            if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.EventType)) // EventType is relevant only for table auditing
             {
                 throw new Exception(string.Format(Properties.Resources.EventTypeConfiguringIrrelevantForBlobAuditingPolicy));
             }
diff --git a/src/ResourceManager/Sql/Commands.Sql/Common/SecurityConstants.cs b/src/ResourceManager/Sql/Commands.Sql/Common/SecurityConstants.cs
@@ -34,6 +34,10 @@ public class SecurityConstants
         public const string Login_Failure = "Login_Failure";
         public const string TransactionManagement_Success = "TransactionManagement_Success";
         public const string TransactionManagement_Failure = "TransactionManagement_Failure";
+        public const string StorageKeyType = "StorageKeyType";
+        public const string EventType = "EventType";
+        public const string AuditActionGroup = "AuditActionGroup";
+        public const string AuditAction = "AuditAction";
 
         public const string All = "All";
         public const string None = "None";

Original file line number	Diff line number	Diff line change
`@@ -129,25 +129,25 @@ private void ApplyUserInputToBlobAuditingModel(DatabaseBlobAuditingPolicyModel m`
`129`	`129`	`model.StorageAccountName = StorageAccountName;`
`130`	`130`	`}`
`131`	`131`
`132`		`- if (MyInvocation.BoundParameters.ContainsKey("StorageKeyType"))`
	`132`	`+ if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.StorageKeyType))`
`133`	`133`	`{`
`134`	`134`	`// the user enter a key type - we use it (and override the previously defined key type)`
`135`	`135`	`model.StorageKeyType = (StorageKeyType == SecurityConstants.Primary)`
`136`	`136`	`? StorageKeyKind.Primary`
`137`	`137`	`: StorageKeyKind.Secondary;`
`138`	`138`	`}`
`139`	`139`
`140`		`- if (AuditActionGroup != null && AuditActionGroup.Length != 0)`
	`140`	`+ if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.AuditActionGroup))`
`141`	`141`	`{`
`142`	`142`	`model.AuditActionGroup = AuditActionGroup;`
`143`	`143`	`}`
`144`	`144`
`145`		`- if (AuditAction != null && AuditAction.Length != 0)`
	`145`	`+ if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.AuditAction))`
`146`	`146`	`{`
`147`	`147`	`model.AuditAction = AuditAction;`
`148`	`148`	`}`
`149`	`149`
`150`		`- if (MyInvocation.BoundParameters.ContainsKey("EventType")) // Event types are relevant only for Table auditing`
	`150`	`+ if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.EventType)) // Event types are relevant only for Table auditing`
`151`	`151`	`{`
`152`	`152`	`throw new Exception(string.Format(Properties.Resources.EventTypeConfiguringIrrelevantForBlobAuditingPolicy));`
`153`	`153`	`}`
`@@ -163,7 +163,7 @@ private void ApplyUserInputToTableAuditingModel(DatabaseAuditingPolicyModel mode`
`163`	`163`	`model.StorageAccountName = StorageAccountName;`
`164`	`164`	`ModelAdapter.ClearStorageDetailsCache();`
`165`	`165`	`}`
`166`		`- if (!string.IsNullOrEmpty(StorageKeyType))`
	`166`	`+ if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.StorageKeyType))`
`167`	`167`	`{`
`168`	`168`	`// the user enter a key type - we use it (and override the previously defined key type)`
`169`	`169`	`model.StorageKeyType = (StorageKeyType == SecurityConstants.Primary)`
`@@ -173,7 +173,7 @@ private void ApplyUserInputToTableAuditingModel(DatabaseAuditingPolicyModel mode`
`173`	`173`
`174`	`174`	`EventType = Util.ProcessAuditEvents(EventType);`
`175`	`175`
`176`		`- if (MyInvocation.BoundParameters.ContainsKey("EventType")) // the user provided Table auditing event types`
	`176`	`+ if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.EventType)) // the user provided Table auditing event types`
`177`	`177`	`{`
`178`	`178`	`model.EventType = EventType.Select(s => SecurityConstants.AuditEventsToAuditEventType[s]).ToArray();`
`179`	`179`	`}`
`@@ -196,12 +196,12 @@ private void ApplyUserInputToTableAuditingModel(DatabaseAuditingPolicyModel mode`
`196`	`196`	`model.TableIdentifier = TableIdentifier;`
`197`	`197`	`}`
`198`	`198`
`199`		`- if (AuditAction != null) // Audit Actions are relevant only for Blob auditing`
	`199`	`+ if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.AuditAction)) // Audit Actions are relevant only for Blob auditing`
`200`	`200`	`{`
`201`	`201`	`throw new Exception(string.Format(Properties.Resources.AuditActionsConfiguringIrrelevantForTableAuditingPolicy));`
`202`	`202`	`}`
`203`	`203`
`204`		`- if (AuditActionGroup != null) // Audit Action Groups are relevant only for Blob auditing`
	`204`	`+ if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.AuditActionGroup)) // Audit Action Groups are relevant only for Blob auditing`
`205`	`205`	`{`
`206`	`206`	`throw new Exception(string.Format(Properties.Resources.AuditActionGroupsConfiguringIrrelevantForTableAuditingPolicy));`
`207`	`207`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,14 +124,14 @@ private void ApplyUserInputToTableAuditingModel(ServerAuditingPolicyModel model)`
`124`	`124`	`model.StorageAccountName = StorageAccountName;`
`125`	`125`	`ModelAdapter.ClearStorageDetailsCache();`
`126`	`126`	`}`
`127`		`- if (!string.IsNullOrEmpty(StorageKeyType)) // the user enter a key type - we use it (and running over the previously defined key type)`
	`127`	`+ if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.StorageKeyType)) // the user enter a key type - we use it (and running over the previously defined key type)`
`128`	`128`	`{`
`129`	`129`	`model.StorageKeyType = (StorageKeyType == SecurityConstants.Primary) ? StorageKeyKind.Primary : StorageKeyKind.Secondary;`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`EventType = Util.ProcessAuditEvents(EventType);`
`133`	`133`
`134`		`- if (MyInvocation.BoundParameters.ContainsKey("EventType")) // the user provided event types to audit`
	`134`	`+ if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.EventType)) // the user provided event types to audit`
`135`	`135`	`{`
`136`	`136`	`model.EventType = EventType.Select(s => SecurityConstants.AuditEventsToAuditEventType[s]).ToArray();`
`137`	`137`	`}`
`@@ -154,7 +154,7 @@ private void ApplyUserInputToTableAuditingModel(ServerAuditingPolicyModel model)`
`154`	`154`	`model.TableIdentifier = TableIdentifier;`
`155`	`155`	`}`
`156`	`156`
`157`		`- if (MyInvocation.BoundParameters.ContainsKey("AuditActionGroups")) //AuditActionGroup is relevant only for blob auditing`
	`157`	`+ if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.AuditActionGroup)) //AuditActionGroup is relevant only for blob auditing`
`158`	`158`	`{`
`159`	`159`	`throw new Exception(string.Format(Properties.Resources.AuditActionGroupsConfiguringIrrelevantForTableAuditingPolicy));`
`160`	`160`	`}`
`@@ -173,17 +173,17 @@ private void ApplyUserInputToBlobAuditingModel(ServerBlobAuditingPolicyModel mod`
`173`	`173`	`model.StorageAccountName = StorageAccountName;`
`174`	`174`	`}`
`175`	`175`
`176`		`- if (!string.IsNullOrEmpty(StorageKeyType)) // the user enter a key type - we use it (and running over the previously defined key type)`
	`176`	`+ if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.StorageKeyType)) // the user enter a key type - we use it (and running over the previously defined key type)`
`177`	`177`	`{`
`178`	`178`	`model.StorageKeyType = (StorageKeyType == SecurityConstants.Primary) ? StorageKeyKind.Primary : StorageKeyKind.Secondary;`
`179`	`179`	`}`
`180`	`180`
`181`		`- if (AuditActionGroup != null && AuditActionGroup.Length != 0)`
	`181`	`+ if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.AuditActionGroup))`
`182`	`182`	`{`
`183`	`183`	`model.AuditActionGroup = AuditActionGroup;`
`184`	`184`	`}`
`185`	`185`
`186`		`- if (MyInvocation.BoundParameters.ContainsKey("EventType")) // EventType is relevant only for table auditing`
	`186`	`+ if (MyInvocation.BoundParameters.ContainsKey(SecurityConstants.EventType)) // EventType is relevant only for table auditing`
`187`	`187`	`{`
`188`	`188`	`throw new Exception(string.Format(Properties.Resources.EventTypeConfiguringIrrelevantForBlobAuditingPolicy));`
`189`	`189`	`}`