diff --git a/ADMINS.md b/ADMINS.md new file mode 100644 index 0000000..4b8c837 --- /dev/null +++ b/ADMINS.md @@ -0,0 +1,3 @@ +## Admins + +[This document](https://github.com/opensearch-project/.github/blob/main/ADMINS.md) explains what admins do in this repo. and how they should be doing it. If you're interested in becoming a maintainer, see [MAINTAINERS](MAINTAINERS.md). If you're interested in contributing, see [CONTRIBUTING](CONTRIBUTING.md). \ No newline at end of file diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 5b627cf..80bd22f 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,4 +1,26 @@ ## Code of Conduct -This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct). -For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact -opensource-codeofconduct@amazon.com with any additional questions or comments. + +This code of conduct applies to all spaces provided by the OpenSource project including in code, documentation, issue trackers, mailing lists, chat channels, wikis, blogs, social media, events, conferences, meetings, and any other communication channels used by the project. + +**Our open source communities endeavor to:** + +* Be Inclusive: We are committed to being a community where everyone can join and contribute. This means using inclusive and welcoming language. +* Be Welcoming: We are committed to maintaining a safe space for everyone to be able to contribute. +* Be Respectful: We are committed to encouraging differing viewpoints, accepting constructive criticism and work collaboratively towards decisions that help the project grow. Disrespectful and unacceptable behavior will not be tolerated. +* Be Collaborative: We are committed to supporting what is best for our community and users. When we build anything for the benefit of the project, we should document the work we do and communicate to others on how this affects their work. + +**Our Responsibility. As contributors, members, or bystanders we each individually have the responsibility to behave professionally and respectfully at all times. Disrespectful and unacceptable behaviors include, but are not limited to:** + +* The use of violent threats, abusive, discriminatory, or derogatory language; +* Offensive comments related to gender, gender identity and expression, sexual orientation, disability, mental illness, race, political or religious affiliation; +* Posting of sexually explicit or violent content; +* The use of sexualized language and unwelcome sexual attention or advances; +* Public or private harassment of any kind; +* Publishing private information, such as physical or electronic address, without permission; +* Other conduct which could reasonably be considered inappropriate in a professional setting; +* Advocating for or encouraging any of the above behaviors. + +**Enforcement and Reporting Code of Conduct Issues:** + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported. [Contact us](mailto:opensource-codeofconduct@amazon.com). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. + diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c4b6a1c..f89cfda 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,59 +1,138 @@ -# Contributing Guidelines +- [Contributing to OpenSearch](#contributing-to-opensearch) +- [First Things First](#first-things-first) +- [Ways to Contribute](#ways-to-contribute) + - [Bug Reports](#bug-reports) + - [Feature Requests](#feature-requests) + - [Documentation Changes](#documentation-changes) + - [Contributing Code](#contributing-code) +- [Developer Certificate of Origin](#developer-certificate-of-origin) +- [Changelog](#changelog) +- [Review Process](#review-process) -Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, correction, or additional -documentation, we greatly value feedback and contributions from our community. +## Contributing to OpenSearch -Please read through this document before submitting any issues or pull requests to ensure we have all the necessary -information to effectively respond to your bug report or contribution. +OpenSearch is a community project that is built and maintained by people just like **you**. We're glad you're interested in helping out. There are several different ways you can do it, but before we talk about that, let's talk about how to get started. +## First Things First -## Reporting Bugs/Feature Requests +1. **When in doubt, open an issue** - For almost any type of contribution, the first step is opening an issue. Even if you think you already know what the solution is, writing down a description of the problem you're trying to solve will help everyone get context when they review your pull request. If it's truly a trivial change (e.g. spelling error), you can skip this step -- but as the subject says, when it doubt, [open an issue](https://github.com/opensearch-project/geospatial/issues). -We welcome you to use the GitHub issue tracker to report bugs or suggest features. +2. **Only submit your own work** (or work you have sufficient rights to submit) - Please make sure that any code or documentation you submit is your work or you have the rights to submit. We respect the intellectual property rights of others, and as part of contributing, we'll ask you to sign your contribution with a "Developer Certificate of Origin" (DCO) that states you have the rights to submit this work and you understand we'll use your contribution. There's more information about this topic in the [DCO section](#developer-certificate-of-origin). -When filing an issue, please check existing open, or recently closed, issues to make sure somebody else hasn't already -reported the issue. Please try to include as much information as you can. Details like these are incredibly useful: +## Ways to Contribute -* A reproducible test case or series of steps -* The version of our code being used -* Any modifications you've made relevant to the bug -* Anything unusual about your environment or deployment +### Bug Reports +Ugh! Bugs! -## Contributing via Pull Requests -Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that: +A bug is when software behaves in a way that you didn't expect and the developer didn't intend. To help us understand what's going on, we first want to make sure you're working from the latest version. -1. You are working against the latest source on the *main* branch. -2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already. -3. You open an issue to discuss any significant work - we would hate for your time to be wasted. +Once you've confirmed that the bug still exists in the latest version, you'll want to check to make sure it's not something we already know about on the [open issues GitHub page](https://github.com/opensearch-project/geospatial/issues). -To send us a pull request, please: +If you've upgraded to the latest version and you can't find it in our open issues list, then you'll need to tell us how to reproduce it Provide as much information as you can. You may think that the problem lies with your query, when actually it depends on how your data is indexed. The easier it is for us to recreate your problem, the faster it is likely to be fixed. -1. Fork the repository. -2. Modify the source; please focus on the specific change you are contributing. If you also reformat all the code, it will be hard for us to focus on your change. -3. Ensure local tests pass. -4. Commit to your fork using clear commit messages. -5. Send us a pull request, answering any default questions in the pull request interface. -6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation. +### Feature Requests -GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and -[creating a pull request](https://help.github.com/articles/creating-a-pull-request/). +If you've thought of a way that OpenSearch could be better, we want to hear about it. We track feature requests using GitHub, so please feel free to open an issue which describes the feature you would like to see, why you need it, and how it should work. +### Documentation Changes -## Finding contributions to work on -Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any 'help wanted' issues is a great place to start. +TODO +### Contributing Code -## Code of Conduct -This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct). -For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact -opensource-codeofconduct@amazon.com with any additional questions or comments. +As with other types of contributions, the first step is to [open an issue on GitHub](https://github.com/opensearch-project/geospatial/issues). Opening an issue before you make changes makes sure that someone else isn't already working on that particular problem. It also lets us all work together to find the right approach before you spend a bunch of time on a PR. So again, when in doubt, open an issue. +## Developer Certificate of Origin -## Security issue notifications -If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public github issue. +OpenSearch is an open source product released under the Apache 2.0 license (see either [the Apache site](https://www.apache.org/licenses/LICENSE-2.0) or the [LICENSE file](LICENSE)). The Apache 2.0 license allows you to freely use, modify, distribute, and sell your own products that include Apache 2.0 licensed software. +We respect intellectual property rights of others and we want to make sure all incoming contributions are correctly attributed and licensed. A Developer Certificate of Origin (DCO) is a lightweight mechanism to do that. -## Licensing +The DCO is a declaration attached to every contribution made by every developer. In the commit message of the contribution, the developer simply adds a `Signed-off-by` statement and thereby agrees to the DCO, which you can find below or at [DeveloperCertificate.org](http://developercertificate.org/). + +``` +Developer's Certificate of Origin 1.1 + +By making a contribution to this project, I certify that: + +(a) The contribution was created in whole or in part by me and I + have the right to submit it under the open source license + indicated in the file; or + +(b) The contribution is based upon previous work that, to the + best of my knowledge, is covered under an appropriate open + source license and I have the right under that license to + submit that work with modifications, whether created in whole + or in part by me, under the same open source license (unless + I am permitted to submit under a different license), as + Indicated in the file; or + +(c) The contribution was provided directly to me by some other + person who certified (a), (b) or (c) and I have not modified + it. + +(d) I understand and agree that this project and the contribution + are public and that a record of the contribution (including + all personal information I submit with it, including my + sign-off) is maintained indefinitely and may be redistributed + consistent with this project or the open source license(s) + involved. + ``` + +We require that every contribution to OpenSearch is signed with a Developer Certificate of Origin. Additionally, please use your real name. We do not accept anonymous contributors nor those utilizing pseudonyms. + +Each commit must include a DCO which looks like this + +``` +Signed-off-by: Jane Smith +``` + +You may type this line on your own when writing your commit messages. However, if your user.name and user.email are set in your git configs, you can use `-s` or `– – signoff` to add the `Signed-off-by` line to the end of the commit message. + +## Changelog + +OpenSearch maintains version specific changelog by enforcing a change to the ongoing [CHANGELOG](CHANGELOG.md) file adhering to the [Keep A Changelog](https://keepachangelog.com/en/1.0.0/) format. The purpose of the changelog is for the contributors and maintainers to incrementally build the release notes throughout the development process to avoid a painful and error-prone process of attempting to compile the release notes at release time. On each release the "unreleased" entries of the changelog are moved to the appropriate release notes document in the `./release-notes` folder. Also, incrementally building the changelog provides a concise, human-readable list of significant features that have been added to the unreleased version under development. + +### Which changes require a CHANGELOG entry? +Changelogs are intended for operators/administrators, developers integrating with libraries and APIs, and end-users interacting with OpenSearch Dashboards and/or the REST API (collectively referred to as "user"). In short, any change that a user of OpenSearch might want to be aware of should be included in the changelog. The changelog is _not_ intended to replace the git commit log that developers of OpenSearch itself rely upon. The following are some examples of changes that should be in the changelog: + +- A newly added feature +- A fix for a user-facing bug +- Dependency updates +- Fixes for security issues + +The following are some examples where a changelog entry is not necessary: + +- Adding, modifying, or fixing tests +- An incremental PR for a larger feature (such features should include _one_ changelog entry for the feature) +- Documentation changes or code refactoring +- Build-related changes + +Any PR that does not include a changelog entry will result in a failure of the validation workflow in GitHub. If the contributor and maintainers agree that no changelog entry is required, then the `skip-changelog` label can be applied to the PR which will result in the workflow passing. + +### How to add my changes to [CHANGELOG](CHANGELOG.md)? + +Adding in the change is two step process: +1. Add your changes to the corresponding section within the CHANGELOG file with dummy pull request information, publish the PR +2. Update the entry for your change in [`CHANGELOG.md`](CHANGELOG.md) and make sure that you reference the pull request there. + +### Where should I put my CHANGELOG entry? +Please review the [branching strategy](https://github.com/opensearch-project/.github/blob/main/RELEASING.md#opensearch-branching) document. The changelog on the `main` branch will contain sections for the _next major_ and _next minor_ releases. Your entry should go into the section it is intended to be released in. In practice, most changes to `main` will be backported to the next minor release so most entries will likely be in that section. + +The following examples assume the _next major_ release on main is 3.0, then _next minor_ release is 2.5, and the _current_ release is 2.4. + +- **Add a new feature to release in next minor:** Add a changelog entry to `[Unreleased 2.x]` on main, then backport to 2.x (including the changelog entry). +- **Introduce a breaking API change to release in next major:** Add a changelog entry to `[Unreleased 3.0]` on main, do not backport. +- **Upgrade a dependency to fix a CVE:** Add a changelog entry to `[Unreleased 2.x]` on main, then backport to 2.x (including the changelog entry), then backport to 2.4 and ensure the changelog entry is added to `[Unreleased 2.4.1]`. + +## Review Process + +We deeply appreciate everyone who takes the time to make a contribution. We will review all contributions as quickly as possible. As a reminder, [opening an issue](https://github.com/opensearch-project/geospatial/issues) discussing your change before you make it is the best way to smooth the PR process. This will prevent a rejection because someone else is already working on the problem, or because the solution is incompatible with the architectural direction. + +During the PR process, expect that there will be some back-and-forth. Please try to respond to comments in a timely fashion, and if you don't wish to continue with the PR, let us know. If a PR takes too many iterations for its complexity or size, we may reject it. Additionally, if you stop responding we may close the PR as abandoned. In either case, if you feel this was done in error, please add a comment on the PR. + +If we accept the PR, a [maintainer](MAINTAINERS.md) will merge your change and usually take care of backporting it to appropriate branches ourselves. + +If we reject the PR, we will close the pull request with a comment explaining why. This decision isn't always final: if you feel we have misunderstood your intended change or otherwise think that we should reconsider then please continue the conversation with a comment on the PR and we'll do our best to address any further points you raise. -See the [LICENSE](LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution. diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md new file mode 100644 index 0000000..540dc32 --- /dev/null +++ b/DEVELOPER_GUIDE.md @@ -0,0 +1,31 @@ +- [OpenSearch Project Metrics Developer Guide](#opensearch-project-metrics-developer-guide) + - [Build](#build) + - [Deploy](#deploy) + - [Forking and Cloning](#forking-and-cloning) + - [Submitting Changes](#submitting-changes) + +### OpenSearch Project Metrics Developer Guide + +So you want to contribute code to this project? Excellent! We're glad you're here. Here's what you need to do. + +#### Build + +- Generate the project jar by running `./gradlew clean build `, this will also generate a zip with all dependency jars. + +#### Deploy + +- Now `cd infrastructure/`, update the enum `lib/enums/account.ts` file with the desired AWS account and run `deploy` to create all the required backend resources. + - `cdk deploy OpenSearchHealth-VPC`: To deploy the VPC resources. + - `cdk deploy OpenSearchHealth-OpenSearch`: To deploy the OpenSearch cluster. + - `cdk deploy OpenSearchMetrics-Workflow`: To deploy the lambda and step function. + - `cdk deploy OpenSearchMetrics-HostedZone`: To deploy the route53 and DNS setup. + - `cdk deploy OpenSearchMetricsNginxReadonly`: To deploy the dashboard read only setup. + - `cdk deploy OpenSearchWAF`: To deploy the AWS WAF for the project ALB's. + +### Forking and Cloning + +Fork this repository on GitHub, and clone locally with `git clone`. + +### Submitting Changes + +See [CONTRIBUTING](CONTRIBUTING.md). diff --git a/NOTICE b/NOTICE index 616fc58..6a46a23 100644 --- a/NOTICE +++ b/NOTICE @@ -1 +1,3 @@ -Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +OpenSearch (https://opensearch.org/) +Copyright OpenSearch Contributors + diff --git a/README.md b/README.md index 11724d4..4f06382 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,18 @@ ![OpenSearch logo](./OpenSearch.svg) -## OpenSearch Project Metrics +## OpenSearch Metrics -- Generate the project jar by running `./gradlew clean build `, this will also generate a zip with all dependency jars. -- Now `cd infrastructure/`, update the enum `lib/enums/account.ts` file with the desired AWS account and run `deploy` to create all the required backend resources. - - `cdk deploy OpenSearchHealth-VPC`: To deploy the VPC resources. - - `cdk deploy OpenSearchHealth-OpenSearch`: To deploy the OpenSearch cluster. - - `cdk deploy OpenSearchMetrics-Workflow`: To deploy the lambda and step function. - - `cdk deploy OpenSearchMetrics-HostedZone`: T0 deploy the route53 and DNS setup. - - `cdk deploy OpenSearchMetricsNginxReadonly`: To deploy the dashboard read only setup. - - `cdk deploy OpenSearchWAF`: To deploy the AWS WAF for the project ALB's. +The OpenSearch Metrics project showcases and keeps track of several important OpenSearch health metrics, with the goal of presenting a comprehensive overview of the OpenSearch project's health and status to the community through visualizations. The OpenSearch Metrics dashboard is accessible at [URL](https://metrics.opensearch.org/_dashboards/app/dashboards#/list?_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:now-4y,to:now))). - -## OpenSearch Project Supported Metrics - -### General Metrics +### [OpenSearch Project Insights](https://metrics.opensearch.org/_dashboards/app/dashboards#/view/a987a4b0-d801-11ee-8a84-e3710560950c) | metric_name | metric_description | |-------------------------------------|----------------------------------------------------------------------------------------------------------------------------| | Closed Issues | The metric that counts the total number of issues that have been closed. | | Created Issues | The metric that counts the issues created. | | Issue Comments | The metric that counts the total number of comments made on issues. | -| Negative Reactions | The metric that counts the reactions such as 👎 or similar GitHub negative indicators. | -| Positive Reactions | The metric that counts the reactions such as 👍 or similar GitHub positive indicators. | +| Negative Reactions | The metric that counts the reactions such as 👎 or similar GitHub negative indicators. | +| Positive Reactions | The metric that counts the reactions such as 👍 or similar GitHub positive indicators. | | Merged Pull Requests | The metric that counts the total number of pull requests that have been successfully merged. | | Open Issues | The metric that counts the total number of issues that are currently open and unresolved. | | Open Pull Requests | The metric that counts the total number of pull requests that are currently open and awaiting review and merge. | @@ -30,19 +20,13 @@ | Uncommented Pull Requests | The metric that counts the total number of open pull requests that haven't received any comments. | | Unlabelled Issues | The metric that counts the total number of issues that do not have any labels assigned to them. | | Unlabelled Pull Requests | The metric that counts the total number of pull requests that do not have any labels assigned to them. | -| Untriaged Issues | The metric that counts the total number of issues that have triaged or acknowledged. | +| Untriaged Issues | The metric that counts the total number of issues that have not triaged or acknowledged. | | Avgerage: Pull Requests Open/Closed | The metric that determines the duration from the PR creation date to the PR close date. | | Avgerage: Issues Open/Closed | The metric that determines the duration from the issue creation date to the issue close date. | +| Issues Grouped by Label | The metric that counts the issues associated with a specific label. | +| Pull Requests Grouped by Label | The metric that counts the pull requests associated with a specific label. | - -### GitHub Label Metrics - -| metric_name | metric_description | -|---------------------------------------------|---------------------------------------------------------------------------------------------------| -| Issues Grouped by Label | The metric that counts the issues associated with a specific label. | -| Pull Requests Grouped by Label | The metric that counts the pull requests associated with a specific label. | - -### Release Metrics +### [OpenSearch Release Metrics](https://metrics.opensearch.org/_dashboards/app/dashboards#/view/12d47dd0-e0cc-11ee-86f3-3358a59f8c46) | metric_name | metric_description | |---------------------------|----------------------------------------------------------------------------------------------| @@ -54,16 +38,36 @@ | Issues with Release Label | The metric that counts the issues (open and closed state) that has the release label. | | | Pull Requests with Release Label | The metric that counts the pull requests (open and merged state) that has the release label. | | -### OpenSearch Core Metrics +### [OpenSearch Ops Metrics](https://metrics.opensearch.org/_dashboards/app/dashboards#/view/f1ad21c0-e323-11ee-9a74-07cd3b4ff414) + +| metric_name | metric_description | +|-------------------------------------|---------------------------------------------------------------------------------------------------------------------| +| Contributions | The GitHub Contributions by Userid. | +| Untriaged Issues older than 2 weeks | The metric that counts the total number of issues that have not triaged or acknowledged and are older than 2 weeks. | +| Pulls Merged Weekly | The number of Pull Requests merged per week. | +| Open Pull Requests | The number of Open Pull Requests, Open Pull Requests created within the last two weeks, and number of Draft PRs. | +| Issues Created | Issues created on a particular date. | +| Open Pull Requests by age | A data table of Pull Requests and their data. | +| Flaky tests data | Flaky tests breakdown by repo. | +| Flaky tests count | Cumulative count of Flaky tests. | +| Total Comments Weekly | The total number of comments each week. | +| Issue Stats | Stats about issues including contributors, Avg days to close, Positive and Negative Reactions data. | +| Reactions | Positive vs Negative reactions. | +Open Issues with label `Flaky` + +### [OpenSearch Gradle Check Metrics](https://metrics.opensearch.org/_dashboards/app/dashboards#/view/e5e64d40-ed31-11ee-be99-69d1dbc75083) + +| metric_name | metric_description | +|-------------------------------------|--------------------------------------------------------| +| Test failure report | Report for Gradle Check failed tests. | +| Top test failures | Gradle Check top failed tests.. | +| Class level test failures | Gradle Check class level test failures. | +| Gradle failure count at PR level | Gradle Check test failures data at pull request level. | -| metric_name | metric_description | -|--------------------|------------------------------------| -| Contributions | The GitHub Contributions by Userid | -| Contribution Goals | Goals for number of contributions | -| Flaky tests | Open Issues with label `Flaky` | +## Contributing -### OpenSearch Gradle Check Metrics +See [developer guide](DEVELOPER_GUIDE.md) and [how to contribute to this project](CONTRIBUTING.md). ## Security diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000..6c40871 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,4 @@ +## Reporting a Vulnerability + +If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/) or directly via email to aws-security@amazon.com. Please do **not** create a public GitHub issue. + diff --git a/infrastructure/lib/enums/project.ts b/infrastructure/lib/enums/project.ts index c0fb359..55f4b9c 100644 --- a/infrastructure/lib/enums/project.ts +++ b/infrastructure/lib/enums/project.ts @@ -4,7 +4,8 @@ enum Project{ JENKINS_AGENT_ROLE = '', REGION = '', METRICS_HOSTED_ZONE = 'metrics.opensearch.org', - METRICS_COGNITO_HOSTED_ZONE = 'metrics.login.opensearch.org', + // The METRICS_COGNITO_HOSTED_ZONE is s login endpoint for the OpenSearch Dashboards, update as required to allow OpenSearch Dashboards to login using AWS Cognito + METRICS_COGNITO_HOSTED_ZONE = 'sample.login.endpoint', RESTRICTED_PREFIX = '', LAMBDA_PACKAGE = 'opensearch-metrics-1.0.zip', EC2_AMI_SSM = '', diff --git a/infrastructure/test/hostedzone-stack.test.ts b/infrastructure/test/hostedzone-stack.test.ts index ffed60a..aa091ec 100644 --- a/infrastructure/test/hostedzone-stack.test.ts +++ b/infrastructure/test/hostedzone-stack.test.ts @@ -29,9 +29,9 @@ test('HostedZoneCognito Stack Test', () => { const hostedZoneCognitoStackTemplate = Template.fromStack(hostedZoneCognitoStack); hostedZoneCognitoStackTemplate.resourceCountIs('AWS::Route53::HostedZone', 1); hostedZoneCognitoStackTemplate.hasResourceProperties('AWS::Route53::HostedZone', { - "Name": "metrics.login.opensearch.org." + "Name": `${Project.METRICS_COGNITO_HOSTED_ZONE}.` }); hostedZoneCognitoStackTemplate.hasResourceProperties('AWS::CertificateManager::Certificate', { - "DomainName": "metrics.login.opensearch.org" + "DomainName": `${Project.METRICS_COGNITO_HOSTED_ZONE}` }); }); diff --git a/infrastructure/test/nginx.test.ts b/infrastructure/test/nginx.test.ts index 835b2d0..ce2c600 100644 --- a/infrastructure/test/nginx.test.ts +++ b/infrastructure/test/nginx.test.ts @@ -87,7 +87,7 @@ test('OpenSearchMetricsNginxCognito Test', () => { const openSearchDomainStackTemplate = Template.fromStack(openSearchDomainStack); openSearchDomainStackTemplate.resourceCountIs('AWS::Route53::RecordSet', 1); openSearchDomainStackTemplate.hasResourceProperties('AWS::Route53::RecordSet', { - "Name": "metrics.login.opensearch.org.", + "Name": `${Project.METRICS_COGNITO_HOSTED_ZONE}.`, "Type": "A" }); diff --git a/infrastructure/test/opensearch-stack.test.ts b/infrastructure/test/opensearch-stack.test.ts index 8b1c5ae..b5e4bb4 100644 --- a/infrastructure/test/opensearch-stack.test.ts +++ b/infrastructure/test/opensearch-stack.test.ts @@ -94,7 +94,4 @@ test('OpenSearchDomain Stack Test', () => { } } }); - - - });