all-of-us · s-rubenstein · Aug 9, 2017 · Jul 25, 2017 · Jul 26, 2017 · Jul 26, 2017
diff --git a/README.md b/README.md
@@ -111,3 +111,37 @@ Example:
 You will be prompted to confirm the deployment. When it finishes, you will be able to access the
 UI under http://PROJECT.appspot.com and the API under http://api.PROJECT.appspot.com.
 
+## git-secrets
+
+### Setup
+
+Download the git-secrets tool.
+If you are on a mac, run:
+```Shell
+  brew install git-secrets
+```
+If you are on Linux, run:
+```Shell
+rm -rf git-secrets
+git clone https://github.com/awslabs/git-secrets.git
+cd git-secrets
+sudo make install && sudo chmod o+rx /usr/local/bin/git-secrets
+cd ..
+rm -rf git-secrets
+```
+### Running
+
+git-secrets by default runs every time you make a commit. But if you
+want to manually scan:
+#### The Repository
+```Shell
+git secrets --scan
+```
+#### A File(s)
+```Shell
+git secrets --scan /path/to/file (/other/path/to/file *)
+```
+#### A Directory (recursively)
+```Shell
+git secrets --scan -r /path/to/directory
+```
diff --git a/hooks/commit-msg b/hooks/commit-msg
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+{ which git-secrets; } || {
+  echo 'git-secrets required and not found. See README for installation instructions.'
+  echo
+  exit 1
+}
+
+{
+  git config --remove-section secrets 2>/dev/null
+} || {
+  :
+}
+git secrets --add 'private_key'
+git secrets --add 'private_key_id'
+git secrets --add --allowed --literal "git secrets --add 'private_key'"
+git secrets --add --allowed --literal "git secrets --add 'private_key_id'"
+
+git secrets --commit_msg_hook -- "$@"
diff --git a/hooks/pre-commit b/hooks/pre-commit
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+{ which git-secrets; } || {
+  echo 'git-secrets required and not found. See README for installation instructions.'
+  echo
+  exit 1
+}
+
+{
+  git config --remove-section secrets 2>/dev/null
+} || {
+  :
+}
+git secrets --add 'private_key'
+git secrets --add 'private_key_id'
+git secrets --add --allowed --literal "git secrets --add 'private_key'"
+git secrets --add --allowed --literal "git secrets --add 'private_key_id'"
+
+git secrets --pre_commit_hook -- "$@"
diff --git a/hooks/prepare-commit-msg b/hooks/prepare-commit-msg
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+{ which git-secrets; } || {
+  echo 'git-secrets required and not found. See README for installation instructions.'
+  echo
+  exit 1
+}
+
+{
+  git config --remove-section secrets 2>/dev/null
+} || {
+  :
+}
+git secrets --add 'private_key'
+git secrets --add 'private_key_id'
+git secrets --add --allowed --literal "git secrets --add 'private_key'"
+git secrets --add --allowed --literal "git secrets --add 'private_key_id'"
+
+git secrets --prepare_commit_msg_hook -- "$@"
diff --git a/tools/download_swagger_cli.sh b/tools/download_swagger_cli.sh
@@ -1 +1 @@
-wget https://oss.sonatype.org/content/repositories/snapshots/io/swagger/swagger-codegen-cli/2.3.0-SNAPSHOT/swagger-codegen-cli-2.3.0-20170716.142514-29.jar -O swagger-codegen-cli.jar
+wget https://oss.sonatype.org/content/repositories/snapshots/io/swagger/swagger-codegen-cli/2.3.0-SNAPSHOT/swagger-codegen-cli-2.3.0-20170809.095725-71.jar -O swagger-codegen-cli.jar
diff --git a/tools/setup_env.sh b/tools/setup_env.sh
@@ -7,6 +7,7 @@ sudo npm install -g @angular/cli
 echo Installing UI project dependencies.
 npm install
 
+
 cd ../tools
 ./download_swagger_cli.sh
 ./download_cloud_sql_proxy.sh
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		wget https://oss.sonatype.org/content/repositories/snapshots/io/swagger/swagger-codegen-cli/2.3.0-SNAPSHOT/swagger-codegen-cli-2.3.0-20170716.142514-29.jar -O swagger-codegen-cli.jar
		wget https://oss.sonatype.org/content/repositories/snapshots/io/swagger/swagger-codegen-cli/2.3.0-SNAPSHOT/swagger-codegen-cli-2.3.0-20170809.095725-71.jar -O swagger-codegen-cli.jar