Skip to content

Commit 0a88e81

Browse files
baselmicrosoftbaselmicrosoft
committed
Resolve review comments
1 parent bf32f6d commit 0a88e81

10 files changed

+40
-70
lines changed

‎src/Sql/Sql/Auditing/Cmdlet/SetAzSqlDatabaseAuditPolicy.cs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,48 +29,41 @@ public class SetAzSqlDatabaseAuditPolicy : SqlDatabaseAuditPolicyCmdlet
2929
{
3030
[Parameter(
3131
Mandatory = false,
32-
ValueFromPipelineByPropertyName = true,
3332
HelpMessage = AuditingHelpMessages.AuditActionGroupsHelpMessage)]
3433
public AuditActionGroups[] AuditActionGroup { get; set; }
3534

3635
[Parameter(
3736
Mandatory = false,
38-
ValueFromPipelineByPropertyName = true,
3937
HelpMessage = AuditingHelpMessages.AuditActionHelpMessage)]
4038
public string[] AuditAction { get; set; }
4139

4240
[Parameter(
4341
Mandatory = false,
44-
ValueFromPipelineByPropertyName = true,
4542
HelpMessage = AuditingHelpMessages.PredicateExpressionHelpMessage)]
4643
[ValidateNotNull]
4744
public string PredicateExpression { get; set; }
4845

4946
[Parameter(
5047
Mandatory = false,
51-
ValueFromPipelineByPropertyName = true,
5248
HelpMessage = AuditingHelpMessages.BlobStorageTargetState)]
5349
[ValidateSet(SecurityConstants.Enabled, SecurityConstants.Disabled, IgnoreCase = false)]
5450
[ValidateNotNullOrEmpty]
5551
public string BlobStorageTargetState { get; set; }
5652

5753
[Parameter(
5854
Mandatory = false,
59-
ValueFromPipelineByPropertyName = true,
6055
HelpMessage = AuditingHelpMessages.AuditStorageAccountNameHelpMessage)]
6156
[ValidateNotNullOrEmpty]
6257
public string StorageAccountName { get; set; }
6358

6459
[Parameter(
6560
Mandatory = false,
66-
ValueFromPipelineByPropertyName = true,
6761
HelpMessage = AuditingHelpMessages.AuditStorageAccountSubscriptionIdHelpMessage)]
6862
[ValidateNotNullOrEmpty]
6963
public Guid StorageAccountSubscriptionId { get; set; }
7064

7165
[Parameter(
7266
Mandatory = false,
73-
ValueFromPipelineByPropertyName = true,
7467
HelpMessage = AuditingHelpMessages.StorageKeyTypeHelpMessage)]
7568
[ValidateSet(
7669
SecurityConstants.Primary,
@@ -80,44 +73,38 @@ public class SetAzSqlDatabaseAuditPolicy : SqlDatabaseAuditPolicyCmdlet
8073

8174
[Parameter(
8275
Mandatory = false,
83-
ValueFromPipelineByPropertyName = true,
8476
HelpMessage = AuditingHelpMessages.RetentionInDaysHelpMessage)]
8577
[ValidateNotNullOrEmpty]
8678
public uint? RetentionInDays { get; set; }
8779

8880
[Parameter(
8981
Mandatory = false,
90-
ValueFromPipelineByPropertyName = true,
9182
HelpMessage = AuditingHelpMessages.EventHubTargetState)]
9283
[ValidateSet(SecurityConstants.Enabled, SecurityConstants.Disabled, IgnoreCase = false)]
9384
[ValidateNotNullOrEmpty]
9485
public string EventHubTargetState { get; set; }
9586

9687
[Parameter(
9788
Mandatory = false,
98-
ValueFromPipelineByPropertyName = true,
9989
HelpMessage = AuditingHelpMessages.EventHubNameHelpMessage)]
10090
[ValidateNotNullOrEmpty]
10191
public string EventHubName { get; set; }
10292

10393
[Parameter(
10494
Mandatory = false,
105-
ValueFromPipelineByPropertyName = true,
10695
HelpMessage = AuditingHelpMessages.EventHubAuthorizationRuleIdHelpMessage)]
10796
[ValidateNotNullOrEmpty]
10897
public string EventHubAuthorizationRuleResourceId { get; set; }
10998

11099
[Parameter(
111100
Mandatory = false,
112-
ValueFromPipelineByPropertyName = true,
113101
HelpMessage = AuditingHelpMessages.LogAnalyticsTargetState)]
114102
[ValidateSet(SecurityConstants.Enabled, SecurityConstants.Disabled, IgnoreCase = false)]
115103
[ValidateNotNullOrEmpty]
116104
public string LogAnalyticsTargetState { get; set; }
117105

118106
[Parameter(
119107
Mandatory = false,
120-
ValueFromPipelineByPropertyName = true,
121108
HelpMessage = AuditingHelpMessages.WorkspaceIdHelpMessage)]
122109
[ValidateNotNullOrEmpty]
123110
public string WorkspaceResourceId { get; set; }

‎src/Sql/Sql/Auditing/Cmdlet/SetAzSqlServerAuditPolicy.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,42 +29,36 @@ public class SetAzSqlServerAuditPolicy : SqlServerAuditPolicyCmdlet
2929
{
3030
[Parameter(
3131
Mandatory = false,
32-
ValueFromPipelineByPropertyName = true,
3332
HelpMessage = AuditingHelpMessages.AuditActionGroupsHelpMessage)]
3433
public AuditActionGroups[] AuditActionGroup { get; set; }
3534

3635
[Parameter(
3736
Mandatory = false,
38-
ValueFromPipelineByPropertyName = true,
3937
HelpMessage = AuditingHelpMessages.PredicateExpressionHelpMessage)]
4038
[ValidateNotNull]
4139
public string PredicateExpression { get; set; }
4240

4341
[Parameter(
4442
Mandatory = false,
45-
ValueFromPipelineByPropertyName = true,
4643
HelpMessage = AuditingHelpMessages.BlobStorageTargetState)]
4744
[ValidateSet(SecurityConstants.Enabled, SecurityConstants.Disabled, IgnoreCase = false)]
4845
[ValidateNotNullOrEmpty]
4946
public string BlobStorageTargetState { get; set; }
5047

5148
[Parameter(
5249
Mandatory = false,
53-
ValueFromPipelineByPropertyName = true,
5450
HelpMessage = AuditingHelpMessages.AuditStorageAccountNameHelpMessage)]
5551
[ValidateNotNullOrEmpty]
5652
public string StorageAccountName { get; set; }
5753

5854
[Parameter(
5955
Mandatory = false,
60-
ValueFromPipelineByPropertyName = true,
6156
HelpMessage = AuditingHelpMessages.AuditStorageAccountSubscriptionIdHelpMessage)]
6257
[ValidateNotNullOrEmpty]
6358
public Guid StorageAccountSubscriptionId { get; set; }
6459

6560
[Parameter(
6661
Mandatory = false,
67-
ValueFromPipelineByPropertyName = true,
6862
HelpMessage = AuditingHelpMessages.StorageKeyTypeHelpMessage)]
6963
[ValidateSet(
7064
SecurityConstants.Primary,
@@ -74,44 +68,38 @@ public class SetAzSqlServerAuditPolicy : SqlServerAuditPolicyCmdlet
7468

7569
[Parameter(
7670
Mandatory = false,
77-
ValueFromPipelineByPropertyName = true,
7871
HelpMessage = AuditingHelpMessages.RetentionInDaysHelpMessage)]
7972
[ValidateNotNullOrEmpty]
8073
public uint? RetentionInDays { get; set; }
8174

8275
[Parameter(
8376
Mandatory = false,
84-
ValueFromPipelineByPropertyName = true,
8577
HelpMessage = AuditingHelpMessages.EventHubTargetState)]
8678
[ValidateSet(SecurityConstants.Enabled, SecurityConstants.Disabled, IgnoreCase = false)]
8779
[ValidateNotNullOrEmpty]
8880
public string EventHubTargetState { get; set; }
8981

9082
[Parameter(
9183
Mandatory = false,
92-
ValueFromPipelineByPropertyName = true,
9384
HelpMessage = AuditingHelpMessages.EventHubNameHelpMessage)]
9485
[ValidateNotNullOrEmpty]
9586
public string EventHubName { get; set; }
9687

9788
[Parameter(
9889
Mandatory = false,
99-
ValueFromPipelineByPropertyName = true,
10090
HelpMessage = AuditingHelpMessages.EventHubAuthorizationRuleIdHelpMessage)]
10191
[ValidateNotNullOrEmpty]
10292
public string EventHubAuthorizationRuleResourceId { get; set; }
10393

10494
[Parameter(
10595
Mandatory = false,
106-
ValueFromPipelineByPropertyName = true,
10796
HelpMessage = AuditingHelpMessages.LogAnalyticsTargetState)]
10897
[ValidateSet(SecurityConstants.Enabled, SecurityConstants.Disabled, IgnoreCase = false)]
10998
[ValidateNotNullOrEmpty]
11099
public string LogAnalyticsTargetState { get; set; }
111100

112101
[Parameter(
113102
Mandatory = false,
114-
ValueFromPipelineByPropertyName = true,
115103
HelpMessage = AuditingHelpMessages.WorkspaceIdHelpMessage)]
116104
[ValidateNotNullOrEmpty]
117105
public string WorkspaceResourceId { get; set; }

‎src/Sql/Sql/Auditing/Cmdlet/SetAzSqlServerAuditing.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public class SetAzSqlServerAuditing : SqlServerAuditingSettingsCmdletBase
113113
ValueFromPipeline = true,
114114
HelpMessage = AuditingHelpMessages.ServerInputObjectHelpMessage)]
115115
[ValidateNotNullOrEmpty]
116-
public override AzureSqlServerModel InputObject { get; set; }
116+
public override AzureSqlServerModel ServerObject { get; set; }
117117

118118
[Parameter(
119119
Mandatory = true,

‎src/Sql/Sql/Auditing/Cmdlet/SqlDatabaseAuditPolicyCmdlet.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public class SqlDatabaseAuditPolicyCmdlet : AzureSqlDatabaseCmdletBase<DatabaseA
2727
[Parameter(
2828
ParameterSetName = DefinitionsCommon.DatabaseParameterSetName,
2929
Mandatory = true,
30-
ValueFromPipelineByPropertyName = true,
3130
Position = 0,
3231
HelpMessage = AuditingHelpMessages.ResourceGroupNameHelpMessage)]
3332
[ResourceGroupCompleter]
@@ -37,7 +36,6 @@ public class SqlDatabaseAuditPolicyCmdlet : AzureSqlDatabaseCmdletBase<DatabaseA
3736
[Parameter(
3837
ParameterSetName = DefinitionsCommon.DatabaseParameterSetName,
3938
Mandatory = true,
40-
ValueFromPipelineByPropertyName = true,
4139
Position = 1,
4240
HelpMessage = AuditingHelpMessages.ServerNameHelpMessage)]
4341
[ResourceNameCompleter("Microsoft.Sql/servers", "ResourceGroupName")]
@@ -47,7 +45,6 @@ public class SqlDatabaseAuditPolicyCmdlet : AzureSqlDatabaseCmdletBase<DatabaseA
4745
[Parameter(
4846
ParameterSetName = DefinitionsCommon.DatabaseParameterSetName,
4947
Mandatory = true,
50-
ValueFromPipelineByPropertyName = true,
5148
Position = 2,
5249
HelpMessage = AuditingHelpMessages.DatabaseNameHelpMessage)]
5350
[ResourceNameCompleter("Microsoft.Sql/servers/databases", "ResourceGroupName", "ServerName")]

‎src/Sql/Sql/Auditing/Cmdlet/SqlServerAuditPolicyCmdlet.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public class SqlServerAuditPolicyCmdlet : AzureSqlCmdletBase<ServerAuditPolicyMo
2727
[Parameter(
2828
ParameterSetName = DefinitionsCommon.ServerParameterSetName,
2929
Mandatory = true,
30-
ValueFromPipelineByPropertyName = true,
3130
Position = 0,
3231
HelpMessage = AuditingHelpMessages.ResourceGroupNameHelpMessage)]
3332
[ResourceGroupCompleter]
@@ -37,7 +36,6 @@ public class SqlServerAuditPolicyCmdlet : AzureSqlCmdletBase<ServerAuditPolicyMo
3736
[Parameter(
3837
ParameterSetName = DefinitionsCommon.ServerParameterSetName,
3938
Mandatory = true,
40-
ValueFromPipelineByPropertyName = true,
4139
Position = 1,
4240
HelpMessage = AuditingHelpMessages.ServerNameHelpMessage)]
4341
[ResourceNameCompleter("Microsoft.Sql/servers", "ResourceGroupName")]

‎src/Sql/Sql/Auditing/Cmdlet/SqlServerAuditingSettingsCmdletBase.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public abstract class SqlServerAuditingSettingsCmdletBase : AzureSqlCmdletBase<S
8484
ValueFromPipeline = true,
8585
HelpMessage = AuditingHelpMessages.ServerInputObjectHelpMessage)]
8686
[ValidateNotNullOrEmpty]
87-
public virtual AzureSqlServerModel InputObject { get; set; }
87+
public virtual AzureSqlServerModel ServerObject { get; set; }
8888

8989
[Parameter(
9090
ParameterSetName = DefinitionsCommon.BlobStorageParameterSetName,
@@ -148,15 +148,15 @@ protected override ServerBlobAuditingSettingsModel GetEntity()
148148
model = new ServerLogAnalyticsAuditingSettingsModel();
149149
}
150150

151-
if (InputObject == null)
151+
if (ServerObject == null)
152152
{
153153
model.ResourceGroupName = ResourceGroupName;
154154
model.ServerName = ServerName;
155155
}
156156
else
157157
{
158-
model.ResourceGroupName = InputObject.ResourceGroupName;
159-
model.ServerName = InputObject.ServerName;
158+
model.ResourceGroupName = ServerObject.ResourceGroupName;
159+
model.ServerName = ServerObject.ServerName;
160160
}
161161

162162
ModelAdapter.GetAuditingSettings(model.ResourceGroupName, model.ServerName, model);

‎src/Sql/Sql/help/Get-AzSqlDatabaseAuditPolicy.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Aliases:
110110
Required: True
111111
Position: 2
112112
Default value: None
113-
Accept pipeline input: True (ByPropertyName)
113+
Accept pipeline input: False
114114
Accept wildcard characters: False
115115
```
116116
@@ -155,7 +155,7 @@ Aliases:
155155
Required: True
156156
Position: 0
157157
Default value: None
158-
Accept pipeline input: True (ByPropertyName)
158+
Accept pipeline input: False
159159
Accept wildcard characters: False
160160
```
161161
@@ -170,7 +170,7 @@ Aliases:
170170
Required: True
171171
Position: 1
172172
Default value: None
173-
Accept pipeline input: True (ByPropertyName)
173+
Accept pipeline input: False
174174
Accept wildcard characters: False
175175
```
176176

‎src/Sql/Sql/help/Get-AzSqlServerAuditPolicy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Aliases:
134134
Required: True
135135
Position: 0
136136
Default value: None
137-
Accept pipeline input: True (ByPropertyName)
137+
Accept pipeline input: False
138138
Accept wildcard characters: False
139139
```
140140
@@ -149,7 +149,7 @@ Aliases:
149149
Required: True
150150
Position: 1
151151
Default value: None
152-
Accept pipeline input: True (ByPropertyName)
152+
Accept pipeline input: False
153153
Accept wildcard characters: False
154154
```
155155

0 commit comments

Comments
 (0)