Skip to content

Commit e41a191

Browse files
committed
chore: pre-commit
1 parent 63e421d commit e41a191

File tree

21 files changed

+46
-46
lines changed

21 files changed

+46
-46
lines changed

docs/developing/code-reviews/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gaining valuable feedback from peers, ensuring that quality standards are upheld
77
throughout a project, and defects are caught as early as possible.
88

99
We recognize code reviews can be a vulnerable exercise and should be approached
10-
with care and deliberate intention. We've collected some of the best practices
10+
with care and deliberate intention. We've collected some of the best practices
1111
for projects to systematize the code review process and lay out expectations for
1212
the creator of the pull request as well as the role of the reviewer.
1313

docs/developing/command-line-tools/docker.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Overview
44

55
Docker is useful because it allows you to both package and run
6-
software with all its dependencies and configuration in isolation. It
6+
software with all its dependencies and configuration in isolation. It
77
also allows you (in theory) to have the same environment in
88
development as in CI and production.
99

@@ -18,9 +18,9 @@ brew cask install docker
1818
### Configuration of Shared Folders
1919

2020
Anecdata suggests that removing some of the default shared folders can
21-
decrease CPU usage. Usually you only need to share volumes under your
22-
home directory. Open the docker for mac preferences, then select
23-
"File Sharing" and then remove `/Volumes` and `/private`. You may
21+
decrease CPU usage. Usually you only need to share volumes under your
22+
home directory. Open the docker for mac preferences, then select
23+
"File Sharing" and then remove `/Volumes` and `/private`. You may
2424
also find improvements removing `/Users` and replacing it with
2525
`/Users/YOUR_USERNAME_GOES_HERE`.
2626

@@ -36,13 +36,13 @@ Storage Driver: overlay2
3636

3737
If you don't see overlay2, upgrading to the latest version will add
3838
that support, but you would need to recreate all of your docker data
39-
to utilize it. The `Reset` bomb should do it.
39+
to utilize it. The `Reset` bomb should do it.
4040

4141
### Configuration of Disk Image
4242

4343
If you've been running Docker for Mac for some time, make sure you are
44-
using the `raw` disk image format and not `qcow2`. Open Docker for
45-
Mac preferences and select `Disk`. Make sure the image ends with
44+
using the `raw` disk image format and not `qcow2`. Open Docker for
45+
Mac preferences and select `Disk`. Make sure the image ends with
4646
`Docker.raw`.
4747

4848
### Configuration of Resources
@@ -59,7 +59,7 @@ by the docker developers.
5959
## Volume Mount Performance
6060

6161
Synchronizing the data between the host (your Mac) and the container
62-
can be resource intensive and/or slow. Read about the [performance
62+
can be resource intensive and/or slow. Read about the [performance
6363
tuning options](https://docs.docker.com/docker-for-mac/osxfs-caching/)
6464
to see if they might apply to the conditions in your project.
6565

docs/developing/growth/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ speeding up tests) and the client getting the benefit of learning that
1313
happened elsewhere. Allowing time for growth ensures consistent, high
1414
quality work which benefits everyone.
1515

16-
Mentoring is an important part of growth. Truss has [shared some
16+
Mentoring is an important part of growth. Truss has [shared some
1717
techniques for
1818
mentoring](https://truss.works/blog/2016/8/12/theres-a-method-to-the-mentoring-advice-from-a-teacher-turned-developer).
1919

@@ -23,6 +23,6 @@ restrict exploration and "just get the ticket done", but that should
2323
happen infrequently.
2424

2525
If someone is interested in a topic that is not related to their
26-
client work, a separate plan will need to be made. That might involve
26+
client work, a separate plan will need to be made. That might involve
2727
changing client teams, changing client projects, or joining Truss
2828
Reserve.

docs/developing/vcs/tools.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ for merge conflicts or mistakenly adding secret keys in our code. See
4848
pre-commit config file from one of our projects.
4949

5050
Since git does not distribute hooks when a repository is cloned, you will
51-
have to install pre-commit in each cloned repo manually using `pre-commit install --install-hooks` or pre-commit will not run in that repo. To assist
51+
have to install pre-commit in each cloned repo manually using `pre-commit install --install-hooks` or pre-commit will not run in that repo. To assist
5252
with automating this step, pre-commit has a [feature] to exploit the
5353
[template directory] setting in git:
5454

docs/incident-response/on-call.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ you are expected to fulfill.
8787
have this covered.
8888
- If you know you will be away for an extended period during an on-call
8989
shift, it is *your* responsibility to find someone to cover your shift.
90-
If you are unable to, talk to your lead and see if they can help. If
90+
If you are unable to, talk to your lead and see if they can help. If
9191
you will be gone for more than a day or two, it may be easiest to swap
9292
the entire shift with someone. PagerDuty allows you to schedule these
9393
with [overrides](https://community.pagerduty.com/t/creating-a-schedule-override/850).

docs/incident-response/security-incidents.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ to navigate. This document will outline how to approach security
1010
incidents in general; individual projects will likely have additional
1111
reporting requirements based on client needs.
1212

13-
\[This is a stub and needs to be expanded.\]
13+
[This is a stub and needs to be expanded.]

docs/infrasec/alert-providers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,6 @@ it's merited).
8989
| API | Yes ([Documentation](https://docs.opsgenie.com/docs/api-overview)) | Yes ([Documentation](https://v2.developer.pagerduty.com/)) | Yes ([Documentation](https://help.victorops.com/knowledge-base/rest-endpoint-integration-guide/)) |
9090
| Cloudwatch Integration | Yes | Yes | Yes |
9191
| Slack Integration | Yes | Yes | Yes |
92-
| Other Notable Integrations | CircleCI, Jira, New Relic, StatusPage | Jira, New Relic, Statuspage | Jira, New Relic, Statuspage |
92+
| Other Notable Integrations | CircleCI, Jira, New Relic, StatusPage | Jira, New Relic, Statuspage | Jira, New Relic, Statuspage |
9393
| Data Retention | 1 year (unlimited at $29) | Unlimited | Not listed (but unlimited noted at $49) |
9494
| Terraform Provider | No ([abandoned](https://www.terraform.io/docs/providers/opsgenie/index.html)) | [Yes](https://www.terraform.io/docs/providers/pagerduty/index.html) | No official provider, some limited attempts |

docs/infrasec/ansible/molecule-primer.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ anyway. Using Python 3 as the Python binary is also highly recommended. In addit
2222
will need these Python modules as well:
2323

2424
- molecule
25-
- molecule\[docker\] - For testing with docker containers (the default)
26-
- molecule\[ec2\] - For testing on ec2 instances
25+
- molecule[docker] - For testing with docker containers (the default)
26+
- molecule[ec2] - For testing on ec2 instances
2727
- docker-py
2828
- boto
2929

docs/infrasec/aws/aws-organizations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# AWS Organizations
22

33
[AWS Organizations](https://docs.aws.amazon.com/organizations/latest/userguide/orgs_introduction.html)
4-
provide a native way to manage multiple AWS accounts. They provide
4+
provide a native way to manage multiple AWS accounts. They provide
55
consolidated billing, APIs (e.g., via Terraform) for automating account
66
creation, and the ability to apply account-wide IAM like policies.
77

docs/infrasec/aws/sns-guardduty-alert-integrations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ resource "pagerduty_extension" "slack-v2-service" {
286286
}
287287
```
288288

289-
You're not quite done yet. PagerDuty does not actually authorize the link between the extension and Slack until you manually create it. Sign into PagerDuty and [visit the extensions page](https://movemil.pagerduty.com/extensions). Locate your new extension in the Service Extensions table and click on the gear button on the bottom right of the far-right Details cell for your extension. Select either the Re-authorize/Authorize or Edit option (they do the same thing) from the drop-down. Scroll down and select the channel you prefer under `Where should PagerDuty post?` then click "Allow". You should see a notification appear in the channel you've selected in Slack that says "\[your name\] added an integration to this channel: PagerDuty". Make sure to record that you've done this in your Manual Operations log. Note: You only need to create one extension per service rather than per environment.
289+
You're not quite done yet. PagerDuty does not actually authorize the link between the extension and Slack until you manually create it. Sign into PagerDuty and [visit the extensions page](https://movemil.pagerduty.com/extensions). Locate your new extension in the Service Extensions table and click on the gear button on the bottom right of the far-right Details cell for your extension. Select either the Re-authorize/Authorize or Edit option (they do the same thing) from the drop-down. Scroll down and select the channel you prefer under `Where should PagerDuty post?` then click "Allow". You should see a notification appear in the channel you've selected in Slack that says "[your name] added an integration to this channel: PagerDuty". Make sure to record that you've done this in your Manual Operations log. Note: You only need to create one extension per service rather than per environment.
290290

291291
## GuardDuty Tie-In
292292

@@ -323,4 +323,4 @@ When an alert occurs and you are notified via PagerDuty or Slack, you'll have to
323323

324324
1. Immediately Acknowledge the finding, which you can do via the PagerDuty app, website, or Slack integration.
325325
1. Once you've found a resolution for the incident, you should Resolve it (which again you can do via app, site, or on Slack).
326-
1. Archive the relevant GuardDuty finding using the AWS Console. Because you've set your `infrasec` as the administrative account for GuardDuty, all findings for member accounts "roll up" there. Depending on whether the alerts are in the GovCloud or Commercial space, that will be either the `project-com-infrasec` or `project-gov-infrasec` account. Make sure you are in the correct region (either `us-west-2` or `us-east-1`, depending on where the alert fired). Confirm the alert you are archiving fired in the account you expected by checking the `Account ID` column in the Findings table.
326+
1. Archive the relevant GuardDuty finding using the AWS Console. Because you've set your `infrasec` as the administrative account for GuardDuty, all findings for member accounts "roll up" there. Depending on whether the alerts are in the GovCloud or Commercial space, that will be either the `project-com-infrasec` or `project-gov-infrasec` account. Make sure you are in the correct region (either `us-west-2` or `us-east-1`, depending on where the alert fired). Confirm the alert you are archiving fired in the account you expected by checking the `Account ID` column in the Findings table.

0 commit comments

Comments
 (0)