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

Add support for Amazon Managed Service for Prometheus #16882

Merged
merged 5 commits into from
Jan 28, 2021
Merged

Add support for Amazon Managed Service for Prometheus #16882

merged 5 commits into from
Jan 28, 2021

Conversation

nicolai86
Copy link
Contributor

When merged, this will close #16788

@nicolai86 nicolai86 requested a review from a team as a code owner December 23, 2020 00:28
@ghost ghost added size/L Managed by automation to categorize the size of a PR. documentation Introduces or discusses updates to documentation. provider Pertains to the provider itself, rather than any interaction with AWS. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Dec 23, 2020
@github-actions github-actions bot added the needs-triage Waiting for first response or review from a maintainer. label Dec 23, 2020
@github-actions
Copy link

Thank you for your contribution! 🚀

Please note that typically Go dependency changes are handled in this repository by dependabot or the maintainers. This is to prevent pull request merge conflicts and further delay reviews of contributions. Remove any changes to the go.mod or go.sum files and commit them into this pull request.

Additional details:

  • Check open pull requests with the dependencies label to view other dependency updates.
  • If this pull request includes an update the AWS Go SDK (or any other dependency) version, only updates submitted via dependabot will be merged. This pull request will need to remove these changes and will need to be rebased after the existing dependency update via dependabot has been merged for this pull request to be reviewed.
  • If this pull request is for supporting a new AWS service:
    • Ensure the new AWS service changes are following the Contributing Guide section on new services, in particular that the dependency addition and initial provider support are in a separate pull request from other changes (e.g. new resources). Contributions not following this item will not be reviewed until the changes are split.
    • If this pull request is already a separate pull request from the above item, you can ignore this message.

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Welcome @nicolai86 👋

It looks like this is your first Pull Request submission to the Terraform AWS Provider! If you haven’t already done so please make sure you have checked out our CONTRIBUTING guide and FAQ to make sure your contribution is adhering to best practice and has all the necessary elements in place for a successful approval.

Also take a look at our FAQ which details how we prioritize Pull Requests for inclusion.

Thanks again, and welcome to the community! 😃

@@ -0,0 +1,44 @@
---
subcategory: "Prometheus Service (AMP)"

Choose a reason for hiding this comment

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

Amazon Managed Service for Prometheus (AMP)

@lcacciagioni
Copy link

Any updates when this can be merged?

Base automatically changed from master to main January 23, 2021 01:00
this PR adds support for the new AWS Managed Prometheus service (preview).
@github-actions
Copy link

Thank you for your contribution! 🚀

Please note that the CHANGELOG.md file contents are handled by the maintainers during merge. This is to prevent pull request merge conflicts, especially for contributions which may not be merged immediately. Please see the Contributing Guide for additional pull request review items.

Remove any changes to the CHANGELOG.md file and commit them in this pull request to prevent delays with reviewing and potentially merging this pull request.

Copy link
Contributor

@bflad bflad left a comment

Choose a reason for hiding this comment

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

Hi @nicolai86 👋 Thank you for submitting this. Overall it was on the right track. Please see the below initial feedback and reach out if you have any questions. 👍

aws/config.go Show resolved Hide resolved
aws/config.go Outdated Show resolved Hide resolved
aws/config.go Outdated Show resolved Hide resolved
aws/resource_aws_prometheus_workspace.go Outdated Show resolved Hide resolved
aws/resource_aws_prometheus_workspace.go Outdated Show resolved Hide resolved
website/docs/r/prometheus_workspace.html.markdown Outdated Show resolved Hide resolved
aws/resource_aws_prometheus_workspace_test.go Outdated Show resolved Hide resolved
aws/resource_aws_prometheus_workspace_test.go Show resolved Hide resolved
aws/resource_aws_prometheus_workspace_test.go Show resolved Hide resolved
aws/resource_aws_prometheus_workspace.go Show resolved Hide resolved
@bflad bflad added new-resource Introduces a new resource. and removed needs-triage Waiting for first response or review from a maintainer. labels Jan 26, 2021
@bflad bflad self-assigned this Jan 26, 2021
@ghost ghost added size/XL Managed by automation to categorize the size of a PR. and removed size/L Managed by automation to categorize the size of a PR. labels Jan 26, 2021
@nicolai86
Copy link
Contributor Author

thanks for the pointers @bflad . I've pushed a new revision that introduces waiters, removes the state, and adopts a ton of your comments.

this PR adds support for the new AWS Managed Prometheus service (preview).
Copy link
Contributor

@bflad bflad left a comment

Choose a reason for hiding this comment

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

Looking real good. Just some polish so we can hopefully release this today 🤞

aws/resource_aws_prometheus_workspace.go Outdated Show resolved Hide resolved
aws/resource_aws_prometheus_workspace_test.go Outdated Show resolved Hide resolved
website/docs/r/prometheus_workspace.html.markdown Outdated Show resolved Hide resolved
aws/resource_aws_prometheus_workspace.go Outdated Show resolved Hide resolved
Copy link
Contributor

@bflad bflad left a comment

Choose a reason for hiding this comment

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

Looks great, thank you for this, @nicolai86 🚀

Output from acceptance testing in AWS Commercial:

--- PASS: TestAccAWSAMPWorkspace_disappears (12.45s)
--- PASS: TestAccAWSAMPWorkspace_basic (33.77s)

Output from acceptance testing in AWS GovCloud (US):

=== CONT  TestAccAWSAMPWorkspace_disappears
    resource_aws_prometheus_workspace_test.go:54: Step 1/1 error: Error running apply:
        Error: error creating Prometheus WorkSpace (): RequestError: send request failed
        caused by: Post "https://aps.us-gov-west-1.amazonaws.com/workspaces": dial tcp: lookup aps.us-gov-west-1.amazonaws.com: no such host


--- FAIL: TestAccAWSAMPWorkspace_disappears (29.51s)
=== CONT  TestAccAWSAMPWorkspace_basic
    resource_aws_prometheus_workspace_test.go:18: Step 1/4 error: Error running apply:
        Error: error creating Prometheus WorkSpace (): RequestError: send request failed
        caused by: Post "https://aps.us-gov-west-1.amazonaws.com/workspaces": dial tcp: lookup aps.us-gov-west-1.amazonaws.com: no such host


--- FAIL: TestAccAWSAMPWorkspace_basic (33.28s)

Which is expected because the service does not exist in those regions. Will create a followup issue to add custom PreCheck since the service is also not published in the AWS Go SDK endpoints.

@bflad bflad merged commit 2258cd7 into hashicorp:main Jan 28, 2021
bflad added a commit that referenced this pull request Jan 28, 2021
@github-actions github-actions bot added this to the v3.26.0 milestone Jan 28, 2021
@ghost
Copy link

ghost commented Jan 28, 2021

This has been released in version 3.26.0 of the Terraform AWS provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template for triage. Thanks!

@ghost
Copy link

ghost commented Feb 28, 2021

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!

@ghost ghost locked as resolved and limited conversation to collaborators Feb 28, 2021
@justinretzolk justinretzolk added the partner Contribution from a partner. label May 16, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
documentation Introduces or discusses updates to documentation. new-resource Introduces a new resource. partner Contribution from a partner. provider Pertains to the provider itself, rather than any interaction with AWS. size/XL Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add support for Amazon Managed Service for Prometheus
6 participants