Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Jul 10, 2024
1 parent 8792001 commit 2698f29
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ Notes for the reviewer. How to test this change?
- ✅ Provide tests for your changes.
- 📝 Use descriptive commit messages.
- 📗 Update any related documentation and include any relevant screenshots.
- 🔠 Does this PR introduce or change any environment variables? If so, make sure to specify this change in the description.
- 🔠 Does this PR introduce or change any environment variables? If so, make sure to specify this change in the description.

## [optional] What gif best describes this PR or how it makes you feel?
3 changes: 0 additions & 3 deletions .github/workflows/ecs-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,3 @@ jobs:
service: ${{ env.ECS_SERVICE }}
cluster: ${{ env.ECS_CLUSTER }}
wait-for-service-stability: true



2 changes: 1 addition & 1 deletion docs/sysadmins/ci-cd.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ We use CircleCI to manage Continuous Integration and Continuous Deployment.
| TeachOSM | deployment/teachosm-tasking-manager |
| Indonesia | deployment/id-tasking-manager |

Each environment has its own set of environment variables which are stored as secrets in the CircleCI Organization Settings under Contexts. At the moment, these variables are for the frontend builds only. See the [deployment docs](deployment.md) for updating backend variables.
Each environment has its own set of environment variables which are stored as secrets in the CircleCI Organization Settings under Contexts. At the moment, these variables are for the frontend builds only. See the [deployment docs](deployment.md) for updating backend variables.

- OPSGENIE_API
- TM_APP_API_URL
Expand Down
4 changes: 2 additions & 2 deletions docs/sysadmins/deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ aws s3 sync build/ <TaskingManagerReactBucket> --delete
When deploying updates to the infrastructure or code, follow the steps below.

#### Backup Database
Before updating it's always recommended to backup the database. You can make a snapshot in AWS RDS console, or run the database dump directly. You will need sufficient access to a server on the same VPC as the RDS instance in order to connect to it directly.
Before updating it's always recommended to backup the database. You can make a snapshot in AWS RDS console, or run the database dump directly. You will need sufficient access to a server on the same VPC as the RDS instance in order to connect to it directly.

```
PGPASSWORD=<PostgresPassword> pg_dump -Fc \
Expand All @@ -48,7 +48,7 @@ PGPASSWORD=<PostgresPassword> pg_dump -Fc \

#### Update backend infrastructure

If the deployment contains any changes to the cloudformation template, including new or changes to environment variables, then we must update the infrastructure prior to deployment. These changes are deliberately set outside the CI/CD process to prevent accidental deletion of data. For the HOT Tasking Manager, only staff with sufficient AWS privileges have the ability to perform these functions.
If the deployment contains any changes to the cloudformation template, including new or changes to environment variables, then we must update the infrastructure prior to deployment. These changes are deliberately set outside the CI/CD process to prevent accidental deletion of data. For the HOT Tasking Manager, only staff with sufficient AWS privileges have the ability to perform these functions.

1. Pull the latest changes locally
2. Run the `cfn-config update` command, keeping in mind to update any new parameters that were added.
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1329,4 +1329,4 @@
"pages.edit_project.sections.custom_editor": "Custom Editor",
"pages.create_campaign.duplicate": "A campaign with the same name already exists",
"pages.create_campaign.error": "There was an error saving this campaign."
}
}
24 changes: 12 additions & 12 deletions scripts/aws/cloudformation/tasking-manager.template.js
Original file line number Diff line number Diff line change
Expand Up @@ -654,10 +654,10 @@ const Resources = {
SecurityGroups: [cf.importValue(cf.join('-', ['hotosm-network-production', cf.ref('NetworkEnvironment'), 'elbs-security-group', cf.region]))],
Subnets: cf.ref('ELBSubnets'),
Type: 'application',
Tags: [ {
"Key": "stack_name",
"Value": cf.stackName
},
Tags: [ {
"Key": "stack_name",
"Value": cf.stackName
},
{
Key: 'project',
Value: 'tasking-manager'
Expand Down Expand Up @@ -726,11 +726,11 @@ const Resources = {
Port: 8000,
Protocol: 'HTTP',
VpcId: cf.importValue(cf.join('-', ['hotosm-network-production', 'default-vpc', cf.region])),
Tags: [
{
"Key": "stack_name",
"Value": cf.stackName
},
Tags: [
{
"Key": "stack_name",
"Value": cf.stackName
},
{
Key: 'project',
Value: 'tasking-manager'
Expand Down Expand Up @@ -809,7 +809,7 @@ const Resources = {
DBSnapshotIdentifier: cf.if('UseASnapshot', cf.ref('DBSnapshot'), cf.noValue),
VPCSecurityGroups: [cf.importValue(cf.join('-', ['hotosm-network-production', cf.ref('NetworkEnvironment'), 'ec2s-security-group', cf.region]))],
PubliclyAccessible: false,
Tags: [
Tags: [
{
Key: 'project',
Value: 'tasking-manager'
Expand Down Expand Up @@ -838,7 +838,7 @@ const Resources = {
IndexDocument: 'index.html'
},
AccessControl: "Private",
Tags: [
Tags: [
{
Key: 'project',
Value: 'tasking-manager'
Expand Down Expand Up @@ -985,7 +985,7 @@ const Resources = {
SslSupportMethod: 'sni-only'
}
},
Tags: [
Tags: [
{
Key: 'project',
Value: 'tasking-manager'
Expand Down

0 comments on commit 2698f29

Please sign in to comment.