Skip to content
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

feat(cloudwatch): allow overriding of metric graph rendering #4571

Merged
merged 4 commits into from
Oct 29, 2019

Conversation

workeitel
Copy link
Contributor

This allows to create custom graphs easier by creating sub-class of
metric and overriding the toGraphConfig method. Before attributes have
been only selectively copied to the widget configuration.

class HiddenMetric extends Metric {
  public toGraphConfig(): any {
    const ret = super.toGraphConfig();
    ret.renderingProperties.visible = false;
  }
}

Before visible would not have been taken over since it was not part of
options.

Docs: https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/CloudWatch-Dashboard-Body-Structure.html#CloudWatch-Dashboard-Properties-Rendering-Object-Format


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

@workeitel workeitel requested a review from eladb as a code owner October 17, 2019 21:24
@mergify
Copy link
Contributor

mergify bot commented Oct 17, 2019

Thanks so much for taking the time to contribute to the AWS CDK ❤️

We will shortly assign someone to review this pull request and help get it
merged. In the meantime, please take a minute to make sure you follow this
checklist
:

  • PR title type(scope): text
    • type: fix, feat, refactor go into CHANGELOG, chore is hidden
    • scope: name of module without aws- or cdk- prefix or postfix (e.g. s3 instead of aws-s3-deployment)
    • text: use all lower-case, do not end with a period, do not include issue refs
  • PR Description
    • Rationale: describe rationale of change and approach taken
    • Issues: indicate issues fixed via: fixes #xxx or closes #xxx
    • Breaking?: last paragraph: BREAKING CHANGE: <describe what changed + link for details>
  • Testing
    • Unit test added. Prefer to add a new test rather than modify existing tests
    • CLI or init templates change? Re-run/add CLI integration tests
  • Documentation
    • README: update module README to describe new features
    • API docs: public APIs must be documented. Copy from official AWS docs when possible
    • Design: for significant features, follow design process

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • Result: FAILED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@rix0rrr rix0rrr changed the title Create sub-structure for Metric rendering options feat(cloudwatch): make it easier to override metric rendering Oct 21, 2019
@rix0rrr rix0rrr changed the title feat(cloudwatch): make it easier to override metric rendering feat(cloudwatch): allow overriding of metric graph rendering Oct 21, 2019
Copy link
Contributor

@rix0rrr rix0rrr left a comment

Choose a reason for hiding this comment

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

Please add a test

@workeitel workeitel force-pushed the cloudwatch-metric-rendering-option branch from 4721a17 to f8368bf Compare October 21, 2019 20:39
@mergify mergify bot dismissed rix0rrr’s stale review October 21, 2019 20:40

Pull request has been modified.

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • Result: FAILED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@rix0rrr
Copy link
Contributor

rix0rrr commented Oct 23, 2019

Aha yes. The change you are making breaks backwards compatibility:

err  - METHOD @aws-cdk/aws-cloudwatch.IMetric.toGraphConfig: returns @aws-cdk/aws-cloudwatch.MetricGraphConfig: formerly required property 'period' is missing in @aws-cdk/aws-cloudwatch.MetricGraphConfig [change-return-type:@aws-cdk/aws-cloudwatch.IMetric.toGraphConfig]

The reason this is breaking is that someone somewhere in the world could be writing this piece of code:

console.log(metric.toGraphConfig().period);

And that code would break with the current state of this change.

Please keep on generating the old properties, and mark them as @deprecated.

@workeitel workeitel force-pushed the cloudwatch-metric-rendering-option branch from f8368bf to 02d1678 Compare October 23, 2019 20:25
@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • Result: FAILED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@workeitel workeitel force-pushed the cloudwatch-metric-rendering-option branch from 02d1678 to 8f26c2c Compare October 28, 2019 23:45
@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • Result: FAILED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@workeitel
Copy link
Contributor Author

Rebased on top of master. The build still fails because the old period field is now optional and ignored in favor of the new period field in the sub-structure:

API elements with incompatible changes:
err  - METHOD @aws-cdk/aws-cloudwatch.Metric.toGraphConfig: returns @aws-cdk/aws-cloudwatch.MetricGraphConfig: formerly required property 'period' is optional in @aws-cdk/aws-cloudwatch.MetricGraphConfig [change-return-type:@aws-cdk/aws-cloudwatch.Metric.toGraphConfig]
err  - METHOD @aws-cdk/aws-cloudwatch.IMetric.toGraphConfig: returns @aws-cdk/aws-cloudwatch.MetricGraphConfig: formerly required property 'period' is optional in @aws-cdk/aws-cloudwatch.MetricGraphConfig [change-return-type:@aws-cdk/aws-cloudwatch.IMetric.toGraphConfig]

@rix0rrr
Copy link
Contributor

rix0rrr commented Oct 29, 2019

Rebased on top of master. The build still fails because the old period field is now optional and ignored in favor of the new period field in the sub-structure:

Yeah, you can't really do that. Again, someone could be writing (in Java for example):

if (metric.toGraphConfig().getPeriod().equals('30')) { ... }

And that would now throw a NullReferenceException (in case the property was actually not set).

Make it non-optional, mark it as @deprecated, and fill it with a value (that will be ignored by the rest of the framework, but may still be used by any of our 3rd party users).

Such are the burdens of API compatibility.

This allows to create custom graphs easier by creating sub-class of
metric and overriding the `toGraphConfig` method. Before attributes have
been only selectively copied to the widget configuration.

```
class HiddenMetric extends Metric {
  public toGraphConfig(): any {
    const ret = super.toGraphConfig();
    ret.renderingProperties.visible = false;
  }
}
```

Before `visible` would not have been taken over since it was not part of
options.

Docs: https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/CloudWatch-Dashboard-Body-Structure.html#CloudWatch-Dashboard-Properties-Rendering-Object-Format
@workeitel workeitel force-pushed the cloudwatch-metric-rendering-option branch from 8f26c2c to 672eb65 Compare October 29, 2019 13:30
@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • Result: FAILED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@workeitel workeitel force-pushed the cloudwatch-metric-rendering-option branch from 672eb65 to f44d266 Compare October 29, 2019 14:06
@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@mergify
Copy link
Contributor

mergify bot commented Oct 29, 2019

Thank you for contributing! Your pull request is now being automatically merged.

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@mergify mergify bot merged commit 3643130 into aws:master Oct 29, 2019
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.

3 participants