Skip to content

Allow insights powershell to unselect data sinks in diagnosticsettings. #3452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Feb 21, 2017

Conversation

vcanaa
Copy link
Contributor

@vcanaa vcanaa commented Feb 1, 2017

Description


This checklist is used to make sure that common guidelines for a pull request are followed. You can find a more complete discussion of PowerShell cmdlet best practices here.

General Guidelines

  • Title of the pull request is clear and informative.
  • There are a small number of commits, each of which have an informative message. This means that previously merged commits do not appear in the history of the PR. For more information on cleaning up the commits in your PR, see this page.
  • The pull request does not introduce breaking changes (unless a major version change occurs in the assembly and module).

Testing Guidelines

  • Pull request includes test coverage for the included changes.
  • PowerShell scripts used in tests should do any necessary setup as part of the test or suite setup, and should not use hard-coded values for locations or existing resources.

Cmdlet Signature Guidelines

  • New cmdlets that make changes or have side effects should implement ShouldProcess and have SupportShouldProcess=true specified in the cmdlet attribute. You can find more information on ShouldProcess here.
  • Cmdlet specifies OutputType attribute if any output is produced - if the cmdlet produces no output, it should implement a PassThru parameter.

Cmdlet Parameter Guidelines

  • Parameter types should not expose types from the management library - complex parameter types should be defined in the module.
  • Complex parameter types are discouraged - a parameter type should be simple types as often as possible. If complex types are used, they should be shallow and easily creatable from a constructor or another cmdlet.
  • Cmdlet parameter sets should be mutually exclusive - each parameter set must have at least one mandatory parameter not in other parameter sets.

Copy link
Member

@cormacpayne cormacpayne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vcanaa a few comments

Also, make sure you update the help for Set-AzureRmDiagnosticSetting.md (since you have changed the help in the dll-Help.xml file)

foreach (string category in this.Categories)
{
LogSettings logSettings = properties.Logs.FirstOrDefault(x => string.Equals(x.Category, category, StringComparison.OrdinalIgnoreCase));
throw new ArgumentException("Parameter 'Enabled' is required by 'Timegrains' parameter.");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vcanaa why not create a parameter set where Enabled is required if Timegrains is used?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I studied the parameter set and I didn't find a configuration that satisfies all the requirements. I decided to not use them.

{
if (!this.Enabled.HasValue)
{
throw new ArgumentException("Parameter 'Enabled' is required by 'Categories' parameter.");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vcanaa why not create a parameter set where Enabled is required if Categories is used?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Parameter set doesn't cover all requirements.

{
logSettings.RetentionPolicy = retentionPolicy;
}
throw new ArgumentException("WorkspaceId and DisableWorkspace cannot be both present.");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vcanaa use parameter sets to ensure that these parameters are mutually exclusive

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Parameter set doesn't cover all requirements.

{
metricSettings.RetentionPolicy = retentionPolicy;
}
throw new ArgumentException("ServiceBusId and DisableServiceBus cannot be both present.");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vcanaa use parameter sets to ensure that these parameters are mutually exclusive

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Parameter set doesn't cover all requirements.

/// </summary>
[Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Disable workspace")]
[ValidateNotNullOrEmpty]
public SwitchParameter DisableWorkspace { get; set; }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vcanaa how do you handle the case of the three Disable parameters being used with the Enabled parameter? If a user shouldn't be able to use all four together (or Enabled with any combination of the three Disable parameters), then you should consider creating two parameters - one that has Enabled, and another that has the three Disable parameters

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The powershell is supposed to offer a way to easily build the request. If the request ends up not being valid, we want to the server to validate and respond with proper message.

/// <summary>
/// Gets or sets the switch for workspace parameter of the cmdlet
/// </summary>
[Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Disable workspace")]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vcanaa please remove the ValueFromPipelineByPropertyName attribute from the three SwitchParameter parameters you have added

[ValidateNotNullOrEmpty]
public bool Enabled { get; set; }
public bool? Enabled { get; set; }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vcanaa when can this be nullable?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Customer can run the following
Set-AzureRmDiagnosticSettings -ResourceId <> -DisableStorage

@shahabhijeet
Copy link
Contributor

@vcanaa please reopen this PR once you address the feedback and fix build failures.

@markcowl
Copy link
Member

@azuresdkci retest this please

@cormacpayne cormacpayne changed the base branch from dev to release-3.6.0 February 16, 2017 23:18
@cormacpayne
Copy link
Member

@azuresdkci test this please

@cormacpayne
Copy link
Member

Copy link
Member

@markcowl markcowl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One minor change, otherwise, this looks good.

@@ -31,6 +32,11 @@ namespace Microsoft.Azure.Commands.Insights.Diagnostics
[Cmdlet(VerbsCommon.Set, "AzureRmDiagnosticSetting"), OutputType(typeof(PSServiceDiagnosticSettings))]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change cmdlet name to update and place an alias to Set (or vice-versa) Also, please note in upcoming breaking changes that the cmdlet name is changing to update: https://github.com/Azure/azure-powershell/blob/dev/src/ResourceManager/Insights/documentation/upcoming-breaking-changes.md

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we just leave the name as Set-DiagnsoticSettings? We are improving the api to support multiple diagnostic settings. After that we plan to retire this commandlet and have only Add-AzureRmDiagnosticSettings. I don't think we should change the name a command that is soon to be deprecated.

…s to Update-AzureRmDiagnosticSettings in the upcoming breaking changes doc
@cormacpayne cormacpayne merged commit 9b61619 into Azure:release-3.6.0 Feb 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants