Skip to content

Commit

Permalink
Merge branch 'main' into deployment_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
KennethSkylight committed Aug 24, 2023
2 parents 20f5d99 + 2d8daf3 commit 617fa7c
Show file tree
Hide file tree
Showing 23 changed files with 306 additions and 229 deletions.
24 changes: 13 additions & 11 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

title: ""
labels: ""
assignees: ""
---

**Describe the bug**
Expand All @@ -15,6 +14,7 @@ Please describe the impact this bug is causing to your program or organization.

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
Expand All @@ -30,15 +30,17 @@ If applicable, add screenshots to help explain your problem.
If applicable, please attach logs to help describe your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
7 changes: 3 additions & 4 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

title: ""
labels: ""
assignees: ""
---

**Is your feature request related to a problem? Please describe.**
Expand Down
17 changes: 8 additions & 9 deletions .github/ISSUE_TEMPLATE/maintenance.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
---
name: Maintenance
about: Questions and requests related to organizational support and maintenance
title: ''
labels: ''
assignees: ''

title: ""
labels: ""
assignees: ""
---

**What type of help do you need?**

* [ ] Question
* [ ] New Repo
* [ ] Delete Repo
* [ ] User Membership (please make sure new members are familiar with the [CDC open practices](https://github.com/CDCgov/template/blob/master/open_practices.md#profile-setup) and set up their profile with name and org info to help people collaborate with them)
* [ ] Other
- [ ] Question
- [ ] New Repo
- [ ] Delete Repo
- [ ] User Membership (please make sure new members are familiar with the [CDC open practices](https://github.com/CDCgov/template/blob/master/open_practices.md#profile-setup) and set up their profile with name and org info to help people collaborate with them)
- [ ] Other

**Please describe how you'd like us to help.**
12 changes: 6 additions & 6 deletions .github/PULL_REQUEST_TEMPLATE/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''
title: ""
labels: ""
assignees: ""
---

**Please describe the bug this fixes or the feature this adds.**
Expand All @@ -18,6 +18,6 @@ assignees: ''

**Please include the following checks for open source contributing?**

* [ ] Did you check for sensitive data, and remove any?
* [ ] Are additional approvals needed for this change?
* [ ] Are there potential vulnerabilities or licensing issues with any new dependencies introduced?
- [ ] Did you check for sensitive data, and remove any?
- [ ] Are additional approvals needed for this change?
- [ ] Are there potential vulnerabilities or licensing issues with any new dependencies introduced?
7 changes: 3 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE/vulnerability.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: Vulnerability Maintenance
about: Routine updates to address vulnerabilities.
title: ''
labels: ''
assignees: ''

title: ""
labels: ""
assignees: ""
---

**What vulnerabilities does this PR remove or update?**
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
name: Deployment

on:
workflow_dispatch:
inputs:
environment:
description: "Environment to deploy to"
description: Environment to deploy to
type: environment
required: true
# add back in when ready to add the terraform
Expand All @@ -28,15 +29,17 @@ jobs:
outputs:
tf_env: ${{ steps.set-environment.outputs.tf_env }}
short_cid: ${{ steps.set-environment.outputs.short_cid }}
record_linkage_container_url: ${{ steps.terraform.outputs.record_linkage_container_url }}
record_linkage_container_url:
${{ steps.terraform.outputs.record_linkage_container_url
}}
steps:
- name: Check Out Changes
uses: actions/checkout@v3

- name: Setup Terraform
uses: hashicorp/setup-terraform@v2

- name: "Azure login"
- name: Azure login
uses: azure/login@v1
with:
client-id: ${{ secrets.CLIENT_ID }}
Expand Down Expand Up @@ -114,7 +117,7 @@ jobs:
- name: Check Out Changes
uses: actions/checkout@v3

- name: "Azure login"
- name: Azure login
uses: azure/login@v1
with:
client-id: ${{ secrets.CLIENT_ID }}
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/destroy.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
name: Destroy environment

on:
workflow_dispatch:
inputs:
environment:
description: "Environment to destroy"
description: Environment to destroy
type: environment
required: true

Expand All @@ -31,7 +32,7 @@ jobs:
- name: Setup Terraform
uses: hashicorp/setup-terraform@v2

- name: "Azure login"
- name: Azure login
uses: azure/login@v1
with:
client-id: ${{ secrets.CLIENT_ID }}
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/terraformChecks.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
---
name: Terraform checks
on:
workflow_dispatch:
inputs:
environment:
description: "Environment to deploy to"
description: Environment to deploy to
type: environment
required: true
pull_request:
branches:
- "**"
paths:
- "terraform/**"
- terraform/**

jobs:
check-terraform-formatting:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/terraformSetup.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
name: Terraform Setup

on:
Expand All @@ -22,7 +23,7 @@ jobs:
- name: Setup Terraform
uses: hashicorp/setup-terraform@v2

- name: "Azure login"
- name: Azure login
uses: azure/login@v1
with:
client-id: ${{ secrets.CLIENT_ID }}
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
name: Test
on:
workflow_call:
workflow_dispatch:
pull_request:
branches:
- "**"
push:
branches:
- main

jobs:
lint-frontend:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Install modules
run: npm install
- name: Run linter
run: npm run lint
29 changes: 29 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
repos:
# Formatters
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
hooks:
- id: pretty-format-json
args: [--autofix, --no-sort-keys]
exclude: .*valid.*
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.0.2
hooks:
- id: prettier
- repo: local
hooks:
# run `terraform fmt` if tf files are modified and terraform is installed
# when terraform is not installed, this check will succeed even if tf files
# would not pass the format check
- id: terraform-fmt
name: terraform-fmt
entry: bash -c 'if command -v terraform >/dev/null 2>&1; then terraform
fmt -recursive -check terraform; else exit 0; fi'
language: system
types:
- terraform
pass_filenames: false

ci:
autofix_prs: true
14 changes: 7 additions & 7 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"cSpell.words": [
"ATSDR",
"CFPB",
"ISSO",
"cybersecurity"
]
}
"cSpell.words": [
"ATSDR",
"CFPB",
"ISSO",
"cybersecurity"
]
}
16 changes: 11 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Welcome!

Thank you for contributing to CDC's Open Source projects! If you have any
questions or doubts, don't be afraid to send them our way. We appreciate all
contributions, and we are looking forward to fostering an open, transparent, and
Expand All @@ -11,28 +12,33 @@ files, also found in this repository. If you have any inquiries or questions not
answered by the content of this repository, feel free to [contact us](mailto:[email protected]).

## Public Domain

This project is in the public domain within the United States, and copyright and
related rights in the work worldwide are waived through the [CC0 1.0 Universal public domain dedication](https://creativecommons.org/publicdomain/zero/1.0/).
All contributions to this project will be released under the CC0 dedication. By
submitting a pull request you are agreeing to comply with this waiver of
copyright interest.

## Requesting Changes

Our pull request/merging process is designed to give the CDC Surveillance Team
and other in our space an opportunity to consider and discuss any suggested
changes. This policy affects all CDC spaces, both on-line and off, and all users
are expected to abide by it.

### Open an issue in the repository

If you don't have specific language to submit but would like to suggest a change
or have something addressed, you can open an issue in this repository. Team
members will respond to the issue as soon as possible.

### Submit a pull request

If you would like to contribute, please submit a pull request. In order for us
to merge a pull request, it must:
* Be at least seven days old. Pull requests may be held longer if necessary
to give people the opportunity to assess it.
* Receive a +1 from a majority of team members associated with the request.
If there is significant dissent between the team, a meeting will be held to
discuss a plan of action for the pull request.

- Be at least seven days old. Pull requests may be held longer if necessary
to give people the opportunity to assess it.
- Receive a +1 from a majority of team members associated with the request.
If there is significant dissent between the team, a meeting will be held to
discuss a plan of action for the pull request.
3 changes: 2 additions & 1 deletion DISCLAIMER.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# DISCLAIMER

Use of this service is limited only to **non-sensitive and publicly available
data**. Users must not use, share, or store any kind of sensitive data like
health status, provision or payment of healthcare, Personally Identifiable
Expand All @@ -7,7 +8,7 @@ circumstance.

Administrators for this service reserve the right to moderate all information
used, shared, or stored with this service at any time. Any user that cannot
abide by this disclaimer and Code of Conduct may be subject to action, up to
abide by this disclaimer and Code of Conduct may be subject to action, up to
and including revoking access to services.

The material embodied in this software is provided to you "as-is" and without
Expand Down
Loading

0 comments on commit 617fa7c

Please sign in to comment.