From 19ea0347e5abaa596bfe8e35dd0877b7a83d542a Mon Sep 17 00:00:00 2001 From: Tal Klein Date: Thu, 7 May 2020 00:26:19 +0300 Subject: [PATCH 01/26] Added settings cmdlet --- .../ScenarioTests/SecuritySettingTests.cs | 54 +++++++++++++ .../ScenarioTests/SecuritySettingTests.ps1 | 77 +++++++++++++++++++ .../Security.Test/Security.Test.csproj | 2 +- src/Security/Security/Az.Security.psd1 | 3 +- .../Security/Cmdlets/Settings/GetSettings.cs | 65 ++++++++++++++++ .../Security/Cmdlets/Settings/SetSettings.cs | 60 +++++++++++++++ .../Security/Common/ParameterHelpMessages.cs | 7 ++ .../PSDeviceSecurityGroupConverters.cs | 8 -- .../Settings/PSSecurityDataExportSetting.cs | 21 +++++ .../Models/Settings/PSSecuritySetting.cs | 27 +++++++ .../Settings/PSSecuritySettingConverters.cs | 67 ++++++++++++++++ src/Security/Security/Security.csproj | 2 +- 12 files changed, 382 insertions(+), 11 deletions(-) create mode 100644 src/Security/Security.Test/ScenarioTests/SecuritySettingTests.cs create mode 100644 src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 create mode 100644 src/Security/Security/Cmdlets/Settings/GetSettings.cs create mode 100644 src/Security/Security/Cmdlets/Settings/SetSettings.cs create mode 100644 src/Security/Security/Models/Settings/PSSecurityDataExportSetting.cs create mode 100644 src/Security/Security/Models/Settings/PSSecuritySetting.cs create mode 100644 src/Security/Security/Models/Settings/PSSecuritySettingConverters.cs diff --git a/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.cs b/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.cs new file mode 100644 index 000000000000..9fe9733ee8b6 --- /dev/null +++ b/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.cs @@ -0,0 +1,54 @@ +// ---------------------------------------------------------------------------------- +// +// Copyright Microsoft Corporation +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// ---------------------------------------------------------------------------------- + +using Microsoft.Azure.Commands.ScenarioTest; +using Microsoft.Azure.ServiceManagement.Common.Models; +using Microsoft.WindowsAzure.Commands.ScenarioTest; +using Xunit; + +namespace Microsoft.Azure.Commands.Security.Test.ScenarioTests +{ + public class SecuritySettingTests + { + private readonly XunitTracingInterceptor _logger; + + public SecuritySettingTests(Xunit.Abstractions.ITestOutputHelper output) + { + _logger = new XunitTracingInterceptor(output); + XunitTracingInterceptor.AddToContext(_logger); + TestExecutionHelpers.SetUpSessionAndProfile(); + } + + [Fact] + [Trait(Category.AcceptanceType, Category.CheckIn)] + public void GetSubscriptionScope() + { + TestController.NewInstance.RunPowerShellTest(_logger, "Get-AzureRmSecuritySetting-SubscriptionScope"); + } + + [Fact] + [Trait(Category.AcceptanceType, Category.CheckIn)] + public void GetSubscriptionLevelResource() + { + TestController.NewInstance.RunPowerShellTest(_logger, "Get-AzureRmSecuritySetting-SubscriptionLevelResource"); + } + + [Fact] + [Trait(Category.AcceptanceType, Category.CheckIn)] + public void SetSubscriptionLevelResource() + { + TestController.NewInstance.RunPowerShellTest(_logger, "Set-AzureRmSecuritySetting-SubscriptionLevelResource"); + } + } +} \ No newline at end of file diff --git a/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 b/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 new file mode 100644 index 000000000000..c9d953200cd1 --- /dev/null +++ b/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 @@ -0,0 +1,77 @@ +# ---------------------------------------------------------------------------------- +# +# Copyright Microsoft Corporation +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ---------------------------------------------------------------------------------- + +<# +.SYNOPSIS +Get Azure Security Center settings on a subscription and its overrides +#> +function Get-AzureRmSecuritySetting-SubscriptionScope +{ + $settings = Get-AzSecuritySetting + + Validate-Settings $settings +} + +<# +.SYNOPSIS +Get Azure Security Center setting on a subscription +#> +function Get-AzureRmSecuritySetting-SubscriptionLevelResource +{ + $setting = Get-AzSecuritySetting -SettingName "MCAS" + + Validate-Setting $setting +} + +<# +.SYNOPSIS +Set an Azure Security Center setting +#> +function Set-AzureRmSecuritySetting-SubscriptionLevelResource +{ + $setting1 = Get-AzSecuritySetting -SettingName "MCAS" + + Validate-Setting $setting1 + + $setting2 = Set-AzSecuritySetting -SettingName "MCAS" -Setting $setting1 + + Validate-Setting $setting2 +} + +<# +.SYNOPSIS +Validates a list of security pricings +#> +function Validate-Settings +{ + param($settings) + + Assert-True { $settings.Count -gt 0 } + + Foreach($setting in $settings) + { + Validate-Setting $setting + } +} + +<# +.SYNOPSIS +Validates a single setting +#> +function Validate-Setting +{ + param($setting) + + Assert-NotNull $setting +} \ No newline at end of file diff --git a/src/Security/Security.Test/Security.Test.csproj b/src/Security/Security.Test/Security.Test.csproj index b8cc8276ef8d..87c58cc97946 100644 --- a/src/Security/Security.Test/Security.Test.csproj +++ b/src/Security/Security.Test/Security.Test.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Security/Security/Az.Security.psd1 b/src/Security/Security/Az.Security.psd1 index 466223d16bf1..56215a941b6d 100644 --- a/src/Security/Security/Az.Security.psd1 +++ b/src/Security/Security/Az.Security.psd1 @@ -99,7 +99,8 @@ CmdletsToExport = 'Get-AzSecurityAlert', 'Set-AzSecurityAlert', 'Get-AzIotSecurityAnalytics', 'Disable-AzIotSecurityAnalyticsAggregatedAlert', 'Set-AzSqlInformationProtectionPolicy', - 'Get-AzSqlInformationProtectionPolicy' + 'Get-AzSqlInformationProtectionPolicy', + 'Get-AzSecuritySetting', 'Set-AzSecuritySetting' # Variables to export from this module # VariablesToExport = @() diff --git a/src/Security/Security/Cmdlets/Settings/GetSettings.cs b/src/Security/Security/Cmdlets/Settings/GetSettings.cs new file mode 100644 index 000000000000..e4208ff680e6 --- /dev/null +++ b/src/Security/Security/Cmdlets/Settings/GetSettings.cs @@ -0,0 +1,65 @@ +// ---------------------------------------------------------------------------------- +// +// Copyright Microsoft Corporation +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// ------------------------------------ + +using System; +using System.Management.Automation; +using Commands.Security; +using Microsoft.Azure.Commands.Security.Common; +using Microsoft.Azure.Commands.Security.Models.Settings; +using Microsoft.Azure.Commands.SecurityCenter.Common; +using Microsoft.Azure.Management.Internal.Resources.Utilities.Models; +using Microsoft.Rest.Azure; + +namespace Microsoft.Azure.Commands.Security.Cmdlets.Settings +{ + [Cmdlet(VerbsCommon.Get, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "SecuritySetting", DefaultParameterSetName = ParameterSetNames.SubscriptionScope), OutputType(typeof(PSSecuritySetting))] + public class GetSettings : SecurityCenterCmdletBase + { + private const int MaxSettingsToFetch = 1500; + + [Parameter(ParameterSetName = ParameterSetNames.SubscriptionLevelResource, Mandatory = true, HelpMessage = ParameterHelpMessages.SettingName)] + [ValidateNotNullOrEmpty] + public string SettingName { get; set; } + + public override void ExecuteCmdlet() + { + int numberOfFetchedSettings = 0; + + switch (ParameterSetName) + { + case ParameterSetNames.SubscriptionScope: + var settings = SecurityCenterClient.Settings.ListWithHttpMessagesAsync().GetAwaiter().GetResult().Body; + var PSTypeSettings = settings.ConvertToPSType(); + WriteObject(PSTypeSettings, enumerateCollection: true); + numberOfFetchedSettings += PSTypeSettings.Count; + var nextLink = settings?.NextPageLink; + while (!string.IsNullOrWhiteSpace(nextLink) && numberOfFetchedSettings < MaxSettingsToFetch) + { + settings = SecurityCenterClient.Settings.ListNextWithHttpMessagesAsync(settings.NextPageLink).GetAwaiter().GetResult().Body; + PSTypeSettings = settings.ConvertToPSType(); + WriteObject(PSTypeSettings, enumerateCollection: true); + numberOfFetchedSettings += PSTypeSettings.Count; + nextLink = settings?.NextPageLink; + } + break; + case ParameterSetNames.SubscriptionLevelResource: + var setting = SecurityCenterClient.Settings.GetWithHttpMessagesAsync(SettingName).GetAwaiter().GetResult().Body; + WriteObject(setting.ConvertToPSType(), enumerateCollection: false); + break; + default: + throw new PSInvalidOperationException(); + } + } + } +} \ No newline at end of file diff --git a/src/Security/Security/Cmdlets/Settings/SetSettings.cs b/src/Security/Security/Cmdlets/Settings/SetSettings.cs new file mode 100644 index 000000000000..160ca3b611fe --- /dev/null +++ b/src/Security/Security/Cmdlets/Settings/SetSettings.cs @@ -0,0 +1,60 @@ +// ---------------------------------------------------------------------------------- +// +// Copyright Microsoft Corporation +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// ------------------------------------ + +using System.Management.Automation; +using Commands.Security; +using Microsoft.Azure.Commands.Security.Common; +using Microsoft.Azure.Commands.Security.Models.Settings; +using Microsoft.Azure.Commands.SecurityCenter.Common; +using Microsoft.Azure.Management.Security.Models; +using Microsoft.Rest.Azure; +using Microsoft.WindowsAzure.Commands.Common.CustomAttributes; + +namespace Microsoft.Azure.Commands.Security.Cmdlets.Settings +{ + [Cmdlet(VerbsCommon.Set, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "SecuritySetting", DefaultParameterSetName = ParameterSetNames.SubscriptionLevelResource, SupportsShouldProcess = true), OutputType(typeof(PSSecuritySetting))] + public class SetSettings : SecurityCenterCmdletBase + { + [Parameter(ParameterSetName = ParameterSetNames.SubscriptionLevelResource, Mandatory = true, HelpMessage = ParameterHelpMessages.SettingName)] + [ValidateNotNullOrEmpty] + public string SettingName { get; set; } + + [Parameter(ParameterSetName = ParameterSetNames.InputObject, Mandatory = true, ValueFromPipeline = true, HelpMessage = ParameterHelpMessages.Setting)] + [ValidateNotNullOrEmpty] + public PSSecuritySetting InputObject { get; set; } + + public override void ExecuteCmdlet() + { + var settingName = SettingName; + var setting = InputObject.ConvertToCSType(); + + switch (ParameterSetName) + { + case ParameterSetNames.SubscriptionLevelResource: + break; + case ParameterSetNames.InputObject: + break; + default: + throw new PSInvalidOperationException(); + } + + if (ShouldProcess(settingName, VerbsCommon.Set)) + { + var setting2 = SecurityCenterClient.Settings.UpdateWithHttpMessagesAsync(settingName, setting).GetAwaiter().GetResult().Body; + + WriteObject(setting2.ConvertToPSType(), enumerateCollection: false); + } + } + } +} \ No newline at end of file diff --git a/src/Security/Security/Common/ParameterHelpMessages.cs b/src/Security/Security/Common/ParameterHelpMessages.cs index 1bb274388b3e..df60f788d7f6 100644 --- a/src/Security/Security/Common/ParameterHelpMessages.cs +++ b/src/Security/Security/Common/ParameterHelpMessages.cs @@ -80,6 +80,13 @@ public static class ParameterHelpMessages #endregion + #region Settings + + public const string SettingName = "Setting name."; + public const string Setting = "Setting."; + + #endregion + #region JIT Network Access Policies public const string VirutalMachines = "Virtual Machines."; diff --git a/src/Security/Security/Models/DeviceSecurityGroups/PSDeviceSecurityGroupConverters.cs b/src/Security/Security/Models/DeviceSecurityGroups/PSDeviceSecurityGroupConverters.cs index 600fd275d31f..6ab52014a305 100644 --- a/src/Security/Security/Models/DeviceSecurityGroups/PSDeviceSecurityGroupConverters.cs +++ b/src/Security/Security/Models/DeviceSecurityGroups/PSDeviceSecurityGroupConverters.cs @@ -48,7 +48,6 @@ public static PSAllowlistCustomAlertRule ConvertToPSType(this AllowlistCustomAle Description = value.Description, DisplayName = value.DisplayName, IsEnabled = value.IsEnabled, - RuleType = value.RuleType, ValueType = value.ValueType }; } @@ -65,7 +64,6 @@ public static PSDenylistCustomAlertRule ConvertToPSType(this DenylistCustomAlert Description = value.Description, DisplayName = value.DisplayName, IsEnabled = value.IsEnabled, - RuleType = value.RuleType, ValueType = value.ValueType, DenylistValues = value.DenylistValues }; @@ -83,7 +81,6 @@ public static PSThresholdCustomAlertRule ConvertToPSType(this ThresholdCustomAle Description = value.Description, DisplayName = value.DisplayName, IsEnabled = value.IsEnabled, - RuleType = value.RuleType, MaxThreshold = value.MaxThreshold, MinThreshold = value.MinThreshold }; @@ -101,7 +98,6 @@ public static PSTimeWindowCustomAlertRule ConvertToPSType(this TimeWindowCustomA Description = value.Description, DisplayName = value.DisplayName, IsEnabled = value.IsEnabled, - RuleType = value.RuleType, MaxThreshold = value.MaxThreshold, MinThreshold = value.MinThreshold, TimeWindowSize = value.TimeWindowSize @@ -121,7 +117,6 @@ public static AllowlistCustomAlertRule CreatePSType(this PSAllowlistCustomAlertR { AllowlistValues = value.AllowlistValues, IsEnabled = value.IsEnabled, - RuleType = value.RuleType }; } @@ -135,7 +130,6 @@ public static DenylistCustomAlertRule CreatePSType(this PSDenylistCustomAlertRul return new DenylistCustomAlertRule() { IsEnabled = value.IsEnabled, - RuleType = value.RuleType, DenylistValues = value.DenylistValues }; } @@ -150,7 +144,6 @@ public static ThresholdCustomAlertRule CreatePSType(this PSThresholdCustomAlertR return new ThresholdCustomAlertRule() { IsEnabled = value.IsEnabled, - RuleType = value.RuleType, MaxThreshold = value.MaxThreshold, MinThreshold = value.MinThreshold }; @@ -166,7 +159,6 @@ public static TimeWindowCustomAlertRule CreatePSType(this PSTimeWindowCustomAler return new TimeWindowCustomAlertRule() { IsEnabled = value.IsEnabled, - RuleType = value.RuleType, MaxThreshold = value.MaxThreshold, MinThreshold = value.MinThreshold, TimeWindowSize = value.TimeWindowSize diff --git a/src/Security/Security/Models/Settings/PSSecurityDataExportSetting.cs b/src/Security/Security/Models/Settings/PSSecurityDataExportSetting.cs new file mode 100644 index 000000000000..39a1033df5bc --- /dev/null +++ b/src/Security/Security/Models/Settings/PSSecurityDataExportSetting.cs @@ -0,0 +1,21 @@ +// ---------------------------------------------------------------------------------- +// +// Copyright Microsoft Corporation +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// ---------------------------------------------------------------------------------- + +namespace Microsoft.Azure.Commands.Security.Models.Settings +{ + public class PSSecurityDataExportSetting : PSSecuritySetting + { + public bool Enabled { get; set; } + } +} diff --git a/src/Security/Security/Models/Settings/PSSecuritySetting.cs b/src/Security/Security/Models/Settings/PSSecuritySetting.cs new file mode 100644 index 000000000000..4a71ec3779e1 --- /dev/null +++ b/src/Security/Security/Models/Settings/PSSecuritySetting.cs @@ -0,0 +1,27 @@ +// ---------------------------------------------------------------------------------- +// +// Copyright Microsoft Corporation +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// ---------------------------------------------------------------------------------- + +namespace Microsoft.Azure.Commands.Security.Models.Settings +{ + public class PSSecuritySetting + { + public string Id { get; set; } + + public string Name { get; set; } + + public string Kind { get; set; } + + public string Type { get; set; } + } +} diff --git a/src/Security/Security/Models/Settings/PSSecuritySettingConverters.cs b/src/Security/Security/Models/Settings/PSSecuritySettingConverters.cs new file mode 100644 index 000000000000..f8bc34378102 --- /dev/null +++ b/src/Security/Security/Models/Settings/PSSecuritySettingConverters.cs @@ -0,0 +1,67 @@ +// ---------------------------------------------------------------------------------- +// +// Copyright Microsoft Corporation +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// ---------------------------------------------------------------------------------- + +using System.Collections.Generic; +using System.Linq; +using Microsoft.Azure.Management.Security.Models; + +namespace Microsoft.Azure.Commands.Security.Models.Settings +{ + public static class PSSecuritySettingConverters + { + public static PSSecuritySetting ConvertToPSType(this Setting value) + { + return new PSSecuritySetting() + { + Id = value.Id, + Name = value.Name, + Type = value.Type, + }; + } + + public static List ConvertToPSType(this IEnumerable value) + { + return value.Select(setting => setting.ConvertToPSType()).ToList(); + } + + public static PSSecurityDataExportSetting ConvertToPSType(this DataExportSettings value) + { + return new PSSecurityDataExportSetting() + { + Id = value.Id, + Name = value.Name, + Kind = nameof(DataExportSettings), + Type = value.Type, + Enabled = value.Enabled + }; + } + + /* + public static List ConvertToPSType(this IEnumerable value) + { + return value.Select(setting => setting.ConvertToPSType()).ToList(); + } + */ + + public static Setting ConvertToCSType(this PSSecuritySetting value) + { + return new Setting(value.Id, value.Name, value.Type); + } + + public static DataExportSettings ConvertToCSType(this PSSecurityDataExportSetting value) + { + return new DataExportSettings(value.Enabled, value.Id, value.Name, value.Type); + } + } +} \ No newline at end of file diff --git a/src/Security/Security/Security.csproj b/src/Security/Security/Security.csproj index 48ddd7f9b1a0..b534d27aecff 100644 --- a/src/Security/Security/Security.csproj +++ b/src/Security/Security/Security.csproj @@ -11,7 +11,7 @@ - + From 2bed5f924a0884f7273f455c828d416d8ab52b5d Mon Sep 17 00:00:00 2001 From: Tal Klein Date: Fri, 8 May 2020 00:18:35 +0300 Subject: [PATCH 02/26] Some fixes to tests --- .../ScenarioTests/SecuritySettingTests.ps1 | 2 +- .../Security/Cmdlets/Settings/SetSettings.cs | 19 ++++-------- .../Settings/PSSecuritySettingConverters.cs | 30 +++++++++++++++++-- 3 files changed, 33 insertions(+), 18 deletions(-) diff --git a/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 b/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 index c9d953200cd1..8bf7250622e9 100644 --- a/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 +++ b/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 @@ -44,7 +44,7 @@ function Set-AzureRmSecuritySetting-SubscriptionLevelResource Validate-Setting $setting1 - $setting2 = Set-AzSecuritySetting -SettingName "MCAS" -Setting $setting1 + $setting2 = Set-AzSecuritySetting -SettingName "MCAS" -SettingInput $setting1 Validate-Setting $setting2 } diff --git a/src/Security/Security/Cmdlets/Settings/SetSettings.cs b/src/Security/Security/Cmdlets/Settings/SetSettings.cs index 160ca3b611fe..7ce62fec1a38 100644 --- a/src/Security/Security/Cmdlets/Settings/SetSettings.cs +++ b/src/Security/Security/Cmdlets/Settings/SetSettings.cs @@ -30,25 +30,16 @@ public class SetSettings : SecurityCenterCmdletBase [ValidateNotNullOrEmpty] public string SettingName { get; set; } - [Parameter(ParameterSetName = ParameterSetNames.InputObject, Mandatory = true, ValueFromPipeline = true, HelpMessage = ParameterHelpMessages.Setting)] + [Parameter(ParameterSetName = ParameterSetNames.SubscriptionLevelResource, Mandatory = true, HelpMessage = ParameterHelpMessages.Setting)] [ValidateNotNullOrEmpty] - public PSSecuritySetting InputObject { get; set; } + public PSSecuritySetting SettingInput { get; set; } public override void ExecuteCmdlet() { var settingName = SettingName; - var setting = InputObject.ConvertToCSType(); - - switch (ParameterSetName) - { - case ParameterSetNames.SubscriptionLevelResource: - break; - case ParameterSetNames.InputObject: - break; - default: - throw new PSInvalidOperationException(); - } - + SettingInput.Name = SettingName; + var setting = SettingInput.ConvertToCSType(); + if (ShouldProcess(settingName, VerbsCommon.Set)) { var setting2 = SecurityCenterClient.Settings.UpdateWithHttpMessagesAsync(settingName, setting).GetAwaiter().GetResult().Body; diff --git a/src/Security/Security/Models/Settings/PSSecuritySettingConverters.cs b/src/Security/Security/Models/Settings/PSSecuritySettingConverters.cs index f8bc34378102..9178564bc328 100644 --- a/src/Security/Security/Models/Settings/PSSecuritySettingConverters.cs +++ b/src/Security/Security/Models/Settings/PSSecuritySettingConverters.cs @@ -20,28 +20,52 @@ namespace Microsoft.Azure.Commands.Security.Models.Settings { public static class PSSecuritySettingConverters { + public static PSSecuritySetting ConvertToPSType1(this Setting value) + { + return new PSSecuritySetting() + { + Id = value.Id, + Name = value.Name, + Kind = "BaseSetting", + }; + } + public static PSSecuritySetting ConvertToPSType(this Setting value) { + if (value.GetType().Name == nameof(DataExportSettings)) + { + return new PSSecurityDataExportSetting() + { + Id = ((DataExportSettings)value).Id, + Name = ((DataExportSettings)value).Name, + Kind = nameof(DataExportSettings), + Type = ((DataExportSettings)value).Type, + Enabled = ((DataExportSettings)value).Enabled + }; + } + return new PSSecuritySetting() { Id = value.Id, Name = value.Name, - Type = value.Type, + Kind = nameof(Setting), + Type = value.Type }; } public static List ConvertToPSType(this IEnumerable value) { + var x = value.First().GetType(); return value.Select(setting => setting.ConvertToPSType()).ToList(); } - public static PSSecurityDataExportSetting ConvertToPSType(this DataExportSettings value) + public static PSSecurityDataExportSetting ConvertToPSType2(this DataExportSettings value) { return new PSSecurityDataExportSetting() { Id = value.Id, Name = value.Name, - Kind = nameof(DataExportSettings), + Kind = "DataExportSettings", Type = value.Type, Enabled = value.Enabled }; From 3c525a5d9a2724098e21177f8a2dc1103fc4634d Mon Sep 17 00:00:00 2001 From: Tal Klein Date: Fri, 8 May 2020 13:30:16 +0300 Subject: [PATCH 03/26] Fixed SetSettings --- .../Security/Cmdlets/Settings/SetSettings.cs | 6 +-- .../Settings/PSSecuritySettingConverters.cs | 38 ++----------------- 2 files changed, 7 insertions(+), 37 deletions(-) diff --git a/src/Security/Security/Cmdlets/Settings/SetSettings.cs b/src/Security/Security/Cmdlets/Settings/SetSettings.cs index 7ce62fec1a38..7806d294e840 100644 --- a/src/Security/Security/Cmdlets/Settings/SetSettings.cs +++ b/src/Security/Security/Cmdlets/Settings/SetSettings.cs @@ -39,12 +39,12 @@ public override void ExecuteCmdlet() var settingName = SettingName; SettingInput.Name = SettingName; var setting = SettingInput.ConvertToCSType(); - + if (ShouldProcess(settingName, VerbsCommon.Set)) { - var setting2 = SecurityCenterClient.Settings.UpdateWithHttpMessagesAsync(settingName, setting).GetAwaiter().GetResult().Body; + var updatedSetting = SecurityCenterClient.Settings.UpdateWithHttpMessagesAsync(settingName, setting).GetAwaiter().GetResult().Body; - WriteObject(setting2.ConvertToPSType(), enumerateCollection: false); + WriteObject(updatedSetting.ConvertToPSType(), enumerateCollection: false); } } } diff --git a/src/Security/Security/Models/Settings/PSSecuritySettingConverters.cs b/src/Security/Security/Models/Settings/PSSecuritySettingConverters.cs index 9178564bc328..9dfc567d4876 100644 --- a/src/Security/Security/Models/Settings/PSSecuritySettingConverters.cs +++ b/src/Security/Security/Models/Settings/PSSecuritySettingConverters.cs @@ -20,16 +20,6 @@ namespace Microsoft.Azure.Commands.Security.Models.Settings { public static class PSSecuritySettingConverters { - public static PSSecuritySetting ConvertToPSType1(this Setting value) - { - return new PSSecuritySetting() - { - Id = value.Id, - Name = value.Name, - Kind = "BaseSetting", - }; - } - public static PSSecuritySetting ConvertToPSType(this Setting value) { if (value.GetType().Name == nameof(DataExportSettings)) @@ -55,37 +45,17 @@ public static PSSecuritySetting ConvertToPSType(this Setting value) public static List ConvertToPSType(this IEnumerable value) { - var x = value.First().GetType(); return value.Select(setting => setting.ConvertToPSType()).ToList(); } - public static PSSecurityDataExportSetting ConvertToPSType2(this DataExportSettings value) + public static Setting ConvertToCSType(this PSSecuritySetting value) { - return new PSSecurityDataExportSetting() + if (value.GetType().Name == nameof(PSSecurityDataExportSetting)) { - Id = value.Id, - Name = value.Name, - Kind = "DataExportSettings", - Type = value.Type, - Enabled = value.Enabled - }; - } - - /* - public static List ConvertToPSType(this IEnumerable value) - { - return value.Select(setting => setting.ConvertToPSType()).ToList(); - } - */ + return new DataExportSettings(((PSSecurityDataExportSetting)value).Enabled, value.Id, value.Name, value.Type); + } - public static Setting ConvertToCSType(this PSSecuritySetting value) - { return new Setting(value.Id, value.Name, value.Type); } - - public static DataExportSettings ConvertToCSType(this PSSecurityDataExportSetting value) - { - return new DataExportSettings(value.Enabled, value.Id, value.Name, value.Type); - } } } \ No newline at end of file From 30688bf0761c21f8d6be0ca5d244d1dc79a4f632 Mon Sep 17 00:00:00 2001 From: Tal Klein Date: Fri, 8 May 2020 13:35:47 +0300 Subject: [PATCH 04/26] added sessionRecords --- .../GetSubscriptionLevelResource.json | 71 +++++++++ .../GetSubscriptionScope.json | 71 +++++++++ .../SetSubscriptionLevelResource.json | 140 ++++++++++++++++++ 3 files changed, 282 insertions(+) create mode 100644 src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingsTests/GetSubscriptionLevelResource.json create mode 100644 src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingsTests/GetSubscriptionScope.json create mode 100644 src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingsTests/SetSubscriptionLevelResource.json diff --git a/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingsTests/GetSubscriptionLevelResource.json b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingsTests/GetSubscriptionLevelResource.json new file mode 100644 index 000000000000..2413e4dd4d62 --- /dev/null +++ b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingsTests/GetSubscriptionLevelResource.json @@ -0,0 +1,71 @@ +{ + "Entries": [ + { + "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/providers/Microsoft.Security/settings/MCAS?api-version=2019-01-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Byb3ZpZGVycy9NaWNyb3NvZnQuU2VjdXJpdHkvc2V0dGluZ3MvTUNBUz9hcGktdmVyc2lvbj0yMDE5LTAxLTAx", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "x-ms-client-request-id": [ + "785f4953-c544-4497-8df9-8d28d77da262" + ], + "Accept-Language": [ + "en-US" + ], + "User-Agent": [ + "FxVersion/4.6.28207.03", + "OSName/Windows", + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" + ] + }, + "ResponseHeaders": { + "Cache-Control": [ + "no-cache" + ], + "Pragma": [ + "no-cache" + ], + "x-ms-request-id": [ + "b83c553a-d564-4125-bacc-cd68a8f14a8f" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ], + "x-ms-ratelimit-remaining-subscription-resource-requests": [ + "749" + ], + "x-ms-correlation-request-id": [ + "be144d5f-3987-4373-a1ba-cc2501cf04ac" + ], + "x-ms-routing-request-id": [ + "GERMANYWESTCENTRAL:20200507T214017Z:be144d5f-3987-4373-a1ba-cc2501cf04ac" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "X-Content-Type-Options": [ + "nosniff" + ], + "Date": [ + "Thu, 07 May 2020 21:40:16 GMT" + ], + "Content-Length": [ + "212" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ] + }, + "ResponseBody": "{\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/providers/Microsoft.Security/settings/MCAS\",\r\n \"name\": \"MCAS\",\r\n \"type\": \"Microsoft.Security/settings\",\r\n \"kind\": \"DataExportSettings\",\r\n \"properties\": {\r\n \"enabled\": true\r\n }\r\n}", + "StatusCode": 200 + } + ], + "Names": {}, + "Variables": { + "SubscriptionId": "487bb485-b5b0-471e-9c0d-10717612f869" + } +} \ No newline at end of file diff --git a/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingsTests/GetSubscriptionScope.json b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingsTests/GetSubscriptionScope.json new file mode 100644 index 000000000000..0dd1adbc5394 --- /dev/null +++ b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingsTests/GetSubscriptionScope.json @@ -0,0 +1,71 @@ +{ + "Entries": [ + { + "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/providers/Microsoft.Security/settings?api-version=2019-01-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Byb3ZpZGVycy9NaWNyb3NvZnQuU2VjdXJpdHkvc2V0dGluZ3M/YXBpLXZlcnNpb249MjAxOS0wMS0wMQ==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "x-ms-client-request-id": [ + "8f441550-521c-47f1-bf8c-ada6614fbdaa" + ], + "Accept-Language": [ + "en-US" + ], + "User-Agent": [ + "FxVersion/4.6.28207.03", + "OSName/Windows", + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" + ] + }, + "ResponseHeaders": { + "Cache-Control": [ + "no-cache" + ], + "Pragma": [ + "no-cache" + ], + "x-ms-request-id": [ + "12b779fb-a204-4443-844c-d98c169dc783" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ], + "x-ms-ratelimit-remaining-subscription-resource-requests": [ + "749" + ], + "x-ms-correlation-request-id": [ + "2e214621-4c9b-435e-9300-b8ed479891c6" + ], + "x-ms-routing-request-id": [ + "GERMANYWESTCENTRAL:20200507T214137Z:2e214621-4c9b-435e-9300-b8ed479891c6" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "X-Content-Type-Options": [ + "nosniff" + ], + "Date": [ + "Thu, 07 May 2020 21:41:37 GMT" + ], + "Content-Length": [ + "439" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ] + }, + "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/providers/Microsoft.Security/settings/MCAS\",\r\n \"name\": \"MCAS\",\r\n \"type\": \"Microsoft.Security/settings\",\r\n \"kind\": \"DataExportSettings\",\r\n \"properties\": {\r\n \"enabled\": true\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/providers/Microsoft.Security/settings/WDATP\",\r\n \"name\": \"WDATP\",\r\n \"type\": \"Microsoft.Security/settings\",\r\n \"kind\": \"DataExportSettings\",\r\n \"properties\": {\r\n \"enabled\": true\r\n }\r\n }\r\n ]\r\n}", + "StatusCode": 200 + } + ], + "Names": {}, + "Variables": { + "SubscriptionId": "487bb485-b5b0-471e-9c0d-10717612f869" + } +} \ No newline at end of file diff --git a/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingsTests/SetSubscriptionLevelResource.json b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingsTests/SetSubscriptionLevelResource.json new file mode 100644 index 000000000000..e6283d67299b --- /dev/null +++ b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingsTests/SetSubscriptionLevelResource.json @@ -0,0 +1,140 @@ +{ + "Entries": [ + { + "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/providers/Microsoft.Security/settings/MCAS?api-version=2019-01-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Byb3ZpZGVycy9NaWNyb3NvZnQuU2VjdXJpdHkvc2V0dGluZ3MvTUNBUz9hcGktdmVyc2lvbj0yMDE5LTAxLTAx", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "x-ms-client-request-id": [ + "c911d436-80ba-4e12-b6cc-dd5fe7b9a949" + ], + "Accept-Language": [ + "en-US" + ], + "User-Agent": [ + "FxVersion/4.6.28207.03", + "OSName/Windows", + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" + ] + }, + "ResponseHeaders": { + "Cache-Control": [ + "no-cache" + ], + "Pragma": [ + "no-cache" + ], + "x-ms-request-id": [ + "70bcdb30-9ede-4d8a-a865-f4adb53773b5" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ], + "x-ms-ratelimit-remaining-subscription-resource-requests": [ + "749" + ], + "x-ms-correlation-request-id": [ + "321bf19c-c420-4bb3-bf22-56b999a813c1" + ], + "x-ms-routing-request-id": [ + "GERMANYWESTCENTRAL:20200508T090301Z:321bf19c-c420-4bb3-bf22-56b999a813c1" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "X-Content-Type-Options": [ + "nosniff" + ], + "Date": [ + "Fri, 08 May 2020 09:03:00 GMT" + ], + "Content-Length": [ + "212" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ] + }, + "ResponseBody": "{\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/providers/Microsoft.Security/settings/MCAS\",\r\n \"name\": \"MCAS\",\r\n \"type\": \"Microsoft.Security/settings\",\r\n \"kind\": \"DataExportSettings\",\r\n \"properties\": {\r\n \"enabled\": true\r\n }\r\n}", + "StatusCode": 200 + }, + { + "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/providers/Microsoft.Security/settings/MCAS?api-version=2019-01-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Byb3ZpZGVycy9NaWNyb3NvZnQuU2VjdXJpdHkvc2V0dGluZ3MvTUNBUz9hcGktdmVyc2lvbj0yMDE5LTAxLTAx", + "RequestMethod": "PUT", + "RequestBody": "{\r\n \"kind\": \"DataExportSettings\",\r\n \"properties\": {\r\n \"enabled\": true\r\n }\r\n}", + "RequestHeaders": { + "x-ms-client-request-id": [ + "5f13ad9b-9a5f-440f-be15-8fe3cdf25b43" + ], + "Accept-Language": [ + "en-US" + ], + "User-Agent": [ + "FxVersion/4.6.28207.03", + "OSName/Windows", + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Content-Length": [ + "82" + ] + }, + "ResponseHeaders": { + "Cache-Control": [ + "no-cache" + ], + "Pragma": [ + "no-cache" + ], + "x-ms-request-id": [ + "8020524c-a130-43e1-9b63-6eb041f4f5c5" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ], + "x-ms-ratelimit-remaining-subscription-resource-requests": [ + "249" + ], + "x-ms-correlation-request-id": [ + "c053dc92-4717-4c20-8e9e-2d640c901dee" + ], + "x-ms-routing-request-id": [ + "GERMANYWESTCENTRAL:20200508T090509Z:c053dc92-4717-4c20-8e9e-2d640c901dee" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "X-Content-Type-Options": [ + "nosniff" + ], + "Date": [ + "Fri, 08 May 2020 09:05:08 GMT" + ], + "Content-Length": [ + "212" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ] + }, + "ResponseBody": "{\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/providers/Microsoft.Security/settings/MCAS\",\r\n \"name\": \"MCAS\",\r\n \"type\": \"Microsoft.Security/settings\",\r\n \"kind\": \"DataExportSettings\",\r\n \"properties\": {\r\n \"enabled\": true\r\n }\r\n}", + "StatusCode": 200 + } + ], + "Names": {}, + "Variables": { + "SubscriptionId": "487bb485-b5b0-471e-9c0d-10717612f869" + } +} \ No newline at end of file From e38c9569b7ca9bb13ed674b86cae413672d5ef9e Mon Sep 17 00:00:00 2001 From: Tal Klein Date: Mon, 11 May 2020 12:20:33 +0300 Subject: [PATCH 05/26] Added session records --- .../GetSubscriptionLevelResource.json | 0 .../GetSubscriptionScope.json | 0 .../SetSubscriptionLevelResource.json | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename src/Security/Security.Test/SessionRecords/{Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingsTests => Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingTests}/GetSubscriptionLevelResource.json (100%) rename src/Security/Security.Test/SessionRecords/{Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingsTests => Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingTests}/GetSubscriptionScope.json (100%) rename src/Security/Security.Test/SessionRecords/{Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingsTests => Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingTests}/SetSubscriptionLevelResource.json (100%) diff --git a/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingsTests/GetSubscriptionLevelResource.json b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingTests/GetSubscriptionLevelResource.json similarity index 100% rename from src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingsTests/GetSubscriptionLevelResource.json rename to src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingTests/GetSubscriptionLevelResource.json diff --git a/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingsTests/GetSubscriptionScope.json b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingTests/GetSubscriptionScope.json similarity index 100% rename from src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingsTests/GetSubscriptionScope.json rename to src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingTests/GetSubscriptionScope.json diff --git a/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingsTests/SetSubscriptionLevelResource.json b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingTests/SetSubscriptionLevelResource.json similarity index 100% rename from src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingsTests/SetSubscriptionLevelResource.json rename to src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingTests/SetSubscriptionLevelResource.json From 560867de89c137e5dc1a0598a328b2d701b703dd Mon Sep 17 00:00:00 2001 From: Tal Klein Date: Thu, 14 May 2020 09:32:37 +0300 Subject: [PATCH 06/26] Re-run jit tests --- .../ScenarioTests/SecuritySettingTests.ps1 | 8 +- .../GetResourceGroupLevelResource.json | 64 ++++++++-------- .../GetResourceGroupScope.json | 70 +++++++++--------- .../GetResourceId.json | 64 ++++++++-------- .../GetSubscriptionScope.json | 72 +++++++++--------- .../RemoveResourceGroupLevelResource.json | 62 ++++++++-------- .../RemoveResourceId.json | 62 ++++++++-------- .../SetResourceGroupLevelResource.json | 42 +++++------ .../StartResourceGroupLevelResource.json | 74 +++++++++---------- .../Models/Settings/PSSecuritySetting.cs | 2 - .../Settings/PSSecuritySettingConverters.cs | 8 +- 11 files changed, 262 insertions(+), 266 deletions(-) diff --git a/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 b/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 index 8bf7250622e9..e04767d69127 100644 --- a/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 +++ b/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 @@ -40,13 +40,13 @@ Set an Azure Security Center setting #> function Set-AzureRmSecuritySetting-SubscriptionLevelResource { - $setting1 = Get-AzSecuritySetting -SettingName "MCAS" + $setting = Get-AzSecuritySetting -SettingName "MCAS" - Validate-Setting $setting1 + Validate-Setting $setting - $setting2 = Set-AzSecuritySetting -SettingName "MCAS" -SettingInput $setting1 + $updatedSetting = Set-AzSecuritySetting -SettingName "MCAS" -SettingInput $setting - Validate-Setting $setting2 + Validate-Setting $updatedSetting } <# diff --git a/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/GetResourceGroupLevelResource.json b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/GetResourceGroupLevelResource.json index 0b4575310803..911db4224338 100644 --- a/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/GetResourceGroupLevelResource.json +++ b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/GetResourceGroupLevelResource.json @@ -7,16 +7,16 @@ "RequestBody": "{\r\n \"properties\": {\r\n \"pricingTier\": \"Standard\"\r\n }\r\n}", "RequestHeaders": { "x-ms-client-request-id": [ - "b7109be3-4bc5-489a-ab83-09869fa140ce" + "07ce869b-870a-4d24-8f60-e91896bcf6fe" ], "Accept-Language": [ "en-US" ], "User-Agent": [ - "FxVersion/4.6.27414.06", + "FxVersion/4.6.28207.03", "OSName/Windows", - "OSVersion/Microsoft.Windows.10.0.17763.", - "Microsoft.Azure.Management.Security.SecurityCenterClient/1.0.0.0" + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" ], "Content-Type": [ "application/json; charset=utf-8" @@ -33,7 +33,7 @@ "no-cache" ], "x-ms-request-id": [ - "fbe902e7-1799-469e-a16f-8a6f531f50f7" + "e5f7b441-5097-4d3e-8eb6-c63c0fc932f2" ], "Server": [ "Microsoft-HTTPAPI/2.0" @@ -42,10 +42,10 @@ "249" ], "x-ms-correlation-request-id": [ - "8d533159-e0a3-4c2a-9f33-bb07c1aaf305" + "f19f85c2-86c2-4f6b-9fbd-30f33fca6b20" ], "x-ms-routing-request-id": [ - "UKSOUTH2:20190313T201235Z:8d533159-e0a3-4c2a-9f33-bb07c1aaf305" + "GERMANYWESTCENTRAL:20200513T114216Z:f19f85c2-86c2-4f6b-9fbd-30f33fca6b20" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -54,7 +54,7 @@ "nosniff" ], "Date": [ - "Wed, 13 Mar 2019 20:12:35 GMT" + "Wed, 13 May 2020 11:42:16 GMT" ], "Content-Length": [ "248" @@ -70,22 +70,22 @@ "StatusCode": 200 }, { - "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default?api-version=2015-06-01-preview", - "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9sb2NhdGlvbnMvY2VudHJhbHVzL2ppdE5ldHdvcmtBY2Nlc3NQb2xpY2llcy9kZWZhdWx0P2FwaS12ZXJzaW9uPTIwMTUtMDYtMDEtcHJldmlldw==", + "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default?api-version=2020-01-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9sb2NhdGlvbnMvY2VudHJhbHVzL2ppdE5ldHdvcmtBY2Nlc3NQb2xpY2llcy9kZWZhdWx0P2FwaS12ZXJzaW9uPTIwMjAtMDEtMDE=", "RequestMethod": "PUT", "RequestBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ]\r\n }\r\n}", "RequestHeaders": { "x-ms-client-request-id": [ - "01b7a73d-d3ef-4ea9-a290-29552c39a7d9" + "843f8f3a-5acc-45b4-b7bf-ab14b76616b7" ], "Accept-Language": [ "en-US" ], "User-Agent": [ - "FxVersion/4.6.27414.06", + "FxVersion/4.6.28207.03", "OSName/Windows", - "OSVersion/Microsoft.Windows.10.0.17763.", - "Microsoft.Azure.Management.Security.SecurityCenterClient/1.0.0.0" + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" ], "Content-Type": [ "application/json; charset=utf-8" @@ -102,7 +102,7 @@ "no-cache" ], "x-ms-request-id": [ - "deb17aef-54ac-467f-a0fd-6a1f3581c59a" + "b2b0940f-35e9-4c45-b827-98f28c95572d" ], "Server": [ "Microsoft-HTTPAPI/2.0" @@ -111,10 +111,10 @@ "1199" ], "x-ms-correlation-request-id": [ - "6df1acc4-dcc0-497f-b4eb-20245f75cc95" + "a7889bb0-81ca-4370-98c3-a803326b4344" ], "x-ms-routing-request-id": [ - "UKSOUTH2:20190313T201237Z:6df1acc4-dcc0-497f-b4eb-20245f75cc95" + "GERMANYWESTCENTRAL:20200513T114217Z:a7889bb0-81ca-4370-98c3-a803326b4344" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -123,10 +123,10 @@ "nosniff" ], "Date": [ - "Wed, 13 Mar 2019 20:12:36 GMT" + "Wed, 13 May 2020 11:42:17 GMT" ], "Content-Length": [ - "626" + "644" ], "Content-Type": [ "application/json; charset=utf-8" @@ -135,26 +135,26 @@ "-1" ] }, - "ResponseBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [],\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"centralus\"\r\n}", + "ResponseBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [],\r\n \"provisioningState\": \"Updating\",\r\n \"appendMode\": false\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"centralus\"\r\n}", "StatusCode": 200 }, { - "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default?api-version=2015-06-01-preview", - "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9sb2NhdGlvbnMvY2VudHJhbHVzL2ppdE5ldHdvcmtBY2Nlc3NQb2xpY2llcy9kZWZhdWx0P2FwaS12ZXJzaW9uPTIwMTUtMDYtMDEtcHJldmlldw==", + "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default?api-version=2020-01-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9sb2NhdGlvbnMvY2VudHJhbHVzL2ppdE5ldHdvcmtBY2Nlc3NQb2xpY2llcy9kZWZhdWx0P2FwaS12ZXJzaW9uPTIwMjAtMDEtMDE=", "RequestMethod": "GET", "RequestBody": "", "RequestHeaders": { "x-ms-client-request-id": [ - "6ce2c63b-887e-47a4-a9f1-7d94270178ca" + "6eb3500e-616d-4645-b212-5ea869178b59" ], "Accept-Language": [ "en-US" ], "User-Agent": [ - "FxVersion/4.6.27414.06", + "FxVersion/4.6.28207.03", "OSName/Windows", - "OSVersion/Microsoft.Windows.10.0.17763.", - "Microsoft.Azure.Management.Security.SecurityCenterClient/1.0.0.0" + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" ] }, "ResponseHeaders": { @@ -165,7 +165,7 @@ "no-cache" ], "x-ms-request-id": [ - "23a8fa5f-46d9-404e-abff-6a707657bf7a" + "4a9a99b1-0979-4755-9359-a6164c1c62f5" ], "Server": [ "Microsoft-HTTPAPI/2.0" @@ -174,10 +174,10 @@ "749" ], "x-ms-correlation-request-id": [ - "d7958fde-d2a2-479d-9f04-520c03bb48e5" + "024b2900-dbfa-480f-a9cd-e50a72b9ef84" ], "x-ms-routing-request-id": [ - "UKSOUTH2:20190313T201237Z:d7958fde-d2a2-479d-9f04-520c03bb48e5" + "GERMANYWESTCENTRAL:20200513T114217Z:024b2900-dbfa-480f-a9cd-e50a72b9ef84" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -186,10 +186,10 @@ "nosniff" ], "Date": [ - "Wed, 13 Mar 2019 20:12:36 GMT" + "Wed, 13 May 2020 11:42:17 GMT" ], "Content-Length": [ - "626" + "644" ], "Content-Type": [ "application/json; charset=utf-8" @@ -198,7 +198,7 @@ "-1" ] }, - "ResponseBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [],\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"centralus\"\r\n}", + "ResponseBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [],\r\n \"provisioningState\": \"Updating\",\r\n \"appendMode\": false\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"centralus\"\r\n}", "StatusCode": 200 } ], diff --git a/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/GetResourceGroupScope.json b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/GetResourceGroupScope.json index 81171f92096e..44e1f2564b3a 100644 --- a/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/GetResourceGroupScope.json +++ b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/GetResourceGroupScope.json @@ -7,16 +7,16 @@ "RequestBody": "{\r\n \"properties\": {\r\n \"pricingTier\": \"Standard\"\r\n }\r\n}", "RequestHeaders": { "x-ms-client-request-id": [ - "9d125889-5fc7-4cea-bc05-5254de69dde0" + "a918b69a-b279-4318-b6b4-6963df3c8484" ], "Accept-Language": [ "en-US" ], "User-Agent": [ - "FxVersion/4.6.27414.06", + "FxVersion/4.6.28207.03", "OSName/Windows", - "OSVersion/Microsoft.Windows.10.0.17763.", - "Microsoft.Azure.Management.Security.SecurityCenterClient/1.0.0.0" + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" ], "Content-Type": [ "application/json; charset=utf-8" @@ -33,7 +33,7 @@ "no-cache" ], "x-ms-request-id": [ - "c8c10749-63e0-43e3-87ac-ba0a78acd30b" + "5b43b2b0-c5f2-4aac-b3a9-9214383167a1" ], "Server": [ "Microsoft-HTTPAPI/2.0" @@ -42,10 +42,10 @@ "249" ], "x-ms-correlation-request-id": [ - "5246509e-e6ef-450b-ae6f-1110ad23af60" + "715c307f-6e89-43e7-a0b6-1fb2a5ec8047" ], "x-ms-routing-request-id": [ - "UKSOUTH2:20190313T201223Z:5246509e-e6ef-450b-ae6f-1110ad23af60" + "GERMANYWESTCENTRAL:20200513T114149Z:715c307f-6e89-43e7-a0b6-1fb2a5ec8047" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -54,7 +54,7 @@ "nosniff" ], "Date": [ - "Wed, 13 Mar 2019 20:12:22 GMT" + "Wed, 13 May 2020 11:41:49 GMT" ], "Content-Length": [ "248" @@ -70,22 +70,22 @@ "StatusCode": 200 }, { - "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default?api-version=2015-06-01-preview", - "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9sb2NhdGlvbnMvY2VudHJhbHVzL2ppdE5ldHdvcmtBY2Nlc3NQb2xpY2llcy9kZWZhdWx0P2FwaS12ZXJzaW9uPTIwMTUtMDYtMDEtcHJldmlldw==", + "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default?api-version=2020-01-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9sb2NhdGlvbnMvY2VudHJhbHVzL2ppdE5ldHdvcmtBY2Nlc3NQb2xpY2llcy9kZWZhdWx0P2FwaS12ZXJzaW9uPTIwMjAtMDEtMDE=", "RequestMethod": "PUT", "RequestBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ]\r\n }\r\n}", "RequestHeaders": { "x-ms-client-request-id": [ - "1d553fb5-c00e-49f6-975c-aea488aed7d8" + "418488ce-a271-4e24-a8d7-720dd20597c5" ], "Accept-Language": [ "en-US" ], "User-Agent": [ - "FxVersion/4.6.27414.06", + "FxVersion/4.6.28207.03", "OSName/Windows", - "OSVersion/Microsoft.Windows.10.0.17763.", - "Microsoft.Azure.Management.Security.SecurityCenterClient/1.0.0.0" + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" ], "Content-Type": [ "application/json; charset=utf-8" @@ -102,7 +102,7 @@ "no-cache" ], "x-ms-request-id": [ - "048b845e-b26c-4a05-8b2d-e1d4cf2e401d" + "b3a96e28-2464-47ed-8ec7-546633e6ff80" ], "Server": [ "Microsoft-HTTPAPI/2.0" @@ -111,10 +111,10 @@ "1199" ], "x-ms-correlation-request-id": [ - "1d4fb508-d1d0-4c3e-88c1-fbaee3f88caa" + "839e5b64-5995-4283-aa3e-6df0c7d2e354" ], "x-ms-routing-request-id": [ - "UKSOUTH2:20190313T201230Z:1d4fb508-d1d0-4c3e-88c1-fbaee3f88caa" + "GERMANYWESTCENTRAL:20200513T114150Z:839e5b64-5995-4283-aa3e-6df0c7d2e354" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -123,10 +123,10 @@ "nosniff" ], "Date": [ - "Wed, 13 Mar 2019 20:12:30 GMT" + "Wed, 13 May 2020 11:41:50 GMT" ], "Content-Length": [ - "626" + "644" ], "Content-Type": [ "application/json; charset=utf-8" @@ -135,26 +135,26 @@ "-1" ] }, - "ResponseBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [],\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"centralus\"\r\n}", + "ResponseBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [],\r\n \"provisioningState\": \"Updating\",\r\n \"appendMode\": false\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"centralus\"\r\n}", "StatusCode": 200 }, { - "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/jitNetworkAccessPolicies?api-version=2015-06-01-preview", - "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9qaXROZXR3b3JrQWNjZXNzUG9saWNpZXM/YXBpLXZlcnNpb249MjAxNS0wNi0wMS1wcmV2aWV3", + "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/jitNetworkAccessPolicies?api-version=2020-01-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9qaXROZXR3b3JrQWNjZXNzUG9saWNpZXM/YXBpLXZlcnNpb249MjAyMC0wMS0wMQ==", "RequestMethod": "GET", "RequestBody": "", "RequestHeaders": { "x-ms-client-request-id": [ - "31d0bde3-8142-4f6c-9315-20308fc012a2" + "5477c80b-535a-4d2f-a540-dfaa88f993e9" ], "Accept-Language": [ "en-US" ], "User-Agent": [ - "FxVersion/4.6.27414.06", + "FxVersion/4.6.28207.03", "OSName/Windows", - "OSVersion/Microsoft.Windows.10.0.17763.", - "Microsoft.Azure.Management.Security.SecurityCenterClient/1.0.0.0" + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" ] }, "ResponseHeaders": { @@ -165,21 +165,21 @@ "no-cache" ], "x-ms-original-request-ids": [ - "28790eac-5a0c-41e9-bfdf-4543f1bf8eef", - "be467cd1-170c-4cb6-b968-da8ae161b9cf", - "8297e0af-a0c1-4a72-bae7-aa1003d7d849" + "6550dcaa-bad4-47b7-aaaf-14e7cd30c95b", + "978432fc-47cb-40d9-bc97-8a5f354d8ab9", + "afa5b778-7688-4634-b4b9-5f8d092d28e4" ], "x-ms-ratelimit-remaining-subscription-resource-requests": [ "749" ], "x-ms-request-id": [ - "7284a9ea-0e44-4d7a-8df9-9153ec961439" + "d2772b93-e2f1-4235-bdb4-1384d03c8a07" ], "x-ms-correlation-request-id": [ - "7284a9ea-0e44-4d7a-8df9-9153ec961439" + "d2772b93-e2f1-4235-bdb4-1384d03c8a07" ], "x-ms-routing-request-id": [ - "UKSOUTH2:20190313T201230Z:7284a9ea-0e44-4d7a-8df9-9153ec961439" + "GERMANYWESTCENTRAL:20200513T114150Z:d2772b93-e2f1-4235-bdb4-1384d03c8a07" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -188,7 +188,7 @@ "nosniff" ], "Date": [ - "Wed, 13 Mar 2019 20:12:30 GMT" + "Wed, 13 May 2020 11:41:50 GMT" ], "Content-Type": [ "application/json; charset=utf-8" @@ -197,10 +197,10 @@ "-1" ], "Content-Length": [ - "1938" + "1581" ] }, - "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [],\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"centralus\"\r\n },\r\n {\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"*\",\r\n \"allowedSourceAddressPrefix\": \"*\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n },\r\n {\r\n \"number\": 3389,\r\n \"protocol\": \"*\",\r\n \"allowedSourceAddressPrefix\": \"*\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n },\r\n {\r\n \"number\": 5985,\r\n \"protocol\": \"*\",\r\n \"allowedSourceAddressPrefix\": \"*\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n },\r\n {\r\n \"number\": 5986,\r\n \"protocol\": \"*\",\r\n \"allowedSourceAddressPrefix\": \"*\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [\r\n {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 3389,\r\n \"allowedSourceAddressPrefix\": \"167.220.197.64\",\r\n \"endTimeUtc\": \"2019-03-04T16:44:10.7715194Z\",\r\n \"status\": \"Revoked\",\r\n \"statusReason\": \"Expired\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"startTimeUtc\": \"2019-03-04T13:44:11.4344709Z\",\r\n \"requestor\": \"\"\r\n }\r\n ],\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/northeurope/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"northeurope\"\r\n }\r\n ]\r\n}", + "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService1\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"*\",\r\n \"allowedSourceAddressPrefix\": \"*\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [],\r\n \"provisioningState\": \"Updating\",\r\n \"appendMode\": false\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"centralus\"\r\n },\r\n {\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"*\",\r\n \"allowedSourceAddressPrefix\": \"*\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n },\r\n {\r\n \"number\": 3389,\r\n \"protocol\": \"*\",\r\n \"allowedSourceAddressPrefix\": \"*\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n },\r\n {\r\n \"number\": 5985,\r\n \"protocol\": \"*\",\r\n \"allowedSourceAddressPrefix\": \"*\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n },\r\n {\r\n \"number\": 5986,\r\n \"protocol\": \"*\",\r\n \"allowedSourceAddressPrefix\": \"*\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [],\r\n \"provisioningState\": \"Succeeded\",\r\n \"appendMode\": false\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/northeurope/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"northeurope\"\r\n }\r\n ]\r\n}", "StatusCode": 200 } ], diff --git a/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/GetResourceId.json b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/GetResourceId.json index 65e4c6c71238..cc2218aac438 100644 --- a/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/GetResourceId.json +++ b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/GetResourceId.json @@ -7,16 +7,16 @@ "RequestBody": "{\r\n \"properties\": {\r\n \"pricingTier\": \"Standard\"\r\n }\r\n}", "RequestHeaders": { "x-ms-client-request-id": [ - "2f096d67-3ff8-4707-9b55-3578fbcd55a5" + "3a8e6506-c1f5-40d3-821a-5845b2c5fc18" ], "Accept-Language": [ "en-US" ], "User-Agent": [ - "FxVersion/4.6.27414.06", + "FxVersion/4.6.28207.03", "OSName/Windows", - "OSVersion/Microsoft.Windows.10.0.17763.", - "Microsoft.Azure.Management.Security.SecurityCenterClient/1.0.0.0" + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" ], "Content-Type": [ "application/json; charset=utf-8" @@ -33,7 +33,7 @@ "no-cache" ], "x-ms-request-id": [ - "d69c978a-30fe-43bf-b359-96cdcb82b623" + "b14094f3-f4f1-4ae3-b353-27ce780e2244" ], "Server": [ "Microsoft-HTTPAPI/2.0" @@ -42,10 +42,10 @@ "249" ], "x-ms-correlation-request-id": [ - "9e7b4527-a8e0-429c-aeeb-8701823490fc" + "6db0154b-ea31-4a35-a459-d354945677d0" ], "x-ms-routing-request-id": [ - "UKSOUTH2:20190313T201248Z:9e7b4527-a8e0-429c-aeeb-8701823490fc" + "GERMANYWESTCENTRAL:20200513T114232Z:6db0154b-ea31-4a35-a459-d354945677d0" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -54,7 +54,7 @@ "nosniff" ], "Date": [ - "Wed, 13 Mar 2019 20:12:47 GMT" + "Wed, 13 May 2020 11:42:31 GMT" ], "Content-Length": [ "248" @@ -70,22 +70,22 @@ "StatusCode": 200 }, { - "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default?api-version=2015-06-01-preview", - "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9sb2NhdGlvbnMvY2VudHJhbHVzL2ppdE5ldHdvcmtBY2Nlc3NQb2xpY2llcy9kZWZhdWx0P2FwaS12ZXJzaW9uPTIwMTUtMDYtMDEtcHJldmlldw==", + "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default?api-version=2020-01-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9sb2NhdGlvbnMvY2VudHJhbHVzL2ppdE5ldHdvcmtBY2Nlc3NQb2xpY2llcy9kZWZhdWx0P2FwaS12ZXJzaW9uPTIwMjAtMDEtMDE=", "RequestMethod": "PUT", "RequestBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ]\r\n }\r\n}", "RequestHeaders": { "x-ms-client-request-id": [ - "25fa4434-ec44-4807-8eb6-c85e998f3c11" + "ecefb380-845c-423c-bc48-ff12b1718ef2" ], "Accept-Language": [ "en-US" ], "User-Agent": [ - "FxVersion/4.6.27414.06", + "FxVersion/4.6.28207.03", "OSName/Windows", - "OSVersion/Microsoft.Windows.10.0.17763.", - "Microsoft.Azure.Management.Security.SecurityCenterClient/1.0.0.0" + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" ], "Content-Type": [ "application/json; charset=utf-8" @@ -102,7 +102,7 @@ "no-cache" ], "x-ms-request-id": [ - "28871e42-ad21-4445-bc73-edc402eae080" + "ed8956f2-c4af-4123-92dd-94ede8dc8a67" ], "Server": [ "Microsoft-HTTPAPI/2.0" @@ -111,10 +111,10 @@ "1199" ], "x-ms-correlation-request-id": [ - "c73b3ef3-29f8-4655-9083-d3aca5fa34e1" + "5040de79-3d8e-489f-94f6-1f82fd2babc3" ], "x-ms-routing-request-id": [ - "UKSOUTH2:20190313T201249Z:c73b3ef3-29f8-4655-9083-d3aca5fa34e1" + "GERMANYWESTCENTRAL:20200513T114233Z:5040de79-3d8e-489f-94f6-1f82fd2babc3" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -123,10 +123,10 @@ "nosniff" ], "Date": [ - "Wed, 13 Mar 2019 20:12:48 GMT" + "Wed, 13 May 2020 11:42:32 GMT" ], "Content-Length": [ - "626" + "644" ], "Content-Type": [ "application/json; charset=utf-8" @@ -135,26 +135,26 @@ "-1" ] }, - "ResponseBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [],\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"centralus\"\r\n}", + "ResponseBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [],\r\n \"provisioningState\": \"Updating\",\r\n \"appendMode\": false\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"centralus\"\r\n}", "StatusCode": 200 }, { - "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default?api-version=2015-06-01-preview", - "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9sb2NhdGlvbnMvY2VudHJhbHVzL2ppdE5ldHdvcmtBY2Nlc3NQb2xpY2llcy9kZWZhdWx0P2FwaS12ZXJzaW9uPTIwMTUtMDYtMDEtcHJldmlldw==", + "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default?api-version=2020-01-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9sb2NhdGlvbnMvY2VudHJhbHVzL2ppdE5ldHdvcmtBY2Nlc3NQb2xpY2llcy9kZWZhdWx0P2FwaS12ZXJzaW9uPTIwMjAtMDEtMDE=", "RequestMethod": "GET", "RequestBody": "", "RequestHeaders": { "x-ms-client-request-id": [ - "22e49673-f144-4840-989c-63615243a493" + "27f18d14-0c54-434b-a021-6fdffaa7d6df" ], "Accept-Language": [ "en-US" ], "User-Agent": [ - "FxVersion/4.6.27414.06", + "FxVersion/4.6.28207.03", "OSName/Windows", - "OSVersion/Microsoft.Windows.10.0.17763.", - "Microsoft.Azure.Management.Security.SecurityCenterClient/1.0.0.0" + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" ] }, "ResponseHeaders": { @@ -165,7 +165,7 @@ "no-cache" ], "x-ms-request-id": [ - "0fc0c6f9-114a-4b8e-bbbf-1d925e13a0bf" + "846f49f2-cdf9-4a59-a970-613d6697343b" ], "Server": [ "Microsoft-HTTPAPI/2.0" @@ -174,10 +174,10 @@ "749" ], "x-ms-correlation-request-id": [ - "318b7e87-3528-4794-8f63-afff57ade29b" + "611a29a2-b4c0-4a10-8369-0bfcad52b802" ], "x-ms-routing-request-id": [ - "UKSOUTH2:20190313T201249Z:318b7e87-3528-4794-8f63-afff57ade29b" + "GERMANYWESTCENTRAL:20200513T114233Z:611a29a2-b4c0-4a10-8369-0bfcad52b802" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -186,10 +186,10 @@ "nosniff" ], "Date": [ - "Wed, 13 Mar 2019 20:12:48 GMT" + "Wed, 13 May 2020 11:42:33 GMT" ], "Content-Length": [ - "626" + "644" ], "Content-Type": [ "application/json; charset=utf-8" @@ -198,7 +198,7 @@ "-1" ] }, - "ResponseBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [],\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"centralus\"\r\n}", + "ResponseBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [],\r\n \"provisioningState\": \"Updating\",\r\n \"appendMode\": false\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"centralus\"\r\n}", "StatusCode": 200 } ], diff --git a/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/GetSubscriptionScope.json b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/GetSubscriptionScope.json index f0b5604b08e5..3b2e731d8f2b 100644 --- a/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/GetSubscriptionScope.json +++ b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/GetSubscriptionScope.json @@ -7,16 +7,16 @@ "RequestBody": "{\r\n \"properties\": {\r\n \"pricingTier\": \"Standard\"\r\n }\r\n}", "RequestHeaders": { "x-ms-client-request-id": [ - "eb4edb83-2017-4f74-832d-d8f48f4e8de5" + "4a8f2b51-9a9f-4117-9adf-82b183faa7e8" ], "Accept-Language": [ "en-US" ], "User-Agent": [ - "FxVersion/4.6.27414.06", + "FxVersion/4.6.28207.03", "OSName/Windows", - "OSVersion/Microsoft.Windows.10.0.17763.", - "Microsoft.Azure.Management.Security.SecurityCenterClient/1.0.0.0" + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" ], "Content-Type": [ "application/json; charset=utf-8" @@ -33,7 +33,7 @@ "no-cache" ], "x-ms-request-id": [ - "89261a3c-f1c1-4427-b4ec-a478d24acad0" + "c2410d42-b56d-4542-a9ec-86404ad72fe5" ], "Server": [ "Microsoft-HTTPAPI/2.0" @@ -42,10 +42,10 @@ "248" ], "x-ms-correlation-request-id": [ - "d20d5603-4423-4dd3-8f40-df3dd72de1b5" + "45003f4a-c3c4-4201-bf84-fa4c867bfe21" ], "x-ms-routing-request-id": [ - "UKSOUTH2:20190313T201316Z:d20d5603-4423-4dd3-8f40-df3dd72de1b5" + "GERMANYWESTCENTRAL:20200513T151840Z:45003f4a-c3c4-4201-bf84-fa4c867bfe21" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -54,7 +54,7 @@ "nosniff" ], "Date": [ - "Wed, 13 Mar 2019 20:13:15 GMT" + "Wed, 13 May 2020 15:18:39 GMT" ], "Content-Length": [ "248" @@ -70,22 +70,22 @@ "StatusCode": 200 }, { - "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default?api-version=2015-06-01-preview", - "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9sb2NhdGlvbnMvY2VudHJhbHVzL2ppdE5ldHdvcmtBY2Nlc3NQb2xpY2llcy9kZWZhdWx0P2FwaS12ZXJzaW9uPTIwMTUtMDYtMDEtcHJldmlldw==", + "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default?api-version=2020-01-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9sb2NhdGlvbnMvY2VudHJhbHVzL2ppdE5ldHdvcmtBY2Nlc3NQb2xpY2llcy9kZWZhdWx0P2FwaS12ZXJzaW9uPTIwMjAtMDEtMDE=", "RequestMethod": "PUT", "RequestBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ]\r\n }\r\n}", "RequestHeaders": { "x-ms-client-request-id": [ - "333d0b22-50de-482a-b568-38b16a0341f6" + "bedc6690-ba7e-46b0-801a-1e9e778cb7ef" ], "Accept-Language": [ "en-US" ], "User-Agent": [ - "FxVersion/4.6.27414.06", + "FxVersion/4.6.28207.03", "OSName/Windows", - "OSVersion/Microsoft.Windows.10.0.17763.", - "Microsoft.Azure.Management.Security.SecurityCenterClient/1.0.0.0" + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" ], "Content-Type": [ "application/json; charset=utf-8" @@ -102,19 +102,19 @@ "no-cache" ], "x-ms-request-id": [ - "79cc021c-67e3-43a5-92ab-c25de7e517e3" + "104a3008-71c7-42cd-bc11-dbba28a4aefd" ], "Server": [ "Microsoft-HTTPAPI/2.0" ], "x-ms-ratelimit-remaining-subscription-writes": [ - "1199" + "1198" ], "x-ms-correlation-request-id": [ - "7b754686-b216-4054-91a5-68d2ca85805b" + "d6fba167-36d4-412a-887a-e47554b5da71" ], "x-ms-routing-request-id": [ - "UKSOUTH2:20190313T201317Z:7b754686-b216-4054-91a5-68d2ca85805b" + "GERMANYWESTCENTRAL:20200513T151841Z:d6fba167-36d4-412a-887a-e47554b5da71" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -123,10 +123,10 @@ "nosniff" ], "Date": [ - "Wed, 13 Mar 2019 20:13:16 GMT" + "Wed, 13 May 2020 15:18:40 GMT" ], "Content-Length": [ - "626" + "644" ], "Content-Type": [ "application/json; charset=utf-8" @@ -135,26 +135,26 @@ "-1" ] }, - "ResponseBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [],\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"centralus\"\r\n}", + "ResponseBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [],\r\n \"provisioningState\": \"Updating\",\r\n \"appendMode\": false\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"centralus\"\r\n}", "StatusCode": 200 }, { - "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/providers/Microsoft.Security/jitNetworkAccessPolicies?api-version=2015-06-01-preview", - "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Byb3ZpZGVycy9NaWNyb3NvZnQuU2VjdXJpdHkvaml0TmV0d29ya0FjY2Vzc1BvbGljaWVzP2FwaS12ZXJzaW9uPTIwMTUtMDYtMDEtcHJldmlldw==", + "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/providers/Microsoft.Security/jitNetworkAccessPolicies?api-version=2020-01-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Byb3ZpZGVycy9NaWNyb3NvZnQuU2VjdXJpdHkvaml0TmV0d29ya0FjY2Vzc1BvbGljaWVzP2FwaS12ZXJzaW9uPTIwMjAtMDEtMDE=", "RequestMethod": "GET", "RequestBody": "", "RequestHeaders": { "x-ms-client-request-id": [ - "fc093c47-5c73-4238-a5e9-1f0f8898b6ed" + "dcf8fee1-d1f3-401f-b00e-2ea9e42f26d8" ], "Accept-Language": [ "en-US" ], "User-Agent": [ - "FxVersion/4.6.27414.06", + "FxVersion/4.6.28207.03", "OSName/Windows", - "OSVersion/Microsoft.Windows.10.0.17763.", - "Microsoft.Azure.Management.Security.SecurityCenterClient/1.0.0.0" + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" ] }, "ResponseHeaders": { @@ -165,21 +165,21 @@ "no-cache" ], "x-ms-original-request-ids": [ - "58d0fe45-6419-4cef-a7d5-10926effaa7a", - "bf66d480-fdb3-4d79-9df0-8806f63a6ef2", - "0ce99fd7-ab55-4096-b6b1-5136612f9257" + "04a5f316-611f-41e2-aa46-d1a0ec8fee96", + "916332d3-6cd9-44b8-92b3-b4e9e14a4e9a", + "43bc4660-a319-496d-bc2c-2d5aa074a61f" ], "x-ms-ratelimit-remaining-subscription-resource-requests": [ "749" ], "x-ms-request-id": [ - "36c060bd-cee6-4bef-b472-ea1ed57aab7c" + "d7401509-10e7-4cca-bc0d-652dc4b2beb5" ], "x-ms-correlation-request-id": [ - "36c060bd-cee6-4bef-b472-ea1ed57aab7c" + "d7401509-10e7-4cca-bc0d-652dc4b2beb5" ], "x-ms-routing-request-id": [ - "UKSOUTH2:20190313T201318Z:36c060bd-cee6-4bef-b472-ea1ed57aab7c" + "GERMANYWESTCENTRAL:20200513T151841Z:d7401509-10e7-4cca-bc0d-652dc4b2beb5" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -188,7 +188,7 @@ "nosniff" ], "Date": [ - "Wed, 13 Mar 2019 20:13:17 GMT" + "Wed, 13 May 2020 15:18:40 GMT" ], "Content-Type": [ "application/json; charset=utf-8" @@ -197,10 +197,10 @@ "-1" ], "Content-Length": [ - "2324" + "1877" ] }, - "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [\r\n {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"endTimeUtc\": \"2019-03-13T22:13:11.3215666Z\",\r\n \"status\": \"Initiated\",\r\n \"statusReason\": \"UserRequested\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"startTimeUtc\": \"2019-03-13T20:13:11.4862787Z\",\r\n \"requestor\": \"\"\r\n }\r\n ],\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"centralus\"\r\n },\r\n {\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"*\",\r\n \"allowedSourceAddressPrefix\": \"*\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n },\r\n {\r\n \"number\": 3389,\r\n \"protocol\": \"*\",\r\n \"allowedSourceAddressPrefix\": \"*\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n },\r\n {\r\n \"number\": 5985,\r\n \"protocol\": \"*\",\r\n \"allowedSourceAddressPrefix\": \"*\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n },\r\n {\r\n \"number\": 5986,\r\n \"protocol\": \"*\",\r\n \"allowedSourceAddressPrefix\": \"*\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [\r\n {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 3389,\r\n \"allowedSourceAddressPrefix\": \"167.220.197.64\",\r\n \"endTimeUtc\": \"2019-03-04T16:44:10.7715194Z\",\r\n \"status\": \"Revoked\",\r\n \"statusReason\": \"Expired\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"startTimeUtc\": \"2019-03-04T13:44:11.4344709Z\",\r\n \"requestor\": \"\"\r\n }\r\n ],\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/northeurope/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"northeurope\"\r\n }\r\n ]\r\n}", + "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [\r\n {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"endTimeUtc\": \"2020-05-13T17:18:22.009706Z\",\r\n \"status\": \"Initiated\",\r\n \"statusReason\": \"UserRequested\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"startTimeUtc\": \"2020-05-13T15:18:22.54646Z\",\r\n \"requestor\": \"\"\r\n }\r\n ],\r\n \"provisioningState\": \"Updating\",\r\n \"appendMode\": false\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"centralus\"\r\n },\r\n {\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 3389,\r\n \"protocol\": \"*\",\r\n \"allowedSourceAddressPrefix\": \"*\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n },\r\n {\r\n \"number\": 5985,\r\n \"protocol\": \"*\",\r\n \"allowedSourceAddressPrefix\": \"*\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n },\r\n {\r\n \"number\": 5986,\r\n \"protocol\": \"*\",\r\n \"allowedSourceAddressPrefix\": \"*\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [],\r\n \"provisioningState\": \"Succeeded\",\r\n \"appendMode\": false\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/northeurope/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"northeurope\"\r\n }\r\n ]\r\n}", "StatusCode": 200 } ], diff --git a/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/RemoveResourceGroupLevelResource.json b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/RemoveResourceGroupLevelResource.json index 12d3e09f060a..bd9d32d81c3d 100644 --- a/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/RemoveResourceGroupLevelResource.json +++ b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/RemoveResourceGroupLevelResource.json @@ -7,16 +7,16 @@ "RequestBody": "{\r\n \"properties\": {\r\n \"pricingTier\": \"Standard\"\r\n }\r\n}", "RequestHeaders": { "x-ms-client-request-id": [ - "9e24fef1-b25c-4467-9886-0bc5f083f389" + "6f5d1090-eba9-4b9a-9be4-1c4b47b0602d" ], "Accept-Language": [ "en-US" ], "User-Agent": [ - "FxVersion/4.6.27414.06", + "FxVersion/4.6.28207.03", "OSName/Windows", - "OSVersion/Microsoft.Windows.10.0.17763.", - "Microsoft.Azure.Management.Security.SecurityCenterClient/1.0.0.0" + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" ], "Content-Type": [ "application/json; charset=utf-8" @@ -33,19 +33,19 @@ "no-cache" ], "x-ms-request-id": [ - "d199289d-fb74-483f-89f1-a9972576c4e7" + "6ccf439b-0416-4eb5-b137-7e4f10573705" ], "Server": [ "Microsoft-HTTPAPI/2.0" ], "x-ms-ratelimit-remaining-subscription-resource-requests": [ - "247" + "249" ], "x-ms-correlation-request-id": [ - "c341f791-842a-4b24-ac34-cf803f92fa3e" + "a22e5ba3-da0d-41b4-adf4-1e069f60e023" ], "x-ms-routing-request-id": [ - "UKSOUTH2:20190313T201301Z:c341f791-842a-4b24-ac34-cf803f92fa3e" + "GERMANYWESTCENTRAL:20200513T114249Z:a22e5ba3-da0d-41b4-adf4-1e069f60e023" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -54,7 +54,7 @@ "nosniff" ], "Date": [ - "Wed, 13 Mar 2019 20:13:00 GMT" + "Wed, 13 May 2020 11:42:48 GMT" ], "Content-Length": [ "248" @@ -70,22 +70,22 @@ "StatusCode": 200 }, { - "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default?api-version=2015-06-01-preview", - "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9sb2NhdGlvbnMvY2VudHJhbHVzL2ppdE5ldHdvcmtBY2Nlc3NQb2xpY2llcy9kZWZhdWx0P2FwaS12ZXJzaW9uPTIwMTUtMDYtMDEtcHJldmlldw==", + "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default?api-version=2020-01-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9sb2NhdGlvbnMvY2VudHJhbHVzL2ppdE5ldHdvcmtBY2Nlc3NQb2xpY2llcy9kZWZhdWx0P2FwaS12ZXJzaW9uPTIwMjAtMDEtMDE=", "RequestMethod": "PUT", "RequestBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ]\r\n }\r\n}", "RequestHeaders": { "x-ms-client-request-id": [ - "b0c4d87e-0f9d-420b-bf93-c371df491f18" + "20ee64cd-f9ea-4e98-84e4-432ce94cafaa" ], "Accept-Language": [ "en-US" ], "User-Agent": [ - "FxVersion/4.6.27414.06", + "FxVersion/4.6.28207.03", "OSName/Windows", - "OSVersion/Microsoft.Windows.10.0.17763.", - "Microsoft.Azure.Management.Security.SecurityCenterClient/1.0.0.0" + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" ], "Content-Type": [ "application/json; charset=utf-8" @@ -102,7 +102,7 @@ "no-cache" ], "x-ms-request-id": [ - "35060083-f9ea-44e4-aa5f-a974ada91804" + "e6f926ed-77b6-47ad-9094-46fe19487a35" ], "Server": [ "Microsoft-HTTPAPI/2.0" @@ -111,10 +111,10 @@ "1199" ], "x-ms-correlation-request-id": [ - "39a8e200-dc84-4c25-a638-17da66689331" + "8459b79c-51cb-4b33-887f-46500fba4c22" ], "x-ms-routing-request-id": [ - "UKSOUTH2:20190313T201303Z:39a8e200-dc84-4c25-a638-17da66689331" + "GERMANYWESTCENTRAL:20200513T114250Z:8459b79c-51cb-4b33-887f-46500fba4c22" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -123,10 +123,10 @@ "nosniff" ], "Date": [ - "Wed, 13 Mar 2019 20:13:02 GMT" + "Wed, 13 May 2020 11:42:49 GMT" ], "Content-Length": [ - "626" + "644" ], "Content-Type": [ "application/json; charset=utf-8" @@ -135,26 +135,26 @@ "-1" ] }, - "ResponseBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [],\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"centralus\"\r\n}", + "ResponseBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [],\r\n \"provisioningState\": \"Updating\",\r\n \"appendMode\": false\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"centralus\"\r\n}", "StatusCode": 200 }, { - "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default?api-version=2015-06-01-preview", - "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9sb2NhdGlvbnMvY2VudHJhbHVzL2ppdE5ldHdvcmtBY2Nlc3NQb2xpY2llcy9kZWZhdWx0P2FwaS12ZXJzaW9uPTIwMTUtMDYtMDEtcHJldmlldw==", + "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default?api-version=2020-01-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9sb2NhdGlvbnMvY2VudHJhbHVzL2ppdE5ldHdvcmtBY2Nlc3NQb2xpY2llcy9kZWZhdWx0P2FwaS12ZXJzaW9uPTIwMjAtMDEtMDE=", "RequestMethod": "DELETE", "RequestBody": "", "RequestHeaders": { "x-ms-client-request-id": [ - "e0ca93d8-50a8-4edf-874f-e4c23af299e6" + "9b39cb8f-42a9-4cc4-90f1-58febad388e2" ], "Accept-Language": [ "en-US" ], "User-Agent": [ - "FxVersion/4.6.27414.06", + "FxVersion/4.6.28207.03", "OSName/Windows", - "OSVersion/Microsoft.Windows.10.0.17763.", - "Microsoft.Azure.Management.Security.SecurityCenterClient/1.0.0.0" + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" ] }, "ResponseHeaders": { @@ -165,7 +165,7 @@ "no-cache" ], "x-ms-request-id": [ - "c1ef3968-eb6d-4444-b08a-19589cd29c26" + "e17de7a4-fbba-46aa-b50e-2794c0960eeb" ], "Server": [ "Microsoft-HTTPAPI/2.0" @@ -174,10 +174,10 @@ "14999" ], "x-ms-correlation-request-id": [ - "f9e13c6f-26b9-4db4-809e-eac658372c3f" + "5f495ea6-4562-4b61-992d-51cb67b6a568" ], "x-ms-routing-request-id": [ - "UKSOUTH2:20190313T201304Z:f9e13c6f-26b9-4db4-809e-eac658372c3f" + "GERMANYWESTCENTRAL:20200513T114318Z:5f495ea6-4562-4b61-992d-51cb67b6a568" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -186,7 +186,7 @@ "nosniff" ], "Date": [ - "Wed, 13 Mar 2019 20:13:03 GMT" + "Wed, 13 May 2020 11:43:18 GMT" ], "Expires": [ "-1" diff --git a/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/RemoveResourceId.json b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/RemoveResourceId.json index 9b9bd1374cd2..81d15d4ebdcd 100644 --- a/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/RemoveResourceId.json +++ b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/RemoveResourceId.json @@ -7,16 +7,16 @@ "RequestBody": "{\r\n \"properties\": {\r\n \"pricingTier\": \"Standard\"\r\n }\r\n}", "RequestHeaders": { "x-ms-client-request-id": [ - "ed31ebe2-853a-4eec-9d82-290de1bcb675" + "fc7550ee-c201-4d3f-b047-81248c651dc0" ], "Accept-Language": [ "en-US" ], "User-Agent": [ - "FxVersion/4.6.27414.06", + "FxVersion/4.6.28207.03", "OSName/Windows", - "OSVersion/Microsoft.Windows.10.0.17763.", - "Microsoft.Azure.Management.Security.SecurityCenterClient/1.0.0.0" + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" ], "Content-Type": [ "application/json; charset=utf-8" @@ -33,19 +33,19 @@ "no-cache" ], "x-ms-request-id": [ - "90f903be-5a96-47ff-8149-5652dcdff881" + "0a54c40d-cf1f-40bc-8977-e8ca5b352ae4" ], "Server": [ "Microsoft-HTTPAPI/2.0" ], "x-ms-ratelimit-remaining-subscription-resource-requests": [ - "248" + "249" ], "x-ms-correlation-request-id": [ - "8a803116-d163-4619-ad1f-edde619ac1c7" + "e06c881c-3ba9-4ba5-907e-7815b035f2a3" ], "x-ms-routing-request-id": [ - "UKSOUTH2:20190313T201254Z:8a803116-d163-4619-ad1f-edde619ac1c7" + "GERMANYWESTCENTRAL:20200513T114240Z:e06c881c-3ba9-4ba5-907e-7815b035f2a3" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -54,7 +54,7 @@ "nosniff" ], "Date": [ - "Wed, 13 Mar 2019 20:12:53 GMT" + "Wed, 13 May 2020 11:42:40 GMT" ], "Content-Length": [ "248" @@ -70,22 +70,22 @@ "StatusCode": 200 }, { - "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default?api-version=2015-06-01-preview", - "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9sb2NhdGlvbnMvY2VudHJhbHVzL2ppdE5ldHdvcmtBY2Nlc3NQb2xpY2llcy9kZWZhdWx0P2FwaS12ZXJzaW9uPTIwMTUtMDYtMDEtcHJldmlldw==", + "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default?api-version=2020-01-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9sb2NhdGlvbnMvY2VudHJhbHVzL2ppdE5ldHdvcmtBY2Nlc3NQb2xpY2llcy9kZWZhdWx0P2FwaS12ZXJzaW9uPTIwMjAtMDEtMDE=", "RequestMethod": "PUT", "RequestBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ]\r\n }\r\n}", "RequestHeaders": { "x-ms-client-request-id": [ - "573e1225-5b83-42b0-b5b6-fa24a9d5589d" + "d5cfe526-712f-4e86-909f-56876a3b7905" ], "Accept-Language": [ "en-US" ], "User-Agent": [ - "FxVersion/4.6.27414.06", + "FxVersion/4.6.28207.03", "OSName/Windows", - "OSVersion/Microsoft.Windows.10.0.17763.", - "Microsoft.Azure.Management.Security.SecurityCenterClient/1.0.0.0" + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" ], "Content-Type": [ "application/json; charset=utf-8" @@ -102,7 +102,7 @@ "no-cache" ], "x-ms-request-id": [ - "5fc28733-ea22-46f7-8ca8-d858886db145" + "52247aa6-4590-40c8-bb34-42a37d01b135" ], "Server": [ "Microsoft-HTTPAPI/2.0" @@ -111,10 +111,10 @@ "1199" ], "x-ms-correlation-request-id": [ - "3010becd-a713-416a-92d7-031dd1d5b8cb" + "6b192625-3cb0-4e56-97c9-6c33f209b4fb" ], "x-ms-routing-request-id": [ - "UKSOUTH2:20190313T201255Z:3010becd-a713-416a-92d7-031dd1d5b8cb" + "GERMANYWESTCENTRAL:20200513T114241Z:6b192625-3cb0-4e56-97c9-6c33f209b4fb" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -123,10 +123,10 @@ "nosniff" ], "Date": [ - "Wed, 13 Mar 2019 20:12:54 GMT" + "Wed, 13 May 2020 11:42:41 GMT" ], "Content-Length": [ - "626" + "644" ], "Content-Type": [ "application/json; charset=utf-8" @@ -135,26 +135,26 @@ "-1" ] }, - "ResponseBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [],\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"centralus\"\r\n}", + "ResponseBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [],\r\n \"provisioningState\": \"Updating\",\r\n \"appendMode\": false\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"centralus\"\r\n}", "StatusCode": 200 }, { - "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default?api-version=2015-06-01-preview", - "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9sb2NhdGlvbnMvY2VudHJhbHVzL2ppdE5ldHdvcmtBY2Nlc3NQb2xpY2llcy9kZWZhdWx0P2FwaS12ZXJzaW9uPTIwMTUtMDYtMDEtcHJldmlldw==", + "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default?api-version=2020-01-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9sb2NhdGlvbnMvY2VudHJhbHVzL2ppdE5ldHdvcmtBY2Nlc3NQb2xpY2llcy9kZWZhdWx0P2FwaS12ZXJzaW9uPTIwMjAtMDEtMDE=", "RequestMethod": "DELETE", "RequestBody": "", "RequestHeaders": { "x-ms-client-request-id": [ - "424309cc-c2fe-4007-bf66-1da68f3f3d05" + "ed6f3698-ea40-4188-a6a9-c2a6100046f5" ], "Accept-Language": [ "en-US" ], "User-Agent": [ - "FxVersion/4.6.27414.06", + "FxVersion/4.6.28207.03", "OSName/Windows", - "OSVersion/Microsoft.Windows.10.0.17763.", - "Microsoft.Azure.Management.Security.SecurityCenterClient/1.0.0.0" + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" ] }, "ResponseHeaders": { @@ -165,7 +165,7 @@ "no-cache" ], "x-ms-request-id": [ - "4d4138b2-0f31-41c9-97ac-66b943401454" + "722d3438-1d85-4813-bf49-4fe211cede1e" ], "Server": [ "Microsoft-HTTPAPI/2.0" @@ -174,10 +174,10 @@ "14999" ], "x-ms-correlation-request-id": [ - "2cdacc2b-bf18-404a-beb0-91edc3186219" + "100e0945-9204-49dc-910f-3956a8bee371" ], "x-ms-routing-request-id": [ - "UKSOUTH2:20190313T201256Z:2cdacc2b-bf18-404a-beb0-91edc3186219" + "GERMANYWESTCENTRAL:20200513T114242Z:100e0945-9204-49dc-910f-3956a8bee371" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -186,7 +186,7 @@ "nosniff" ], "Date": [ - "Wed, 13 Mar 2019 20:12:56 GMT" + "Wed, 13 May 2020 11:42:42 GMT" ], "Expires": [ "-1" diff --git a/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/SetResourceGroupLevelResource.json b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/SetResourceGroupLevelResource.json index 980cb37b897b..30202375604e 100644 --- a/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/SetResourceGroupLevelResource.json +++ b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/SetResourceGroupLevelResource.json @@ -7,16 +7,16 @@ "RequestBody": "{\r\n \"properties\": {\r\n \"pricingTier\": \"Standard\"\r\n }\r\n}", "RequestHeaders": { "x-ms-client-request-id": [ - "5e6d3b93-1345-4932-81eb-c7b3f11129f4" + "ffa8c747-fc12-4787-9663-f68478b77c07" ], "Accept-Language": [ "en-US" ], "User-Agent": [ - "FxVersion/4.6.27414.06", + "FxVersion/4.6.28207.03", "OSName/Windows", - "OSVersion/Microsoft.Windows.10.0.17763.", - "Microsoft.Azure.Management.Security.SecurityCenterClient/1.0.0.0" + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" ], "Content-Type": [ "application/json; charset=utf-8" @@ -33,19 +33,19 @@ "no-cache" ], "x-ms-request-id": [ - "bfd86ebc-0dbd-49d9-8fe6-bc17b727167a" + "75719ae0-64f2-4525-aa16-ddd00aa061e7" ], "Server": [ "Microsoft-HTTPAPI/2.0" ], "x-ms-ratelimit-remaining-subscription-resource-requests": [ - "248" + "249" ], "x-ms-correlation-request-id": [ - "7a578bc8-0843-4aeb-8186-dabae9505e10" + "fb95e6c3-31e8-40c5-94d7-63f603c81275" ], "x-ms-routing-request-id": [ - "UKSOUTH2:20190313T201242Z:7a578bc8-0843-4aeb-8186-dabae9505e10" + "GERMANYWESTCENTRAL:20200513T114224Z:fb95e6c3-31e8-40c5-94d7-63f603c81275" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -54,7 +54,7 @@ "nosniff" ], "Date": [ - "Wed, 13 Mar 2019 20:12:42 GMT" + "Wed, 13 May 2020 11:42:24 GMT" ], "Content-Length": [ "248" @@ -70,22 +70,22 @@ "StatusCode": 200 }, { - "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default?api-version=2015-06-01-preview", - "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9sb2NhdGlvbnMvY2VudHJhbHVzL2ppdE5ldHdvcmtBY2Nlc3NQb2xpY2llcy9kZWZhdWx0P2FwaS12ZXJzaW9uPTIwMTUtMDYtMDEtcHJldmlldw==", + "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default?api-version=2020-01-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9sb2NhdGlvbnMvY2VudHJhbHVzL2ppdE5ldHdvcmtBY2Nlc3NQb2xpY2llcy9kZWZhdWx0P2FwaS12ZXJzaW9uPTIwMjAtMDEtMDE=", "RequestMethod": "PUT", "RequestBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ]\r\n }\r\n}", "RequestHeaders": { "x-ms-client-request-id": [ - "7ee9133c-d7bc-4328-a621-a8c68e90ba1f" + "2af60966-d8ea-43b4-8981-61dc5f3dbfca" ], "Accept-Language": [ "en-US" ], "User-Agent": [ - "FxVersion/4.6.27414.06", + "FxVersion/4.6.28207.03", "OSName/Windows", - "OSVersion/Microsoft.Windows.10.0.17763.", - "Microsoft.Azure.Management.Security.SecurityCenterClient/1.0.0.0" + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" ], "Content-Type": [ "application/json; charset=utf-8" @@ -102,7 +102,7 @@ "no-cache" ], "x-ms-request-id": [ - "831c5072-1155-4562-a126-21ef9413edd6" + "f74148e0-855c-4581-bb3a-30c378e0357a" ], "Server": [ "Microsoft-HTTPAPI/2.0" @@ -111,10 +111,10 @@ "1199" ], "x-ms-correlation-request-id": [ - "c10691b4-839c-42b5-95af-f5f1c33b2662" + "809bb4e6-1348-4312-b51c-f2de44746e03" ], "x-ms-routing-request-id": [ - "UKSOUTH2:20190313T201243Z:c10691b4-839c-42b5-95af-f5f1c33b2662" + "GERMANYWESTCENTRAL:20200513T114225Z:809bb4e6-1348-4312-b51c-f2de44746e03" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -123,10 +123,10 @@ "nosniff" ], "Date": [ - "Wed, 13 Mar 2019 20:12:43 GMT" + "Wed, 13 May 2020 11:42:25 GMT" ], "Content-Length": [ - "626" + "644" ], "Content-Type": [ "application/json; charset=utf-8" @@ -135,7 +135,7 @@ "-1" ] }, - "ResponseBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [],\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"centralus\"\r\n}", + "ResponseBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [],\r\n \"provisioningState\": \"Updating\",\r\n \"appendMode\": false\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"centralus\"\r\n}", "StatusCode": 200 } ], diff --git a/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/StartResourceGroupLevelResource.json b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/StartResourceGroupLevelResource.json index 15ebb2dba2bf..18fe75aabb15 100644 --- a/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/StartResourceGroupLevelResource.json +++ b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecurityJitNetworkAccessPolicyTests/StartResourceGroupLevelResource.json @@ -7,16 +7,16 @@ "RequestBody": "{\r\n \"properties\": {\r\n \"pricingTier\": \"Standard\"\r\n }\r\n}", "RequestHeaders": { "x-ms-client-request-id": [ - "3f2cce72-181e-4c2f-a2e1-052d6e414847" + "a3c08d59-d60b-47bd-9a22-298a685dbc45" ], "Accept-Language": [ "en-US" ], "User-Agent": [ - "FxVersion/4.6.27414.06", + "FxVersion/4.6.28207.03", "OSName/Windows", - "OSVersion/Microsoft.Windows.10.0.17763.", - "Microsoft.Azure.Management.Security.SecurityCenterClient/1.0.0.0" + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" ], "Content-Type": [ "application/json; charset=utf-8" @@ -33,19 +33,19 @@ "no-cache" ], "x-ms-request-id": [ - "4dbe601a-48c1-45df-953b-fe6c4017af63" - ], - "x-ms-ratelimit-remaining-subscription-resource-requests": [ - "249" + "ef335765-b7db-419e-b931-57653408343a" ], "Server": [ "Microsoft-HTTPAPI/2.0" ], + "x-ms-ratelimit-remaining-subscription-resource-requests": [ + "249" + ], "x-ms-correlation-request-id": [ - "43852eb2-6e69-4b99-ab1c-daae41e862a3" + "26af06bd-1c94-4c74-baf6-ce77ecf0f94e" ], "x-ms-routing-request-id": [ - "UKSOUTH2:20190313T201309Z:43852eb2-6e69-4b99-ab1c-daae41e862a3" + "GERMANYWESTCENTRAL:20200513T151820Z:26af06bd-1c94-4c74-baf6-ce77ecf0f94e" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -54,7 +54,7 @@ "nosniff" ], "Date": [ - "Wed, 13 Mar 2019 20:13:09 GMT" + "Wed, 13 May 2020 15:18:20 GMT" ], "Content-Length": [ "248" @@ -70,22 +70,22 @@ "StatusCode": 200 }, { - "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default?api-version=2015-06-01-preview", - "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9sb2NhdGlvbnMvY2VudHJhbHVzL2ppdE5ldHdvcmtBY2Nlc3NQb2xpY2llcy9kZWZhdWx0P2FwaS12ZXJzaW9uPTIwMTUtMDYtMDEtcHJldmlldw==", + "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default?api-version=2020-01-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9sb2NhdGlvbnMvY2VudHJhbHVzL2ppdE5ldHdvcmtBY2Nlc3NQb2xpY2llcy9kZWZhdWx0P2FwaS12ZXJzaW9uPTIwMjAtMDEtMDE=", "RequestMethod": "PUT", "RequestBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ]\r\n }\r\n}", "RequestHeaders": { "x-ms-client-request-id": [ - "fb480bfe-3a50-407d-98d8-67bd474508a6" + "9fa7b04d-ee28-451f-869a-11046e9177fd" ], "Accept-Language": [ "en-US" ], "User-Agent": [ - "FxVersion/4.6.27414.06", + "FxVersion/4.6.28207.03", "OSName/Windows", - "OSVersion/Microsoft.Windows.10.0.17763.", - "Microsoft.Azure.Management.Security.SecurityCenterClient/1.0.0.0" + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" ], "Content-Type": [ "application/json; charset=utf-8" @@ -102,7 +102,7 @@ "no-cache" ], "x-ms-request-id": [ - "0b2943f1-5c5a-4629-9aee-f4daa3ef097c" + "65caaf33-fec1-4255-98ec-86c74cd5f2c4" ], "Server": [ "Microsoft-HTTPAPI/2.0" @@ -111,10 +111,10 @@ "1199" ], "x-ms-correlation-request-id": [ - "3256da83-7c21-4d35-973b-e304de7e1fd8" + "48196abb-7d76-49e3-bc8b-9748eda4326d" ], "x-ms-routing-request-id": [ - "UKSOUTH2:20190313T201311Z:3256da83-7c21-4d35-973b-e304de7e1fd8" + "GERMANYWESTCENTRAL:20200513T151821Z:48196abb-7d76-49e3-bc8b-9748eda4326d" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -123,10 +123,10 @@ "nosniff" ], "Date": [ - "Wed, 13 Mar 2019 20:13:10 GMT" + "Wed, 13 May 2020 15:18:21 GMT" ], "Content-Length": [ - "626" + "644" ], "Content-Type": [ "application/json; charset=utf-8" @@ -135,32 +135,32 @@ "-1" ] }, - "ResponseBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [],\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"centralus\"\r\n}", + "ResponseBody": "{\r\n \"kind\": \"Basic\",\r\n \"properties\": {\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"protocol\": \"TCP\",\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"maxRequestAccessDuration\": \"PT3H\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"requests\": [],\r\n \"provisioningState\": \"Updating\",\r\n \"appendMode\": false\r\n },\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.Security/locations/jitNetworkAccessPolicies\",\r\n \"location\": \"centralus\"\r\n}", "StatusCode": 200 }, { - "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default/initiate?api-version=2015-06-01-preview", - "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9sb2NhdGlvbnMvY2VudHJhbHVzL2ppdE5ldHdvcmtBY2Nlc3NQb2xpY2llcy9kZWZhdWx0L2luaXRpYXRlP2FwaS12ZXJzaW9uPTIwMTUtMDYtMDEtcHJldmlldw==", + "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Security/locations/centralus/jitNetworkAccessPolicies/default/initiate?api-version=2020-01-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Jlc291cmNlR3JvdXBzL215U2VydmljZTEvcHJvdmlkZXJzL01pY3Jvc29mdC5TZWN1cml0eS9sb2NhdGlvbnMvY2VudHJhbHVzL2ppdE5ldHdvcmtBY2Nlc3NQb2xpY2llcy9kZWZhdWx0L2luaXRpYXRlP2FwaS12ZXJzaW9uPTIwMjAtMDEtMDE=", "RequestMethod": "POST", - "RequestBody": "{\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"endTimeUtc\": \"2019-03-13T22:13:11.3215666Z\"\r\n }\r\n ]\r\n }\r\n ]\r\n}", + "RequestBody": "{\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"endTimeUtc\": \"2020-05-13T17:18:22.009706Z\"\r\n }\r\n ]\r\n }\r\n ]\r\n}", "RequestHeaders": { "x-ms-client-request-id": [ - "0a070124-c738-426f-ab06-ddd08605e4e0" + "f3025794-63b4-4e6a-81e5-87c60591f9e5" ], "Accept-Language": [ "en-US" ], "User-Agent": [ - "FxVersion/4.6.27414.06", + "FxVersion/4.6.28207.03", "OSName/Windows", - "OSVersion/Microsoft.Windows.10.0.17763.", - "Microsoft.Azure.Management.Security.SecurityCenterClient/1.0.0.0" + "OSVersion/Microsoft.Windows.10.0.18363.", + "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" ], "Content-Type": [ "application/json; charset=utf-8" ], "Content-Length": [ - "381" + "380" ] }, "ResponseHeaders": { @@ -171,7 +171,7 @@ "no-cache" ], "x-ms-request-id": [ - "3b364054-5c90-4619-893f-e4b8b49ccc74" + "b95f5fbc-5d4e-4b73-bb79-b68ae3bb92c4" ], "Server": [ "Microsoft-HTTPAPI/2.0" @@ -180,10 +180,10 @@ "1199" ], "x-ms-correlation-request-id": [ - "8ca7dae0-875a-4406-87be-72854b61d893" + "717a18d4-c5c2-47bc-8371-7a27fbbef9de" ], "x-ms-routing-request-id": [ - "UKSOUTH2:20190313T201311Z:8ca7dae0-875a-4406-87be-72854b61d893" + "GERMANYWESTCENTRAL:20200513T151822Z:717a18d4-c5c2-47bc-8371-7a27fbbef9de" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -192,10 +192,10 @@ "nosniff" ], "Date": [ - "Wed, 13 Mar 2019 20:13:11 GMT" + "Wed, 13 May 2020 15:18:22 GMT" ], "Content-Length": [ - "387" + "384" ], "Content-Type": [ "application/json; charset=utf-8" @@ -204,7 +204,7 @@ "-1" ] }, - "ResponseBody": "{\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"endTimeUtc\": \"2019-03-13T22:13:11.3215666Z\",\r\n \"status\": \"Initiating\",\r\n \"statusReason\": \"UserRequested\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"startTimeUtc\": \"2019-03-13T20:13:11.4862787Z\",\r\n \"requestor\": \"\"\r\n}", + "ResponseBody": "{\r\n \"virtualMachines\": [\r\n {\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/resourceGroups/myService1/providers/Microsoft.Compute/virtualMachines/testService\",\r\n \"ports\": [\r\n {\r\n \"number\": 22,\r\n \"allowedSourceAddressPrefix\": \"127.0.0.1\",\r\n \"endTimeUtc\": \"2020-05-13T17:18:22.009706Z\",\r\n \"status\": \"Initiating\",\r\n \"statusReason\": \"UserRequested\"\r\n }\r\n ]\r\n }\r\n ],\r\n \"startTimeUtc\": \"2020-05-13T15:18:22.54646Z\",\r\n \"requestor\": \"\"\r\n}", "StatusCode": 202 } ], diff --git a/src/Security/Security/Models/Settings/PSSecuritySetting.cs b/src/Security/Security/Models/Settings/PSSecuritySetting.cs index 4a71ec3779e1..ee5032542185 100644 --- a/src/Security/Security/Models/Settings/PSSecuritySetting.cs +++ b/src/Security/Security/Models/Settings/PSSecuritySetting.cs @@ -20,8 +20,6 @@ public class PSSecuritySetting public string Name { get; set; } - public string Kind { get; set; } - public string Type { get; set; } } } diff --git a/src/Security/Security/Models/Settings/PSSecuritySettingConverters.cs b/src/Security/Security/Models/Settings/PSSecuritySettingConverters.cs index 9dfc567d4876..37fe56e7bb10 100644 --- a/src/Security/Security/Models/Settings/PSSecuritySettingConverters.cs +++ b/src/Security/Security/Models/Settings/PSSecuritySettingConverters.cs @@ -26,10 +26,9 @@ public static PSSecuritySetting ConvertToPSType(this Setting value) { return new PSSecurityDataExportSetting() { - Id = ((DataExportSettings)value).Id, - Name = ((DataExportSettings)value).Name, - Kind = nameof(DataExportSettings), - Type = ((DataExportSettings)value).Type, + Id = value.Id, + Name = value.Name, + Type = value.Type, Enabled = ((DataExportSettings)value).Enabled }; } @@ -38,7 +37,6 @@ public static PSSecuritySetting ConvertToPSType(this Setting value) { Id = value.Id, Name = value.Name, - Kind = nameof(Setting), Type = value.Type }; } From 5f9d126fb6c3aabd7dc2eca46d1affaed320e71f Mon Sep 17 00:00:00 2001 From: Tal Klein Date: Thu, 14 May 2020 10:54:57 +0300 Subject: [PATCH 07/26] enabling piping support in settings cmdlet --- .../ScenarioTests/SecuritySettingTests.cs | 7 ++++ .../ScenarioTests/SecuritySettingTests.ps1 | 11 +++++++ .../Security/Cmdlets/Settings/SetSettings.cs | 32 ++++++++++++++++--- 3 files changed, 46 insertions(+), 4 deletions(-) diff --git a/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.cs b/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.cs index 9fe9733ee8b6..dc2c3aeedefc 100644 --- a/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.cs +++ b/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.cs @@ -50,5 +50,12 @@ public void SetSubscriptionLevelResource() { TestController.NewInstance.RunPowerShellTest(_logger, "Set-AzureRmSecuritySetting-SubscriptionLevelResource"); } + + [Fact] + [Trait(Category.AcceptanceType, Category.CheckIn)] + public void SetInputObject() + { + TestController.NewInstance.RunPowerShellTest(_logger, "Set-AzureRmSecuritySetting-InputObject"); + } } } \ No newline at end of file diff --git a/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 b/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 index e04767d69127..52dae07a433e 100644 --- a/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 +++ b/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 @@ -49,6 +49,17 @@ function Set-AzureRmSecuritySetting-SubscriptionLevelResource Validate-Setting $updatedSetting } +<# +.SYNOPSIS +Set an Azure Security Center setting +#> +function Set-AzureRmSecuritySetting-InputObject +{ + $updatedSetting = Get-AzSecuritySetting -SettingName "MCAS" | Set-AzSecuritySetting -Enabled $true + + Validate-Setting $updatedSetting +} + <# .SYNOPSIS Validates a list of security pricings diff --git a/src/Security/Security/Cmdlets/Settings/SetSettings.cs b/src/Security/Security/Cmdlets/Settings/SetSettings.cs index 7806d294e840..1d750b846501 100644 --- a/src/Security/Security/Cmdlets/Settings/SetSettings.cs +++ b/src/Security/Security/Cmdlets/Settings/SetSettings.cs @@ -34,13 +34,37 @@ public class SetSettings : SecurityCenterCmdletBase [ValidateNotNullOrEmpty] public PSSecuritySetting SettingInput { get; set; } + [Parameter(ParameterSetName = ParameterSetNames.InputObject, Mandatory = true, ValueFromPipeline = true, HelpMessage = ParameterHelpMessages.InputObject)] + [ValidateNotNullOrEmpty] + public PSSecuritySetting InputObject { get; set; } + + [Parameter(ParameterSetName = ParameterSetNames.InputObject, Mandatory = true, ValueFromPipeline = true, HelpMessage = ParameterHelpMessages.Status)] + public bool Enabled { get; set; } + public override void ExecuteCmdlet() { - var settingName = SettingName; - SettingInput.Name = SettingName; - var setting = SettingInput.ConvertToCSType(); + string settingName; + Setting setting; + + switch (ParameterSetName) + { + case ParameterSetNames.SubscriptionLevelResource: + SettingInput.Name = SettingName; + setting = SettingInput.ConvertToCSType(); + break; + case ParameterSetNames.InputObject: + if (InputObject.GetType().Name == nameof(PSSecurityDataExportSetting)) + { + ((PSSecurityDataExportSetting)InputObject).Enabled = Enabled ? Enabled : ((PSSecurityDataExportSetting)InputObject).Enabled; + } + SettingName = InputObject.Name; + setting = InputObject.ConvertToCSType(); + break; + default: + throw new PSInvalidOperationException(); + } - if (ShouldProcess(settingName, VerbsCommon.Set)) + if (ShouldProcess(SettingName, VerbsCommon.Set)) { var updatedSetting = SecurityCenterClient.Settings.UpdateWithHttpMessagesAsync(settingName, setting).GetAwaiter().GetResult().Body; From e3f72471770d4a24678719c6bdb01e336155bc91 Mon Sep 17 00:00:00 2001 From: Tal Klein Date: Thu, 14 May 2020 11:05:57 +0300 Subject: [PATCH 08/26] Name fix --- src/Security/Security/Cmdlets/Settings/SetSettings.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Security/Security/Cmdlets/Settings/SetSettings.cs b/src/Security/Security/Cmdlets/Settings/SetSettings.cs index 1d750b846501..01e3761c69c4 100644 --- a/src/Security/Security/Cmdlets/Settings/SetSettings.cs +++ b/src/Security/Security/Cmdlets/Settings/SetSettings.cs @@ -43,7 +43,6 @@ public class SetSettings : SecurityCenterCmdletBase public override void ExecuteCmdlet() { - string settingName; Setting setting; switch (ParameterSetName) @@ -66,7 +65,7 @@ public override void ExecuteCmdlet() if (ShouldProcess(SettingName, VerbsCommon.Set)) { - var updatedSetting = SecurityCenterClient.Settings.UpdateWithHttpMessagesAsync(settingName, setting).GetAwaiter().GetResult().Body; + var updatedSetting = SecurityCenterClient.Settings.UpdateWithHttpMessagesAsync(SettingName, setting).GetAwaiter().GetResult().Body; WriteObject(updatedSetting.ConvertToPSType(), enumerateCollection: false); } From 827d7b3ced2a4d49f8dd8b2921b655b70e3ffd4a Mon Sep 17 00:00:00 2001 From: Tal Klein Date: Thu, 14 May 2020 18:03:01 +0300 Subject: [PATCH 09/26] updated help --- .../ScenarioTests/SecuritySettingTests.ps1 | 4 +- .../Security/Common/ParameterHelpMessages.cs | 2 +- src/Security/Security/help/Az.Security.md | 28 +-- ...able-AzSecurityAdvancedThreatProtection.md | 4 +- ...able-AzSecurityAdvancedThreatProtection.md | 3 +- .../help/Get-AzDiscoveredSecuritySolution.md | 2 +- .../help/Get-AzExternalSecuritySolution.md | 2 +- .../help/Get-AzJitNetworkAccessPolicy.md | 2 +- .../Get-AzSecurityAdvancedThreatProtection.md | 4 +- .../Get-AzSecurityAutoProvisioningSetting.md | 2 +- .../Security/help/Get-AzSecurityCompliance.md | 2 +- .../Security/help/Get-AzSecurityContact.md | 2 +- .../Security/help/Get-AzSecurityLocation.md | 2 +- .../Security/help/Get-AzSecurityPricing.md | 2 +- .../Security/help/Get-AzSecuritySetting.md | 82 +++++++++ .../Security/help/Get-AzSecurityTask.md | 2 +- .../help/Get-AzSecurityWorkspaceSetting.md | 2 +- ...rityGroupAllowlistCustomAlertRuleObject.md | 4 +- ...urityGroupDenylistCustomAlertRuleObject.md | 5 +- ...rityGroupThresholdCustomAlertRuleObject.md | 4 +- ...DeviceSecurityGroupTimeWindowRuleObject.md | 5 +- ...lutionRecommendationConfigurationObject.md | 12 +- .../help/Remove-AzJitNetworkAccessPolicy.md | 2 +- .../Security/help/Remove-AzSecurityContact.md | 2 +- .../help/Remove-AzSecurityWorkspaceSetting.md | 2 +- .../help/Set-AzIotSecuritySolution.md | 54 +++--- .../help/Set-AzJitNetworkAccessPolicy.md | 2 +- .../Set-AzSecurityAutoProvisioningSetting.md | 2 +- .../Security/help/Set-AzSecurityContact.md | 2 +- .../Security/help/Set-AzSecurityPricing.md | 2 +- .../Security/help/Set-AzSecuritySetting.md | 162 ++++++++++++++++++ .../help/Set-AzSecurityWorkspaceSetting.md | 2 +- .../help/Start-AzJitNetworkAccessPolicy.md | 2 +- 33 files changed, 328 insertions(+), 83 deletions(-) create mode 100644 src/Security/Security/help/Get-AzSecuritySetting.md create mode 100644 src/Security/Security/help/Set-AzSecuritySetting.md diff --git a/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 b/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 index 52dae07a433e..327b3a8bea64 100644 --- a/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 +++ b/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 @@ -25,7 +25,7 @@ function Get-AzureRmSecuritySetting-SubscriptionScope <# .SYNOPSIS -Get Azure Security Center setting on a subscription +Get an Azure Security Center setting on a subscription #> function Get-AzureRmSecuritySetting-SubscriptionLevelResource { @@ -51,7 +51,7 @@ function Set-AzureRmSecuritySetting-SubscriptionLevelResource <# .SYNOPSIS -Set an Azure Security Center setting +Set an Azure Security Center setting on an InputObject #> function Set-AzureRmSecuritySetting-InputObject { diff --git a/src/Security/Security/Common/ParameterHelpMessages.cs b/src/Security/Security/Common/ParameterHelpMessages.cs index df60f788d7f6..6c1793dd99f3 100644 --- a/src/Security/Security/Common/ParameterHelpMessages.cs +++ b/src/Security/Security/Common/ParameterHelpMessages.cs @@ -30,7 +30,7 @@ public static class ParameterHelpMessages public const string PassThru = "Return whether the operation was successful."; public const string Tags = "Tags."; public const string DisplayName = "Display name."; - public const string Status = "Status ."; + public const string Status = "Status."; public const string Export = "Export data."; public const string DisabledDataSources = "Disabled data sources."; public const string IotHubs = "Iot hubs."; diff --git a/src/Security/Security/help/Az.Security.md b/src/Security/Security/help/Az.Security.md index 24b04bfd4ff8..debc9f40d87c 100644 --- a/src/Security/Security/help/Az.Security.md +++ b/src/Security/Security/help/Az.Security.md @@ -14,15 +14,14 @@ Azure Security Center gives you control over the security of your Azure subscrip ### [Disable-AzIotSecurityAnalyticsAggregatedAlert](Disable-AzIotSecurityAnalyticsAggregatedAlert.md) Dismiss Iot aggregated alert -## Az.Security Cmdlets ### [Disable-AzSecurityAdvancedThreatProtection](Disable-AzSecurityAdvancedThreatProtection.md) -Disables the advanced threat protection policy for a storage account. +Disables the advanced threat protection policy for a storage / cosmosDB account. ### [Enable-AzSecurityAdvancedThreatProtection](Enable-AzSecurityAdvancedThreatProtection.md) -Enables the advanced threat protection policy for a storage account. +Enables the advanced threat protection policy for a storage / cosmosDB account. ### [Get-AzDeviceSecurityGroup](Get-AzDeviceSecurityGroup.md) -Get device security group - IoT Hub security +Get device security group (IoT Hub security) ### [Get-AzDiscoveredSecuritySolution](Get-AzDiscoveredSecuritySolution.md) Gets security solutions that were discovered by Azure Security Center @@ -40,13 +39,13 @@ Get IoT security aggregated alert Get IoT security aggregated recommendation ### [Get-AzIotSecuritySolution](Get-AzIotSecuritySolution.md) -Get IoT security solution of IoT Hub +Get IoT security solution ### [Get-AzJitNetworkAccessPolicy](Get-AzJitNetworkAccessPolicy.md) Gets the JIT network access policies ### [Get-AzSecurityAdvancedThreatProtection](Get-AzSecurityAdvancedThreatProtection.md) -Gets the advanced threat protection policy for a storage account. +Gets the advanced threat protection policy for a storage / cosmosDB account. ### [Get-AzSecurityAlert](Get-AzSecurityAlert.md) Gets security alerts that were detected by Azure Security Center @@ -72,17 +71,20 @@ Gets the security tasks that Azure Security Center recommends you to do in order ### [Get-AzSecurityWorkspaceSetting](Get-AzSecurityWorkspaceSetting.md) Gets the configured security workspace settings on a subscription. +### [Get-AzSqlInformationProtectionPolicy](Get-AzSqlInformationProtectionPolicy.md) +Retrieves the effective tenant SQL information protection policy. + ### [New-AzDeviceSecurityGroupAllowlistCustomAlertRuleObject](New-AzDeviceSecurityGroupAllowlistCustomAlertRuleObject.md) -Create new allow list custom alert rule for device security group - IoT Security +Create new allow list custom alert rule for device security group (IoT Security) ### [New-AzDeviceSecurityGroupDenylistCustomAlertRuleObject](New-AzDeviceSecurityGroupDenylistCustomAlertRuleObject.md) -Create new deny list custom alert rule for device security group - IoT Security +Create new deny list custom alert rule for device security group (IoT Security) ### [New-AzDeviceSecurityGroupThresholdCustomAlertRuleObject](New-AzDeviceSecurityGroupThresholdCustomAlertRuleObject.md) -Create new threshold custom alert rule for device security group - IoT Security +Create new threshold custom alert rule for device security group (IoT Security) ### [New-AzDeviceSecurityGroupTimeWindowRuleObject](New-AzDeviceSecurityGroupTimeWindowRuleObject.md) -Create new time window rule for device security group - IoT Security +Create new time window rule for device security group (IoT Security) ### [New-AzIotSecuritySolutionRecommendationConfigurationObject](New-AzIotSecuritySolutionRecommendationConfigurationObject.md) Create new recommendation configuration for iot security solution @@ -96,9 +98,6 @@ Delete device security group ### [Remove-AzIotSecuritySolution](Remove-AzIotSecuritySolution.md) Delete IoT security solution -### [Get-AzSqlInformationProtectionPolicy](Get-AzSqlInformationProtectionPolicy.md) -Gets the SQL information protection policy. - ### [Remove-AzJitNetworkAccessPolicy](Remove-AzJitNetworkAccessPolicy.md) Deletes a JIT network access policy. @@ -133,10 +132,11 @@ Sets the pricing of Azure Security Center tier for a scope. Updates the workspace settings for the subscription. ### [Set-AzSqlInformationProtectionPolicy](Set-AzSqlInformationProtectionPolicy.md) -Sets the SQL information protection policy. +Sets the effective tenant SQL information protection policy. ### [Start-AzJitNetworkAccessPolicy](Start-AzJitNetworkAccessPolicy.md) Invokes a temporary network access request. ### [Update-AzIotSecuritySolution](Update-AzIotSecuritySolution.md) Update one or more of the following properties in IoT security solution: tags, recommendation configuration, user defined resources + diff --git a/src/Security/Security/help/DIsable-AzSecurityAdvancedThreatProtection.md b/src/Security/Security/help/DIsable-AzSecurityAdvancedThreatProtection.md index 50ab9d24010d..27d7da6ddf11 100644 --- a/src/Security/Security/help/DIsable-AzSecurityAdvancedThreatProtection.md +++ b/src/Security/Security/help/DIsable-AzSecurityAdvancedThreatProtection.md @@ -42,8 +42,8 @@ IsEnabled Id --------- -- False "/subscriptions/xxxxxxx-xxxx-xxxx-xxxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.DocumentDb/databaseAccounts/myCosmosDBAccount/" ``` -This command disables the advanced threat protection policy for resource id ` "/subscriptions/xxxxxxx-xxxx-xxxx-xxxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.DocumentDb/databaseAccounts/myCosmosDBAccount/"`. +This command disables the advanced threat protection policy for resource id ` "/subscriptions/xxxxxxx-xxxx-xxxx-xxxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.DocumentDb/databaseAccounts/myCosmosDBAccount/"`. ## PARAMETERS @@ -108,7 +108,7 @@ Accept wildcard characters: False ``` ### CommonParameters -This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216). +This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). ## INPUTS diff --git a/src/Security/Security/help/Enable-AzSecurityAdvancedThreatProtection.md b/src/Security/Security/help/Enable-AzSecurityAdvancedThreatProtection.md index e18a24084f53..56a12abeb327 100644 --- a/src/Security/Security/help/Enable-AzSecurityAdvancedThreatProtection.md +++ b/src/Security/Security/help/Enable-AzSecurityAdvancedThreatProtection.md @@ -42,6 +42,7 @@ IsEnabled Id --------- -- True "/subscriptions/xxxxxxx-xxxx-xxxx-xxxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.DocumentDb/databaseAccounts/myCosmosDBAccount/" ``` + This command enables the advanced threat protection policy for resource id ` "/subscriptions/xxxxxxx-xxxx-xxxx-xxxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.DocumentDb/databaseAccounts/myCosmosDBAccount/"`. ## PARAMETERS @@ -107,7 +108,7 @@ Accept wildcard characters: False ``` ### CommonParameters -This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216). +This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). ## INPUTS diff --git a/src/Security/Security/help/Get-AzDiscoveredSecuritySolution.md b/src/Security/Security/help/Get-AzDiscoveredSecuritySolution.md index b437c3620b8f..9b7c9aa379d4 100644 --- a/src/Security/Security/help/Get-AzDiscoveredSecuritySolution.md +++ b/src/Security/Security/help/Get-AzDiscoveredSecuritySolution.md @@ -140,7 +140,7 @@ Accept wildcard characters: False ``` ### CommonParameters -This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216). +This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). ## INPUTS diff --git a/src/Security/Security/help/Get-AzExternalSecuritySolution.md b/src/Security/Security/help/Get-AzExternalSecuritySolution.md index ab2a1e4526d2..cdda4ee4506a 100644 --- a/src/Security/Security/help/Get-AzExternalSecuritySolution.md +++ b/src/Security/Security/help/Get-AzExternalSecuritySolution.md @@ -182,7 +182,7 @@ Accept wildcard characters: False ``` ### CommonParameters -This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216). +This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). ## INPUTS diff --git a/src/Security/Security/help/Get-AzJitNetworkAccessPolicy.md b/src/Security/Security/help/Get-AzJitNetworkAccessPolicy.md index 4146e22f2a19..df658c49885a 100644 --- a/src/Security/Security/help/Get-AzJitNetworkAccessPolicy.md +++ b/src/Security/Security/help/Get-AzJitNetworkAccessPolicy.md @@ -173,7 +173,7 @@ Accept wildcard characters: False ``` ### CommonParameters -This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216). +This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). ## INPUTS diff --git a/src/Security/Security/help/Get-AzSecurityAdvancedThreatProtection.md b/src/Security/Security/help/Get-AzSecurityAdvancedThreatProtection.md index ff136551bb0a..94cf9647a71f 100644 --- a/src/Security/Security/help/Get-AzSecurityAdvancedThreatProtection.md +++ b/src/Security/Security/help/Get-AzSecurityAdvancedThreatProtection.md @@ -42,8 +42,8 @@ IsEnabled Id --------- -- True "/subscriptions/xxxxxxx-xxxx-xxxx-xxxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.DocumentDb/databaseAccounts/myCosmosDBAccount/" ``` -This command gets the advanced threat protection policy for resource id ` "/subscriptions/xxxxxxx-xxxx-xxxx-xxxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.DocumentDb/databaseAccounts/myCosmosDBAccount/"`. +This command gets the advanced threat protection policy for resource id ` "/subscriptions/xxxxxxx-xxxx-xxxx-xxxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.DocumentDb/databaseAccounts/myCosmosDBAccount/"`. ## PARAMETERS @@ -78,7 +78,7 @@ Accept wildcard characters: False ``` ### CommonParameters -This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216). +This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). ## INPUTS diff --git a/src/Security/Security/help/Get-AzSecurityAutoProvisioningSetting.md b/src/Security/Security/help/Get-AzSecurityAutoProvisioningSetting.md index bb5862eb02b3..52024ab3b74f 100644 --- a/src/Security/Security/help/Get-AzSecurityAutoProvisioningSetting.md +++ b/src/Security/Security/help/Get-AzSecurityAutoProvisioningSetting.md @@ -93,7 +93,7 @@ Accept wildcard characters: False ``` ### CommonParameters -This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216). +This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). ## INPUTS diff --git a/src/Security/Security/help/Get-AzSecurityCompliance.md b/src/Security/Security/help/Get-AzSecurityCompliance.md index 6887e7ce8c97..a11520e7cf29 100644 --- a/src/Security/Security/help/Get-AzSecurityCompliance.md +++ b/src/Security/Security/help/Get-AzSecurityCompliance.md @@ -187,7 +187,7 @@ Accept wildcard characters: False ``` ### CommonParameters -This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216). +This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). ## INPUTS diff --git a/src/Security/Security/help/Get-AzSecurityContact.md b/src/Security/Security/help/Get-AzSecurityContact.md index 3174f7bca39c..6244106fed4b 100644 --- a/src/Security/Security/help/Get-AzSecurityContact.md +++ b/src/Security/Security/help/Get-AzSecurityContact.md @@ -94,7 +94,7 @@ Accept wildcard characters: False ``` ### CommonParameters -This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216). +This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). ## INPUTS diff --git a/src/Security/Security/help/Get-AzSecurityLocation.md b/src/Security/Security/help/Get-AzSecurityLocation.md index 6581cb09642f..3cc5b9f34f1f 100644 --- a/src/Security/Security/help/Get-AzSecurityLocation.md +++ b/src/Security/Security/help/Get-AzSecurityLocation.md @@ -91,7 +91,7 @@ Accept wildcard characters: False ``` ### CommonParameters -This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216). +This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). ## INPUTS diff --git a/src/Security/Security/help/Get-AzSecurityPricing.md b/src/Security/Security/help/Get-AzSecurityPricing.md index 4c1bb50dd4be..a72248f63a31 100644 --- a/src/Security/Security/help/Get-AzSecurityPricing.md +++ b/src/Security/Security/help/Get-AzSecurityPricing.md @@ -103,7 +103,7 @@ Accept wildcard characters: False ``` ### CommonParameters -This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216). +This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). ## INPUTS diff --git a/src/Security/Security/help/Get-AzSecuritySetting.md b/src/Security/Security/help/Get-AzSecuritySetting.md new file mode 100644 index 000000000000..d4c125d20f2a --- /dev/null +++ b/src/Security/Security/help/Get-AzSecuritySetting.md @@ -0,0 +1,82 @@ +--- +external help file: Microsoft.Azure.PowerShell.Cmdlets.Security.dll-Help.xml +Module Name: Az.Security +online version: +schema: 2.0.0 +--- + +# Get-AzSecuritySetting + +## SYNOPSIS +{{ Fill in the Synopsis }} + +## SYNTAX + +### SubscriptionScope (Default) +``` +Get-AzSecuritySetting [-DefaultProfile ] [] +``` + +### SubscriptionLevelResource +``` +Get-AzSecuritySetting -SettingName [-DefaultProfile ] [] +``` + +## DESCRIPTION +{{ Fill in the Description }} + +## EXAMPLES + +### Example 1 +```powershell +PS C:\> {{ Add example code here }} +``` + +{{ Add example description here }} + +## PARAMETERS + +### -DefaultProfile +The credentials, account, tenant, and subscription used for communication with Azure. + +```yaml +Type: IAzureContextContainer +Parameter Sets: (All) +Aliases: AzContext, AzureRmContext, AzureCredential + +Required: False +Position: Named +Default value: None +Accept pipeline input: False +Accept wildcard characters: False +``` + +### -SettingName +Setting name. + +```yaml +Type: String +Parameter Sets: SubscriptionLevelResource +Aliases: + +Required: True +Position: Named +Default value: None +Accept pipeline input: False +Accept wildcard characters: False +``` + +### CommonParameters +This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). + +## INPUTS + +### None + +## OUTPUTS + +### Microsoft.Azure.Commands.Security.Models.Settings.PSSecuritySetting + +## NOTES + +## RELATED LINKS diff --git a/src/Security/Security/help/Get-AzSecurityTask.md b/src/Security/Security/help/Get-AzSecurityTask.md index 05c850c38460..13504dccda5c 100644 --- a/src/Security/Security/help/Get-AzSecurityTask.md +++ b/src/Security/Security/help/Get-AzSecurityTask.md @@ -153,7 +153,7 @@ Accept wildcard characters: False ``` ### CommonParameters -This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216). +This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). ## INPUTS diff --git a/src/Security/Security/help/Get-AzSecurityWorkspaceSetting.md b/src/Security/Security/help/Get-AzSecurityWorkspaceSetting.md index e9f77172ca0c..2069027ea7fb 100644 --- a/src/Security/Security/help/Get-AzSecurityWorkspaceSetting.md +++ b/src/Security/Security/help/Get-AzSecurityWorkspaceSetting.md @@ -92,7 +92,7 @@ Accept wildcard characters: False ``` ### CommonParameters -This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216). +This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). ## INPUTS diff --git a/src/Security/Security/help/New-AzDeviceSecurityGroupAllowlistCustomAlertRuleObject.md b/src/Security/Security/help/New-AzDeviceSecurityGroupAllowlistCustomAlertRuleObject.md index 717fe9af8bbd..030dbc3739dd 100644 --- a/src/Security/Security/help/New-AzDeviceSecurityGroupAllowlistCustomAlertRuleObject.md +++ b/src/Security/Security/help/New-AzDeviceSecurityGroupAllowlistCustomAlertRuleObject.md @@ -13,8 +13,8 @@ Create new allow list custom alert rule for device security group (IoT Security) ## SYNTAX ``` -New-AzDeviceSecurityGroupAllowlistCustomAlertRuleObject -Enabled -Type -AllowlistValue [-DefaultProfile ] - [] +New-AzDeviceSecurityGroupAllowlistCustomAlertRuleObject -Enabled -Type + -AllowlistValue [-DefaultProfile ] [] ``` ## DESCRIPTION diff --git a/src/Security/Security/help/New-AzDeviceSecurityGroupDenylistCustomAlertRuleObject.md b/src/Security/Security/help/New-AzDeviceSecurityGroupDenylistCustomAlertRuleObject.md index ab6b88e923a2..a2b0e16b02ae 100644 --- a/src/Security/Security/help/New-AzDeviceSecurityGroupDenylistCustomAlertRuleObject.md +++ b/src/Security/Security/help/New-AzDeviceSecurityGroupDenylistCustomAlertRuleObject.md @@ -13,8 +13,8 @@ Create new deny list custom alert rule for device security group (IoT Security) ## SYNTAX ``` -New-AzDeviceSecurityGroupDenylistCustomAlertRuleObject -Enabled -Type -DenylistValue [-DefaultProfile ] - [] +New-AzDeviceSecurityGroupDenylistCustomAlertRuleObject -Enabled -Type + -DenylistValue [-DefaultProfile ] [] ``` ## DESCRIPTION @@ -98,7 +98,6 @@ Accept pipeline input: False Accept wildcard characters: False ``` - ### CommonParameters This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). diff --git a/src/Security/Security/help/New-AzDeviceSecurityGroupThresholdCustomAlertRuleObject.md b/src/Security/Security/help/New-AzDeviceSecurityGroupThresholdCustomAlertRuleObject.md index 0c288fa7df25..ce274c474267 100644 --- a/src/Security/Security/help/New-AzDeviceSecurityGroupThresholdCustomAlertRuleObject.md +++ b/src/Security/Security/help/New-AzDeviceSecurityGroupThresholdCustomAlertRuleObject.md @@ -13,8 +13,8 @@ Create new threshold custom alert rule for device security group (IoT Security) ## SYNTAX ``` -New-AzDeviceSecurityGroupThresholdCustomAlertRuleObject -MinThreshold -MaxThreshold -Enabled -Type - [-DefaultProfile ] [] +New-AzDeviceSecurityGroupThresholdCustomAlertRuleObject -MinThreshold -MaxThreshold + -Enabled -Type [-DefaultProfile ] [] ``` ## DESCRIPTION diff --git a/src/Security/Security/help/New-AzDeviceSecurityGroupTimeWindowRuleObject.md b/src/Security/Security/help/New-AzDeviceSecurityGroupTimeWindowRuleObject.md index ec7017a165bd..c7b27aa62038 100644 --- a/src/Security/Security/help/New-AzDeviceSecurityGroupTimeWindowRuleObject.md +++ b/src/Security/Security/help/New-AzDeviceSecurityGroupTimeWindowRuleObject.md @@ -13,8 +13,9 @@ Create new time window rule for device security group (IoT Security) ## SYNTAX ``` -New-AzDeviceSecurityGroupTimeWindowRuleObject -TimeWindowSize -MinThreshold -MaxThreshold -Enabled -Type - [-DefaultProfile ] [] +New-AzDeviceSecurityGroupTimeWindowRuleObject -TimeWindowSize -MinThreshold + -MaxThreshold -Enabled -Type [-DefaultProfile ] + [] ``` ## DESCRIPTION diff --git a/src/Security/Security/help/New-AzIotSecuritySolutionRecommendationConfigurationObject.md b/src/Security/Security/help/New-AzIotSecuritySolutionRecommendationConfigurationObject.md index de6cb9e8d79d..01ad3345c69d 100644 --- a/src/Security/Security/help/New-AzIotSecuritySolutionRecommendationConfigurationObject.md +++ b/src/Security/Security/help/New-AzIotSecuritySolutionRecommendationConfigurationObject.md @@ -51,11 +51,11 @@ Accept pipeline input: False Accept wildcard characters: False ``` -### -RecommendationType -Recommendation type. +### -Enabled +Status . ```yaml -Type: System.String +Type: System.Boolean Parameter Sets: (All) Aliases: @@ -66,11 +66,11 @@ Accept pipeline input: False Accept wildcard characters: False ``` -### -Enabled -Status . +### -RecommendationType +Recommendation type. ```yaml -Type: System.Boolean +Type: System.String Parameter Sets: (All) Aliases: diff --git a/src/Security/Security/help/Remove-AzJitNetworkAccessPolicy.md b/src/Security/Security/help/Remove-AzJitNetworkAccessPolicy.md index ae2214a5096b..5ba54b128a17 100644 --- a/src/Security/Security/help/Remove-AzJitNetworkAccessPolicy.md +++ b/src/Security/Security/help/Remove-AzJitNetworkAccessPolicy.md @@ -181,7 +181,7 @@ Accept wildcard characters: False ``` ### CommonParameters -This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216). +This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). ## INPUTS diff --git a/src/Security/Security/help/Remove-AzSecurityContact.md b/src/Security/Security/help/Remove-AzSecurityContact.md index 220f449b911a..0173053cc461 100644 --- a/src/Security/Security/help/Remove-AzSecurityContact.md +++ b/src/Security/Security/help/Remove-AzSecurityContact.md @@ -150,7 +150,7 @@ Accept wildcard characters: False ``` ### CommonParameters -This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216). +This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). ## INPUTS diff --git a/src/Security/Security/help/Remove-AzSecurityWorkspaceSetting.md b/src/Security/Security/help/Remove-AzSecurityWorkspaceSetting.md index 7cc73688433e..3edebd22eb87 100644 --- a/src/Security/Security/help/Remove-AzSecurityWorkspaceSetting.md +++ b/src/Security/Security/help/Remove-AzSecurityWorkspaceSetting.md @@ -151,7 +151,7 @@ Accept wildcard characters: False ``` ### CommonParameters -This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216). +This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). ## INPUTS diff --git a/src/Security/Security/help/Set-AzIotSecuritySolution.md b/src/Security/Security/help/Set-AzIotSecuritySolution.md index 1bc40445fdd4..9331c4587687 100644 --- a/src/Security/Security/help/Set-AzIotSecuritySolution.md +++ b/src/Security/Security/help/Set-AzIotSecuritySolution.md @@ -158,6 +158,33 @@ Accept pipeline input: False Accept wildcard characters: False ``` +### -Enabled +Status . + +```yaml +Type: System.Boolean +Parameter Sets: ResourceGroupLevelResource, ResourceId +Aliases: + +Required: False +Position: Named +Default value: None +Accept pipeline input: False +Accept wildcard characters: False +``` + +```yaml +Type: System.Boolean +Parameter Sets: InputObject +Aliases: + +Required: False +Position: Named +Default value: None +Accept pipeline input: False +Accept wildcard characters: False +``` + ### -Export Export data. @@ -326,33 +353,6 @@ Accept pipeline input: True (ByPropertyName) Accept wildcard characters: False ``` -### -Enabled -Status . - -```yaml -Type: System.Boolean -Parameter Sets: ResourceGroupLevelResource, ResourceId -Aliases: - -Required: False -Position: Named -Default value: None -Accept pipeline input: False -Accept wildcard characters: False -``` - -```yaml -Type: System.String -Parameter Sets: InputObject -Aliases: - -Required: False -Position: Named -Default value: None -Accept pipeline input: False -Accept wildcard characters: False -``` - ### -Tag Tags. diff --git a/src/Security/Security/help/Set-AzJitNetworkAccessPolicy.md b/src/Security/Security/help/Set-AzJitNetworkAccessPolicy.md index 6ad5e2400542..51a4366db54e 100644 --- a/src/Security/Security/help/Set-AzJitNetworkAccessPolicy.md +++ b/src/Security/Security/help/Set-AzJitNetworkAccessPolicy.md @@ -160,7 +160,7 @@ Accept wildcard characters: False ``` ### CommonParameters -This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216). +This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). ## INPUTS diff --git a/src/Security/Security/help/Set-AzSecurityAutoProvisioningSetting.md b/src/Security/Security/help/Set-AzSecurityAutoProvisioningSetting.md index 54b7b7e8d153..de5ba94bffbb 100644 --- a/src/Security/Security/help/Set-AzSecurityAutoProvisioningSetting.md +++ b/src/Security/Security/help/Set-AzSecurityAutoProvisioningSetting.md @@ -165,7 +165,7 @@ Accept wildcard characters: False ``` ### CommonParameters -This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216). +This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). ## INPUTS diff --git a/src/Security/Security/help/Set-AzSecurityContact.md b/src/Security/Security/help/Set-AzSecurityContact.md index bb7bd75688b9..24f05a1d45c9 100644 --- a/src/Security/Security/help/Set-AzSecurityContact.md +++ b/src/Security/Security/help/Set-AzSecurityContact.md @@ -160,7 +160,7 @@ Accept wildcard characters: False ``` ### CommonParameters -This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216). +This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). ## INPUTS diff --git a/src/Security/Security/help/Set-AzSecurityPricing.md b/src/Security/Security/help/Set-AzSecurityPricing.md index 11adfb854087..b2c9499b091b 100644 --- a/src/Security/Security/help/Set-AzSecurityPricing.md +++ b/src/Security/Security/help/Set-AzSecurityPricing.md @@ -143,7 +143,7 @@ Accept wildcard characters: False ``` ### CommonParameters -This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216). +This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). ## INPUTS diff --git a/src/Security/Security/help/Set-AzSecuritySetting.md b/src/Security/Security/help/Set-AzSecuritySetting.md new file mode 100644 index 000000000000..53a499b02ace --- /dev/null +++ b/src/Security/Security/help/Set-AzSecuritySetting.md @@ -0,0 +1,162 @@ +--- +external help file: Microsoft.Azure.PowerShell.Cmdlets.Security.dll-Help.xml +Module Name: Az.Security +online version: +schema: 2.0.0 +--- + +# Set-AzSecuritySetting + +## SYNOPSIS +{{ Fill in the Synopsis }} + +## SYNTAX + +### SubscriptionLevelResource (Default) +``` +Set-AzSecuritySetting -SettingName -SettingInput + [-DefaultProfile ] [-WhatIf] [-Confirm] [] +``` + +### InputObject +``` +Set-AzSecuritySetting -InputObject -Enabled + [-DefaultProfile ] [-WhatIf] [-Confirm] [] +``` + +## DESCRIPTION +{{ Fill in the Description }} + +## EXAMPLES + +### Example 1 +```powershell +PS C:\> {{ Add example code here }} +``` + +{{ Add example description here }} + +## PARAMETERS + +### -DefaultProfile +The credentials, account, tenant, and subscription used for communication with Azure. + +```yaml +Type: IAzureContextContainer +Parameter Sets: (All) +Aliases: AzContext, AzureRmContext, AzureCredential + +Required: False +Position: Named +Default value: None +Accept pipeline input: False +Accept wildcard characters: False +``` + +### -Enabled +Status . + +```yaml +Type: Boolean +Parameter Sets: InputObject +Aliases: + +Required: True +Position: Named +Default value: None +Accept pipeline input: True (ByValue) +Accept wildcard characters: False +``` + +### -InputObject +Input Object. + +```yaml +Type: PSSecuritySetting +Parameter Sets: InputObject +Aliases: + +Required: True +Position: Named +Default value: None +Accept pipeline input: True (ByValue) +Accept wildcard characters: False +``` + +### -SettingInput +Setting. + +```yaml +Type: PSSecuritySetting +Parameter Sets: SubscriptionLevelResource +Aliases: + +Required: True +Position: Named +Default value: None +Accept pipeline input: False +Accept wildcard characters: False +``` + +### -SettingName +Setting name. + +```yaml +Type: String +Parameter Sets: SubscriptionLevelResource +Aliases: + +Required: True +Position: Named +Default value: None +Accept pipeline input: False +Accept wildcard characters: False +``` + +### -Confirm +Prompts you for confirmation before running the cmdlet. + +```yaml +Type: SwitchParameter +Parameter Sets: (All) +Aliases: cf + +Required: False +Position: Named +Default value: None +Accept pipeline input: False +Accept wildcard characters: False +``` + +### -WhatIf +Shows what would happen if the cmdlet runs. +The cmdlet is not run. + +```yaml +Type: SwitchParameter +Parameter Sets: (All) +Aliases: wi + +Required: False +Position: Named +Default value: None +Accept pipeline input: False +Accept wildcard characters: False +``` + +### CommonParameters +This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). + +## INPUTS + +### Microsoft.Azure.Commands.Security.Models.Settings.PSSecuritySetting + +### System.Boolean + +## OUTPUTS + +### Microsoft.Azure.Commands.Security.Models.Settings.PSSecuritySetting + +## NOTES + +## RELATED LINKS diff --git a/src/Security/Security/help/Set-AzSecurityWorkspaceSetting.md b/src/Security/Security/help/Set-AzSecurityWorkspaceSetting.md index a1d3bf79acf6..9a71363765bc 100644 --- a/src/Security/Security/help/Set-AzSecurityWorkspaceSetting.md +++ b/src/Security/Security/help/Set-AzSecurityWorkspaceSetting.md @@ -127,7 +127,7 @@ Accept wildcard characters: False ``` ### CommonParameters -This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216). +This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). ## INPUTS diff --git a/src/Security/Security/help/Start-AzJitNetworkAccessPolicy.md b/src/Security/Security/help/Start-AzJitNetworkAccessPolicy.md index 89e182bacf18..28a214c719c3 100644 --- a/src/Security/Security/help/Start-AzJitNetworkAccessPolicy.md +++ b/src/Security/Security/help/Start-AzJitNetworkAccessPolicy.md @@ -192,7 +192,7 @@ Accept wildcard characters: False ``` ### CommonParameters -This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216). +This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). ## INPUTS From df5a0dbe726a24d72b3f5ec4e72bc03e1214cd97 Mon Sep 17 00:00:00 2001 From: Tal Klein Date: Sun, 17 May 2020 00:23:41 +0300 Subject: [PATCH 10/26] update settings help files --- .../Security/help/Get-AzSecuritySetting.md | 16 +++++++++---- .../Security/help/Set-AzSecuritySetting.md | 23 ++++++++++++++----- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/src/Security/Security/help/Get-AzSecuritySetting.md b/src/Security/Security/help/Get-AzSecuritySetting.md index d4c125d20f2a..9baa2ff8a1d5 100644 --- a/src/Security/Security/help/Get-AzSecuritySetting.md +++ b/src/Security/Security/help/Get-AzSecuritySetting.md @@ -8,7 +8,7 @@ schema: 2.0.0 # Get-AzSecuritySetting ## SYNOPSIS -{{ Fill in the Synopsis }} +Update security settings in Azure Security Center ## SYNTAX @@ -23,16 +23,21 @@ Get-AzSecuritySetting -SettingName [-DefaultProfile {{ Add example code here }} +PS C:\> Set-AzSecuritySetting -SettingName "MCAS" + +Id: "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/providers/Microsoft.Security/settings/MCAS" +Name: "MCAS" +Type: "Microsoft.Security/settings" +Enabled: true ``` -{{ Add example description here }} +Gets an MCAS data export setting ## PARAMETERS @@ -52,7 +57,7 @@ Accept wildcard characters: False ``` ### -SettingName -Setting name. +Setting name. (MCAS/WDATP) ```yaml Type: String @@ -76,6 +81,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable ## OUTPUTS ### Microsoft.Azure.Commands.Security.Models.Settings.PSSecuritySetting +### Microsoft.Azure.Commands.Security.Models.Settings.PSSecurityDataExportSetting ## NOTES diff --git a/src/Security/Security/help/Set-AzSecuritySetting.md b/src/Security/Security/help/Set-AzSecuritySetting.md index 53a499b02ace..86fcb4f2a583 100644 --- a/src/Security/Security/help/Set-AzSecuritySetting.md +++ b/src/Security/Security/help/Set-AzSecuritySetting.md @@ -1,14 +1,14 @@ --- external help file: Microsoft.Azure.PowerShell.Cmdlets.Security.dll-Help.xml Module Name: Az.Security -online version: +online version: https://docs.microsoft.com/en-us/powershell/module/az.security/Set-AzSecuritySetting schema: 2.0.0 --- # Set-AzSecuritySetting ## SYNOPSIS -{{ Fill in the Synopsis }} +Update a security setting in Azure Security Center ## SYNTAX @@ -25,16 +25,24 @@ Set-AzSecuritySetting -InputObject -Enabled ``` ## DESCRIPTION -{{ Fill in the Description }} +The Set-AzSecuritySetting cmdlet updates a specific security setting in Azure Security Center. + ## EXAMPLES ### Example 1 ```powershell -PS C:\> {{ Add example code here }} +PS C:\> [Microsoft.Azure.Commands.Security.Models.Settings.PSSecurityDataExportSetting]$setting = New-Object -TypeName Microsoft.Azure.Commands.Security.Models.Settings.PSSecurityDataExportSetting +PS C:\> $setting.Enabled = $true +PS C:\> Set-AzSecuritySetting -SettingName "MCAS" -SettingInput $setting + +Id: "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/providers/Microsoft.Security/settings/MCAS" +Name: "MCAS" +Type: "Microsoft.Security/settings" +Enabled: true ``` -{{ Add example description here }} +Updates an MCAS data export setting ## PARAMETERS @@ -99,7 +107,7 @@ Accept wildcard characters: False ``` ### -SettingName -Setting name. +Setting name. (MCAS/WDATP) ```yaml Type: String @@ -150,12 +158,15 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable ## INPUTS ### Microsoft.Azure.Commands.Security.Models.Settings.PSSecuritySetting +### Microsoft.Azure.Commands.Security.Models.Settings.PSSecurityDataExportSetting + ### System.Boolean ## OUTPUTS ### Microsoft.Azure.Commands.Security.Models.Settings.PSSecuritySetting +### Microsoft.Azure.Commands.Security.Models.Settings.PSSecurityDataExportSetting ## NOTES From 7180fae8be01d87d191fdd39a9bba3e3574a9dc3 Mon Sep 17 00:00:00 2001 From: Tal Klein Date: Sun, 17 May 2020 00:34:51 +0300 Subject: [PATCH 11/26] Fix help --- src/Security/Security/help/Az.Security.md | 6 ++++++ src/Security/Security/help/Get-AzSecuritySetting.md | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Security/Security/help/Az.Security.md b/src/Security/Security/help/Az.Security.md index 1ee7294d0b59..bf1a7ddbadcd 100644 --- a/src/Security/Security/help/Az.Security.md +++ b/src/Security/Security/help/Az.Security.md @@ -152,3 +152,9 @@ Gets regulatory compliance controls ### [Get-AzRegulatoryComplianceStandard](Get-AzRegulatoryComplianceStandard.md) Gets regulatoey compliance standards + +### [Get-AzSecuritySetting](Get-AzSecuritySetting.md) +Gets security settings in Azure Security Center + +### [Set-AzSecuritySetting](Set-AzSecuritySetting.md) +Sets a security setting in Azure Security Center \ No newline at end of file diff --git a/src/Security/Security/help/Get-AzSecuritySetting.md b/src/Security/Security/help/Get-AzSecuritySetting.md index 9baa2ff8a1d5..31db208b1980 100644 --- a/src/Security/Security/help/Get-AzSecuritySetting.md +++ b/src/Security/Security/help/Get-AzSecuritySetting.md @@ -8,7 +8,7 @@ schema: 2.0.0 # Get-AzSecuritySetting ## SYNOPSIS -Update security settings in Azure Security Center +Get security settings in Azure Security Center ## SYNTAX From 6a6c6e536a0a01ec6adf926bf69f7c2285081018 Mon Sep 17 00:00:00 2001 From: Tal Klein Date: Tue, 19 May 2020 10:42:38 +0300 Subject: [PATCH 12/26] deleting a test --- .../ScenarioTests/SecuritySettingTests.cs | 7 ------- .../ScenarioTests/SecuritySettingTests.ps1 | 11 ----------- 2 files changed, 18 deletions(-) diff --git a/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.cs b/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.cs index dc2c3aeedefc..9fe9733ee8b6 100644 --- a/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.cs +++ b/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.cs @@ -50,12 +50,5 @@ public void SetSubscriptionLevelResource() { TestController.NewInstance.RunPowerShellTest(_logger, "Set-AzureRmSecuritySetting-SubscriptionLevelResource"); } - - [Fact] - [Trait(Category.AcceptanceType, Category.CheckIn)] - public void SetInputObject() - { - TestController.NewInstance.RunPowerShellTest(_logger, "Set-AzureRmSecuritySetting-InputObject"); - } } } \ No newline at end of file diff --git a/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 b/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 index 327b3a8bea64..77ccd7ca66b1 100644 --- a/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 +++ b/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 @@ -49,17 +49,6 @@ function Set-AzureRmSecuritySetting-SubscriptionLevelResource Validate-Setting $updatedSetting } -<# -.SYNOPSIS -Set an Azure Security Center setting on an InputObject -#> -function Set-AzureRmSecuritySetting-InputObject -{ - $updatedSetting = Get-AzSecuritySetting -SettingName "MCAS" | Set-AzSecuritySetting -Enabled $true - - Validate-Setting $updatedSetting -} - <# .SYNOPSIS Validates a list of security pricings From efa43eab5985c6dfed374de5b58a1b8d276ee606 Mon Sep 17 00:00:00 2001 From: Tal Klein Date: Wed, 20 May 2020 10:50:30 +0300 Subject: [PATCH 13/26] fixing help files --- src/Security/Security/help/Get-AzSecuritySetting.md | 2 +- src/Security/Security/help/Set-AzSecuritySetting.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Security/Security/help/Get-AzSecuritySetting.md b/src/Security/Security/help/Get-AzSecuritySetting.md index 31db208b1980..b39de5d700b5 100644 --- a/src/Security/Security/help/Get-AzSecuritySetting.md +++ b/src/Security/Security/help/Get-AzSecuritySetting.md @@ -1,7 +1,7 @@ --- external help file: Microsoft.Azure.PowerShell.Cmdlets.Security.dll-Help.xml Module Name: Az.Security -online version: +online version: https://docs.microsoft.com/en-us/powershell/module/az.security/Get-AzSecurityPricing schema: 2.0.0 --- diff --git a/src/Security/Security/help/Set-AzSecuritySetting.md b/src/Security/Security/help/Set-AzSecuritySetting.md index 86fcb4f2a583..7b968338ccb4 100644 --- a/src/Security/Security/help/Set-AzSecuritySetting.md +++ b/src/Security/Security/help/Set-AzSecuritySetting.md @@ -157,10 +157,10 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable ## INPUTS +### System.String ### Microsoft.Azure.Commands.Security.Models.Settings.PSSecuritySetting ### Microsoft.Azure.Commands.Security.Models.Settings.PSSecurityDataExportSetting - ### System.Boolean ## OUTPUTS From 8d99f3025502d3e5a40848c41a0c6b1841d53fe7 Mon Sep 17 00:00:00 2001 From: Tal Klein Date: Wed, 20 May 2020 14:26:00 +0300 Subject: [PATCH 14/26] flattening the set settings --- .../ScenarioTests/SecuritySettingTests.ps1 | 18 ++++++--- .../Security/Cmdlets/Settings/SetSettings.cs | 37 ++++++++++++------- .../Security/Common/ParameterHelpMessages.cs | 2 + 3 files changed, 39 insertions(+), 18 deletions(-) diff --git a/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 b/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 index 77ccd7ca66b1..50f48efd7b1d 100644 --- a/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 +++ b/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 @@ -40,13 +40,10 @@ Set an Azure Security Center setting #> function Set-AzureRmSecuritySetting-SubscriptionLevelResource { - $setting = Get-AzSecuritySetting -SettingName "MCAS" - - Validate-Setting $setting - - $updatedSetting = Set-AzSecuritySetting -SettingName "MCAS" -SettingInput $setting + $updatedSetting = Set-AzSecuritySetting -SettingName "MCAS" -SettingKind "DataExportSettings" -Enabled $true Validate-Setting $updatedSetting + Validate-EnabledProperty $updatedSetting } <# @@ -74,4 +71,15 @@ function Validate-Setting param($setting) Assert-NotNull $setting +} + +<# +.SYNOPSIS +Validates the enabled property in a setting +#> +function Validate-EnabledProperty +{ + param($setting) + + Assert-True { $setting.Enabled -eq $true } } \ No newline at end of file diff --git a/src/Security/Security/Cmdlets/Settings/SetSettings.cs b/src/Security/Security/Cmdlets/Settings/SetSettings.cs index 01e3761c69c4..9e348521e340 100644 --- a/src/Security/Security/Cmdlets/Settings/SetSettings.cs +++ b/src/Security/Security/Cmdlets/Settings/SetSettings.cs @@ -16,10 +16,7 @@ using Commands.Security; using Microsoft.Azure.Commands.Security.Common; using Microsoft.Azure.Commands.Security.Models.Settings; -using Microsoft.Azure.Commands.SecurityCenter.Common; -using Microsoft.Azure.Management.Security.Models; -using Microsoft.Rest.Azure; -using Microsoft.WindowsAzure.Commands.Common.CustomAttributes; + namespace Microsoft.Azure.Commands.Security.Cmdlets.Settings { @@ -30,42 +27,56 @@ public class SetSettings : SecurityCenterCmdletBase [ValidateNotNullOrEmpty] public string SettingName { get; set; } - [Parameter(ParameterSetName = ParameterSetNames.SubscriptionLevelResource, Mandatory = true, HelpMessage = ParameterHelpMessages.Setting)] + [Parameter(ParameterSetName = ParameterSetNames.SubscriptionLevelResource, Mandatory = true, HelpMessage = ParameterHelpMessages.SettingKind)] [ValidateNotNullOrEmpty] - public PSSecuritySetting SettingInput { get; set; } + public string SettingKind { get; set; } [Parameter(ParameterSetName = ParameterSetNames.InputObject, Mandatory = true, ValueFromPipeline = true, HelpMessage = ParameterHelpMessages.InputObject)] [ValidateNotNullOrEmpty] public PSSecuritySetting InputObject { get; set; } - [Parameter(ParameterSetName = ParameterSetNames.InputObject, Mandatory = true, ValueFromPipeline = true, HelpMessage = ParameterHelpMessages.Status)] + [Parameter(ParameterSetName = ParameterSetNames.InputObject, Mandatory = true, ValueFromPipeline = true, HelpMessage = ParameterHelpMessages.Enabled)] + [Parameter(ParameterSetName = ParameterSetNames.SubscriptionLevelResource, Mandatory = true, HelpMessage = ParameterHelpMessages.Enabled)] + [ValidateNotNullOrEmpty] public bool Enabled { get; set; } public override void ExecuteCmdlet() { - Setting setting; + PSSecuritySetting setting; switch (ParameterSetName) { case ParameterSetNames.SubscriptionLevelResource: - SettingInput.Name = SettingName; - setting = SettingInput.ConvertToCSType(); break; case ParameterSetNames.InputObject: if (InputObject.GetType().Name == nameof(PSSecurityDataExportSetting)) { - ((PSSecurityDataExportSetting)InputObject).Enabled = Enabled ? Enabled : ((PSSecurityDataExportSetting)InputObject).Enabled; + SettingKind = "DataExportSettings"; + Enabled = Enabled ? Enabled : ((PSSecurityDataExportSetting)InputObject).Enabled; } SettingName = InputObject.Name; - setting = InputObject.ConvertToCSType(); break; default: throw new PSInvalidOperationException(); } + if (SettingKind == "DataExportSettings") + { + setting = new PSSecurityDataExportSetting() + { + Enabled = Enabled, + Name = SettingName + }; + } + else + { + throw new PSInvalidOperationException("Invalid setting kind"); + } + + if (ShouldProcess(SettingName, VerbsCommon.Set)) { - var updatedSetting = SecurityCenterClient.Settings.UpdateWithHttpMessagesAsync(SettingName, setting).GetAwaiter().GetResult().Body; + var updatedSetting = SecurityCenterClient.Settings.UpdateWithHttpMessagesAsync(SettingName, setting.ConvertToCSType()).GetAwaiter().GetResult().Body; WriteObject(updatedSetting.ConvertToPSType(), enumerateCollection: false); } diff --git a/src/Security/Security/Common/ParameterHelpMessages.cs b/src/Security/Security/Common/ParameterHelpMessages.cs index 936ccf931917..ad0a180a0f9a 100644 --- a/src/Security/Security/Common/ParameterHelpMessages.cs +++ b/src/Security/Security/Common/ParameterHelpMessages.cs @@ -84,6 +84,8 @@ public static class ParameterHelpMessages public const string SettingName = "Setting name."; public const string Setting = "Setting."; + public const string SettingKind = "Setting kind."; + public const string Enabled = "Enables the setting."; #endregion From 7ca9c4995ab03ea241ab10bc66b7168f67a4810a Mon Sep 17 00:00:00 2001 From: Tal Klein Date: Wed, 20 May 2020 16:56:29 +0300 Subject: [PATCH 15/26] added a session record --- .../SetSubscriptionLevelResource.json | 73 ++----------------- 1 file changed, 5 insertions(+), 68 deletions(-) diff --git a/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingTests/SetSubscriptionLevelResource.json b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingTests/SetSubscriptionLevelResource.json index e6283d67299b..f6d40fa6c11e 100644 --- a/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingTests/SetSubscriptionLevelResource.json +++ b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingTests/SetSubscriptionLevelResource.json @@ -1,68 +1,5 @@ { "Entries": [ - { - "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/providers/Microsoft.Security/settings/MCAS?api-version=2019-01-01", - "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Byb3ZpZGVycy9NaWNyb3NvZnQuU2VjdXJpdHkvc2V0dGluZ3MvTUNBUz9hcGktdmVyc2lvbj0yMDE5LTAxLTAx", - "RequestMethod": "GET", - "RequestBody": "", - "RequestHeaders": { - "x-ms-client-request-id": [ - "c911d436-80ba-4e12-b6cc-dd5fe7b9a949" - ], - "Accept-Language": [ - "en-US" - ], - "User-Agent": [ - "FxVersion/4.6.28207.03", - "OSName/Windows", - "OSVersion/Microsoft.Windows.10.0.18363.", - "Microsoft.Azure.Management.Security.SecurityCenterClient/2.0.0.0" - ] - }, - "ResponseHeaders": { - "Cache-Control": [ - "no-cache" - ], - "Pragma": [ - "no-cache" - ], - "x-ms-request-id": [ - "70bcdb30-9ede-4d8a-a865-f4adb53773b5" - ], - "Server": [ - "Microsoft-HTTPAPI/2.0" - ], - "x-ms-ratelimit-remaining-subscription-resource-requests": [ - "749" - ], - "x-ms-correlation-request-id": [ - "321bf19c-c420-4bb3-bf22-56b999a813c1" - ], - "x-ms-routing-request-id": [ - "GERMANYWESTCENTRAL:20200508T090301Z:321bf19c-c420-4bb3-bf22-56b999a813c1" - ], - "Strict-Transport-Security": [ - "max-age=31536000; includeSubDomains" - ], - "X-Content-Type-Options": [ - "nosniff" - ], - "Date": [ - "Fri, 08 May 2020 09:03:00 GMT" - ], - "Content-Length": [ - "212" - ], - "Content-Type": [ - "application/json; charset=utf-8" - ], - "Expires": [ - "-1" - ] - }, - "ResponseBody": "{\r\n \"id\": \"/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/providers/Microsoft.Security/settings/MCAS\",\r\n \"name\": \"MCAS\",\r\n \"type\": \"Microsoft.Security/settings\",\r\n \"kind\": \"DataExportSettings\",\r\n \"properties\": {\r\n \"enabled\": true\r\n }\r\n}", - "StatusCode": 200 - }, { "RequestUri": "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/providers/Microsoft.Security/settings/MCAS?api-version=2019-01-01", "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDg3YmI0ODUtYjViMC00NzFlLTljMGQtMTA3MTc2MTJmODY5L3Byb3ZpZGVycy9NaWNyb3NvZnQuU2VjdXJpdHkvc2V0dGluZ3MvTUNBUz9hcGktdmVyc2lvbj0yMDE5LTAxLTAx", @@ -70,7 +7,7 @@ "RequestBody": "{\r\n \"kind\": \"DataExportSettings\",\r\n \"properties\": {\r\n \"enabled\": true\r\n }\r\n}", "RequestHeaders": { "x-ms-client-request-id": [ - "5f13ad9b-9a5f-440f-be15-8fe3cdf25b43" + "5269e478-3f5d-4833-8650-c7f970a73dd9" ], "Accept-Language": [ "en-US" @@ -96,7 +33,7 @@ "no-cache" ], "x-ms-request-id": [ - "8020524c-a130-43e1-9b63-6eb041f4f5c5" + "ce8ad3ff-0ceb-4b0e-a53c-8b80f2fe6d56" ], "Server": [ "Microsoft-HTTPAPI/2.0" @@ -105,10 +42,10 @@ "249" ], "x-ms-correlation-request-id": [ - "c053dc92-4717-4c20-8e9e-2d640c901dee" + "75c43147-a18d-4a37-aa2d-6d64530d8091" ], "x-ms-routing-request-id": [ - "GERMANYWESTCENTRAL:20200508T090509Z:c053dc92-4717-4c20-8e9e-2d640c901dee" + "GERMANYWESTCENTRAL:20200520T134340Z:75c43147-a18d-4a37-aa2d-6d64530d8091" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -117,7 +54,7 @@ "nosniff" ], "Date": [ - "Fri, 08 May 2020 09:05:08 GMT" + "Wed, 20 May 2020 13:43:40 GMT" ], "Content-Length": [ "212" From 33b1fcea4c3f9ada3c92bd9b655e205eceaca276 Mon Sep 17 00:00:00 2001 From: Tal Klein Date: Wed, 20 May 2020 18:15:10 +0300 Subject: [PATCH 16/26] regenate help --- .../Security/Cmdlets/Settings/SetSettings.cs | 1 - .../Security/help/Set-AzSecuritySetting.md | 41 +++++++++++-------- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/src/Security/Security/Cmdlets/Settings/SetSettings.cs b/src/Security/Security/Cmdlets/Settings/SetSettings.cs index 9e348521e340..e3d665a275ed 100644 --- a/src/Security/Security/Cmdlets/Settings/SetSettings.cs +++ b/src/Security/Security/Cmdlets/Settings/SetSettings.cs @@ -52,7 +52,6 @@ public override void ExecuteCmdlet() if (InputObject.GetType().Name == nameof(PSSecurityDataExportSetting)) { SettingKind = "DataExportSettings"; - Enabled = Enabled ? Enabled : ((PSSecurityDataExportSetting)InputObject).Enabled; } SettingName = InputObject.Name; break; diff --git a/src/Security/Security/help/Set-AzSecuritySetting.md b/src/Security/Security/help/Set-AzSecuritySetting.md index 7b968338ccb4..d49c35793db9 100644 --- a/src/Security/Security/help/Set-AzSecuritySetting.md +++ b/src/Security/Security/help/Set-AzSecuritySetting.md @@ -14,7 +14,7 @@ Update a security setting in Azure Security Center ### SubscriptionLevelResource (Default) ``` -Set-AzSecuritySetting -SettingName -SettingInput +Set-AzSecuritySetting -SettingName -SettingKind -Enabled [-DefaultProfile ] [-WhatIf] [-Confirm] [] ``` @@ -27,14 +27,11 @@ Set-AzSecuritySetting -InputObject -Enabled ## DESCRIPTION The Set-AzSecuritySetting cmdlet updates a specific security setting in Azure Security Center. - ## EXAMPLES ### Example 1 ```powershell -PS C:\> [Microsoft.Azure.Commands.Security.Models.Settings.PSSecurityDataExportSetting]$setting = New-Object -TypeName Microsoft.Azure.Commands.Security.Models.Settings.PSSecurityDataExportSetting -PS C:\> $setting.Enabled = $true -PS C:\> Set-AzSecuritySetting -SettingName "MCAS" -SettingInput $setting +PS C:\> Set-AzSecuritySetting -SettingName "MCAS" -SettingKind "DataExportSettings" -Enabled $true Id: "/subscriptions/487bb485-b5b0-471e-9c0d-10717612f869/providers/Microsoft.Security/settings/MCAS" Name: "MCAS" @@ -50,7 +47,7 @@ Updates an MCAS data export setting The credentials, account, tenant, and subscription used for communication with Azure. ```yaml -Type: IAzureContextContainer +Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core.IAzureContextContainer Parameter Sets: (All) Aliases: AzContext, AzureRmContext, AzureCredential @@ -62,17 +59,29 @@ Accept wildcard characters: False ``` ### -Enabled -Status . +Enables the setting. + +```yaml +Type: System.Boolean +Parameter Sets: SubscriptionLevelResource +Aliases: + +Required: True +Position: Named +Default value: None +Accept pipeline input: False +Accept wildcard characters: False +``` ```yaml -Type: Boolean +Type: System.Boolean Parameter Sets: InputObject Aliases: Required: True Position: Named Default value: None -Accept pipeline input: True (ByValue) +Accept pipeline input: False Accept wildcard characters: False ``` @@ -80,7 +89,7 @@ Accept wildcard characters: False Input Object. ```yaml -Type: PSSecuritySetting +Type: Microsoft.Azure.Commands.Security.Models.Settings.PSSecuritySetting Parameter Sets: InputObject Aliases: @@ -91,11 +100,11 @@ Accept pipeline input: True (ByValue) Accept wildcard characters: False ``` -### -SettingInput -Setting. +### -SettingKind +Setting kind. (DataExportSettings) ```yaml -Type: PSSecuritySetting +Type: System.String Parameter Sets: SubscriptionLevelResource Aliases: @@ -110,7 +119,7 @@ Accept wildcard characters: False Setting name. (MCAS/WDATP) ```yaml -Type: String +Type: System.String Parameter Sets: SubscriptionLevelResource Aliases: @@ -125,7 +134,7 @@ Accept wildcard characters: False Prompts you for confirmation before running the cmdlet. ```yaml -Type: SwitchParameter +Type: System.Management.Automation.SwitchParameter Parameter Sets: (All) Aliases: cf @@ -141,7 +150,7 @@ Shows what would happen if the cmdlet runs. The cmdlet is not run. ```yaml -Type: SwitchParameter +Type: System.Management.Automation.SwitchParameter Parameter Sets: (All) Aliases: wi From 4bcd7fcec0ed8149c1941827048f18aa2a9165be Mon Sep 17 00:00:00 2001 From: Tal Klein Date: Thu, 21 May 2020 11:28:34 +0300 Subject: [PATCH 17/26] added new set parameter --- .../Security/Cmdlets/Settings/SetSettings.cs | 14 ++++++++------ src/Security/Security/Common/ParameterSetNames.cs | 6 ++++++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/Security/Security/Cmdlets/Settings/SetSettings.cs b/src/Security/Security/Cmdlets/Settings/SetSettings.cs index e3d665a275ed..431a49882e38 100644 --- a/src/Security/Security/Cmdlets/Settings/SetSettings.cs +++ b/src/Security/Security/Cmdlets/Settings/SetSettings.cs @@ -15,19 +15,20 @@ using System.Management.Automation; using Commands.Security; using Microsoft.Azure.Commands.Security.Common; +using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.Azure.Commands.Security.Models.Settings; namespace Microsoft.Azure.Commands.Security.Cmdlets.Settings { - [Cmdlet(VerbsCommon.Set, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "SecuritySetting", DefaultParameterSetName = ParameterSetNames.SubscriptionLevelResource, SupportsShouldProcess = true), OutputType(typeof(PSSecuritySetting))] + [Cmdlet(VerbsCommon.Set, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "SecuritySetting", SupportsShouldProcess = true), OutputType(typeof(PSSecuritySetting))] public class SetSettings : SecurityCenterCmdletBase { - [Parameter(ParameterSetName = ParameterSetNames.SubscriptionLevelResource, Mandatory = true, HelpMessage = ParameterHelpMessages.SettingName)] + [Parameter(ParameterSetName = ParameterSetNames.DataExportSettings, Mandatory = true, HelpMessage = ParameterHelpMessages.SettingName)] [ValidateNotNullOrEmpty] public string SettingName { get; set; } - [Parameter(ParameterSetName = ParameterSetNames.SubscriptionLevelResource, Mandatory = true, HelpMessage = ParameterHelpMessages.SettingKind)] + [Parameter(ParameterSetName = ParameterSetNames.DataExportSettings, Mandatory = true, HelpMessage = ParameterHelpMessages.SettingKind)] [ValidateNotNullOrEmpty] public string SettingKind { get; set; } @@ -35,8 +36,8 @@ public class SetSettings : SecurityCenterCmdletBase [ValidateNotNullOrEmpty] public PSSecuritySetting InputObject { get; set; } - [Parameter(ParameterSetName = ParameterSetNames.InputObject, Mandatory = true, ValueFromPipeline = true, HelpMessage = ParameterHelpMessages.Enabled)] - [Parameter(ParameterSetName = ParameterSetNames.SubscriptionLevelResource, Mandatory = true, HelpMessage = ParameterHelpMessages.Enabled)] + [Parameter(ParameterSetName = ParameterSetNames.DataExportSettings, Mandatory = true, HelpMessage = ParameterHelpMessages.Enabled)] + [Parameter(ParameterSetName = ParameterSetNames.InputObject, Mandatory = false, ValueFromPipeline = true, HelpMessage = ParameterHelpMessages.Enabled)] [ValidateNotNullOrEmpty] public bool Enabled { get; set; } @@ -46,12 +47,13 @@ public override void ExecuteCmdlet() switch (ParameterSetName) { - case ParameterSetNames.SubscriptionLevelResource: + case ParameterSetNames.DataExportSettings: break; case ParameterSetNames.InputObject: if (InputObject.GetType().Name == nameof(PSSecurityDataExportSetting)) { SettingKind = "DataExportSettings"; + Enabled = !this.IsParameterBound(c => c.Enabled) ? ((PSSecurityDataExportSetting)InputObject).Enabled : Enabled; } SettingName = InputObject.Name; break; diff --git a/src/Security/Security/Common/ParameterSetNames.cs b/src/Security/Security/Common/ParameterSetNames.cs index 4e216e5174b1..09d4d13a805c 100644 --- a/src/Security/Security/Common/ParameterSetNames.cs +++ b/src/Security/Security/Common/ParameterSetNames.cs @@ -30,5 +30,11 @@ public static class ParameterSetNames public const string InputObject = "InputObject"; public const string PolicyOn = "PolicyOn"; public const string PolicyOff = "PolicyOff"; + + #region Settings + + public const string DataExportSettings = "DataExportSettings"; + + #endregion } } From c806fd6e2ad698527f0aad38ca03e81447951a72 Mon Sep 17 00:00:00 2001 From: Tal Klein Date: Thu, 21 May 2020 11:46:20 +0300 Subject: [PATCH 18/26] changed the test name --- .../ScenarioTests/SecuritySettingTests.cs | 4 ++-- .../ScenarioTests/SecuritySettingTests.ps1 | 2 +- src/Security/Security/Cmdlets/Settings/SetSettings.cs | 10 +++++----- src/Security/Security/Common/ParameterSetNames.cs | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.cs b/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.cs index 9fe9733ee8b6..732842a4035d 100644 --- a/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.cs +++ b/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.cs @@ -46,9 +46,9 @@ public void GetSubscriptionLevelResource() [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] - public void SetSubscriptionLevelResource() + public void SetDataExportSettingsScope() { - TestController.NewInstance.RunPowerShellTest(_logger, "Set-AzureRmSecuritySetting-SubscriptionLevelResource"); + TestController.NewInstance.RunPowerShellTest(_logger, "Set-AzureRmSecuritySetting-DataExportSettingsScope"); } } } \ No newline at end of file diff --git a/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 b/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 index 50f48efd7b1d..0dbfa0b05be7 100644 --- a/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 +++ b/src/Security/Security.Test/ScenarioTests/SecuritySettingTests.ps1 @@ -38,7 +38,7 @@ function Get-AzureRmSecuritySetting-SubscriptionLevelResource .SYNOPSIS Set an Azure Security Center setting #> -function Set-AzureRmSecuritySetting-SubscriptionLevelResource +function Set-AzureRmSecuritySetting-DataExportSettingsScope { $updatedSetting = Set-AzSecuritySetting -SettingName "MCAS" -SettingKind "DataExportSettings" -Enabled $true diff --git a/src/Security/Security/Cmdlets/Settings/SetSettings.cs b/src/Security/Security/Cmdlets/Settings/SetSettings.cs index 431a49882e38..9224f7462c17 100644 --- a/src/Security/Security/Cmdlets/Settings/SetSettings.cs +++ b/src/Security/Security/Cmdlets/Settings/SetSettings.cs @@ -24,11 +24,11 @@ namespace Microsoft.Azure.Commands.Security.Cmdlets.Settings [Cmdlet(VerbsCommon.Set, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "SecuritySetting", SupportsShouldProcess = true), OutputType(typeof(PSSecuritySetting))] public class SetSettings : SecurityCenterCmdletBase { - [Parameter(ParameterSetName = ParameterSetNames.DataExportSettings, Mandatory = true, HelpMessage = ParameterHelpMessages.SettingName)] + [Parameter(ParameterSetName = ParameterSetNames.DataExportSettingsScope, Mandatory = true, HelpMessage = ParameterHelpMessages.SettingName)] [ValidateNotNullOrEmpty] public string SettingName { get; set; } - [Parameter(ParameterSetName = ParameterSetNames.DataExportSettings, Mandatory = true, HelpMessage = ParameterHelpMessages.SettingKind)] + [Parameter(ParameterSetName = ParameterSetNames.DataExportSettingsScope, Mandatory = true, HelpMessage = ParameterHelpMessages.SettingKind)] [ValidateNotNullOrEmpty] public string SettingKind { get; set; } @@ -36,8 +36,8 @@ public class SetSettings : SecurityCenterCmdletBase [ValidateNotNullOrEmpty] public PSSecuritySetting InputObject { get; set; } - [Parameter(ParameterSetName = ParameterSetNames.DataExportSettings, Mandatory = true, HelpMessage = ParameterHelpMessages.Enabled)] - [Parameter(ParameterSetName = ParameterSetNames.InputObject, Mandatory = false, ValueFromPipeline = true, HelpMessage = ParameterHelpMessages.Enabled)] + [Parameter(ParameterSetName = ParameterSetNames.DataExportSettingsScope, Mandatory = true, HelpMessage = ParameterHelpMessages.Enabled)] + [Parameter(ParameterSetName = ParameterSetNames.InputObject, Mandatory = false, ValueFromPipeline = false, HelpMessage = ParameterHelpMessages.Enabled)] [ValidateNotNullOrEmpty] public bool Enabled { get; set; } @@ -47,7 +47,7 @@ public override void ExecuteCmdlet() switch (ParameterSetName) { - case ParameterSetNames.DataExportSettings: + case ParameterSetNames.DataExportSettingsScope: break; case ParameterSetNames.InputObject: if (InputObject.GetType().Name == nameof(PSSecurityDataExportSetting)) diff --git a/src/Security/Security/Common/ParameterSetNames.cs b/src/Security/Security/Common/ParameterSetNames.cs index 09d4d13a805c..5c42234ab88d 100644 --- a/src/Security/Security/Common/ParameterSetNames.cs +++ b/src/Security/Security/Common/ParameterSetNames.cs @@ -33,7 +33,7 @@ public static class ParameterSetNames #region Settings - public const string DataExportSettings = "DataExportSettings"; + public const string DataExportSettingsScope = "DataExportSettingsScope"; #endregion } From 4b1380d6f84249bef84427263f2ede29dd28a97a Mon Sep 17 00:00:00 2001 From: Tal Klein Date: Thu, 21 May 2020 13:42:53 +0300 Subject: [PATCH 19/26] regenerated help --- src/Security/Security/help/Set-AzSecuritySetting.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Security/Security/help/Set-AzSecuritySetting.md b/src/Security/Security/help/Set-AzSecuritySetting.md index d49c35793db9..81c4d1dc8312 100644 --- a/src/Security/Security/help/Set-AzSecuritySetting.md +++ b/src/Security/Security/help/Set-AzSecuritySetting.md @@ -12,7 +12,7 @@ Update a security setting in Azure Security Center ## SYNTAX -### SubscriptionLevelResource (Default) +### DataExportSettingsScope ``` Set-AzSecuritySetting -SettingName -SettingKind -Enabled [-DefaultProfile ] [-WhatIf] [-Confirm] [] @@ -20,7 +20,7 @@ Set-AzSecuritySetting -SettingName -SettingKind -Enabled -Enabled +Set-AzSecuritySetting -InputObject [-Enabled ] [-DefaultProfile ] [-WhatIf] [-Confirm] [] ``` @@ -63,7 +63,7 @@ Enables the setting. ```yaml Type: System.Boolean -Parameter Sets: SubscriptionLevelResource +Parameter Sets: DataExportSettingsScope Aliases: Required: True @@ -78,7 +78,7 @@ Type: System.Boolean Parameter Sets: InputObject Aliases: -Required: True +Required: False Position: Named Default value: None Accept pipeline input: False @@ -105,7 +105,7 @@ Setting kind. (DataExportSettings) ```yaml Type: System.String -Parameter Sets: SubscriptionLevelResource +Parameter Sets: DataExportSettingsScope Aliases: Required: True @@ -120,7 +120,7 @@ Setting name. (MCAS/WDATP) ```yaml Type: System.String -Parameter Sets: SubscriptionLevelResource +Parameter Sets: DataExportSettingsScope Aliases: Required: True From ce48daaa61dda5162dfc7c35bee17ed7709449db Mon Sep 17 00:00:00 2001 From: Tal Klein Date: Thu, 21 May 2020 13:55:10 +0300 Subject: [PATCH 20/26] renaming tests --- ...criptionLevelResource.json => SetDataExportSettingsScope.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingTests/{SetSubscriptionLevelResource.json => SetDataExportSettingsScope.json} (100%) diff --git a/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingTests/SetSubscriptionLevelResource.json b/src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingTests/SetDataExportSettingsScope.json similarity index 100% rename from src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingTests/SetSubscriptionLevelResource.json rename to src/Security/Security.Test/SessionRecords/Microsoft.Azure.Commands.Security.Test.ScenarioTests.SecuritySettingTests/SetDataExportSettingsScope.json From 5d80f3934fb27a8b3eaf8b9a499dd4dc03495ad0 Mon Sep 17 00:00:00 2001 From: Tal Klein Date: Thu, 21 May 2020 16:27:09 +0300 Subject: [PATCH 21/26] fixing a type --- src/Security/Security/help/Get-AzSecuritySetting.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Security/Security/help/Get-AzSecuritySetting.md b/src/Security/Security/help/Get-AzSecuritySetting.md index b39de5d700b5..2f9df373bf3e 100644 --- a/src/Security/Security/help/Get-AzSecuritySetting.md +++ b/src/Security/Security/help/Get-AzSecuritySetting.md @@ -1,7 +1,7 @@ --- external help file: Microsoft.Azure.PowerShell.Cmdlets.Security.dll-Help.xml Module Name: Az.Security -online version: https://docs.microsoft.com/en-us/powershell/module/az.security/Get-AzSecurityPricing +online version: https://docs.microsoft.com/en-us/powershell/module/az.security/Get-AzSecuritySetting schema: 2.0.0 --- From 060e8fda04228e47ebab3d9446ee48be07caa656 Mon Sep 17 00:00:00 2001 From: Tal Klein Date: Thu, 21 May 2020 18:24:29 +0300 Subject: [PATCH 22/26] re-added a default parameter set --- src/Security/Security/Cmdlets/Settings/SetSettings.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Security/Security/Cmdlets/Settings/SetSettings.cs b/src/Security/Security/Cmdlets/Settings/SetSettings.cs index 9224f7462c17..f27faa7b61e0 100644 --- a/src/Security/Security/Cmdlets/Settings/SetSettings.cs +++ b/src/Security/Security/Cmdlets/Settings/SetSettings.cs @@ -21,7 +21,7 @@ namespace Microsoft.Azure.Commands.Security.Cmdlets.Settings { - [Cmdlet(VerbsCommon.Set, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "SecuritySetting", SupportsShouldProcess = true), OutputType(typeof(PSSecuritySetting))] + [Cmdlet(VerbsCommon.Set, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "SecuritySetting", SupportsShouldProcess = true, DefaultParameterSetName = ParameterSetNames.GeneralScope), OutputType(typeof(PSSecuritySetting))] public class SetSettings : SecurityCenterCmdletBase { [Parameter(ParameterSetName = ParameterSetNames.DataExportSettingsScope, Mandatory = true, HelpMessage = ParameterHelpMessages.SettingName)] From 4806b133b3755b3d63f00b997eb2e180cc684663 Mon Sep 17 00:00:00 2001 From: Tal Klein Date: Thu, 21 May 2020 18:44:03 +0300 Subject: [PATCH 23/26] regenerate help --- src/Security/Security/help/Set-AzSecuritySetting.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Security/Security/help/Set-AzSecuritySetting.md b/src/Security/Security/help/Set-AzSecuritySetting.md index 81c4d1dc8312..a92ee711e422 100644 --- a/src/Security/Security/help/Set-AzSecuritySetting.md +++ b/src/Security/Security/help/Set-AzSecuritySetting.md @@ -12,6 +12,11 @@ Update a security setting in Azure Security Center ## SYNTAX +### GeneralScope (Default) +``` +Set-AzSecuritySetting [-DefaultProfile ] [-WhatIf] [-Confirm] [] +``` + ### DataExportSettingsScope ``` Set-AzSecuritySetting -SettingName -SettingKind -Enabled From f863d242fcae9ba7b99ff442ab27f5476dd51bbb Mon Sep 17 00:00:00 2001 From: Tal Klein Date: Sun, 24 May 2020 09:52:47 +0300 Subject: [PATCH 24/26] updated the change log --- src/Security/Security/ChangeLog.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Security/Security/ChangeLog.md b/src/Security/Security/ChangeLog.md index 45de32f5003e..647ca3f996a7 100644 --- a/src/Security/Security/ChangeLog.md +++ b/src/Security/Security/ChangeLog.md @@ -19,6 +19,10 @@ --> ## Upcoming Release +## Version 0.7.9 +* Add new cmdlets: `Get-AzSecuritySetting`, + `Set-AzSecuritySetting` + ## Version 0.7.8 * Add new cmdlets: `Get-AzRegulatoryComplianceStandard`, `Get-AzRegulatoryComplianceControl`, From 8c22b648cc191ee45fb8149cd53bc126b9df82c2 Mon Sep 17 00:00:00 2001 From: Yabo Hu Date: Mon, 25 May 2020 14:32:01 +0800 Subject: [PATCH 25/26] Update Get-AzSecuritySetting.md --- src/Security/Security/help/Get-AzSecuritySetting.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Security/Security/help/Get-AzSecuritySetting.md b/src/Security/Security/help/Get-AzSecuritySetting.md index 2f9df373bf3e..06c1e7ab723b 100644 --- a/src/Security/Security/help/Get-AzSecuritySetting.md +++ b/src/Security/Security/help/Get-AzSecuritySetting.md @@ -76,7 +76,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable ## INPUTS -### None +### System.String ## OUTPUTS From b3d99a14d72de98864e4941bcd7b8a40f99629f1 Mon Sep 17 00:00:00 2001 From: Yabo Hu Date: Mon, 25 May 2020 14:33:20 +0800 Subject: [PATCH 26/26] Update ChangeLog.md --- src/Security/Security/ChangeLog.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Security/Security/ChangeLog.md b/src/Security/Security/ChangeLog.md index 647ca3f996a7..57a629456582 100644 --- a/src/Security/Security/ChangeLog.md +++ b/src/Security/Security/ChangeLog.md @@ -20,8 +20,9 @@ ## Upcoming Release ## Version 0.7.9 -* Add new cmdlets: `Get-AzSecuritySetting`, - `Set-AzSecuritySetting` +* Added new cmdlets: + - `Get-AzSecuritySetting` + - `Set-AzSecuritySetting` ## Version 0.7.8 * Add new cmdlets: `Get-AzRegulatoryComplianceStandard`,