From cf87545b9ba809a45ec6eeb377ed896e557a52da Mon Sep 17 00:00:00 2001
From: Jorie Helwig <jorie.helwig@datadoghq.com>
Date: Mon, 1 Feb 2021 12:32:21 -0800
Subject: [PATCH 1/5] Update expected breaking change date (#114)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 633e1935..e55f18ef 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 Datadog Lambda Library for Python (2.7, 3.6, 3.7 and 3.8) enables enhanced Lambda metrics, distributed tracing, and custom metric submission from AWS Lambda functions.  
 
-**IMPORTANT NOTE:** AWS Lambda is expected to recieve a [breaking change](https://aws.amazon.com/blogs/compute/upcoming-changes-to-the-python-sdk-in-aws-lambda/) on **January 30, 2021**. If you are using Datadog Python Lambda layer version 7 or below, please upgrade to the latest.
+**IMPORTANT NOTE:** AWS Lambda is expected to recieve a [breaking change](https://aws.amazon.com/blogs/compute/upcoming-changes-to-the-python-sdk-in-aws-lambda/) on **March 31, 2021**. If you are using Datadog Python Lambda layer version 7 or below, please upgrade to the latest.
 
 ## Installation
 

From cae65b38b11d4957e561af6c5540cc68da3f3409 Mon Sep 17 00:00:00 2001
From: Jordan Storms <jordan.storms@datadoghq.com>
Date: Thu, 1 Jul 2021 09:27:10 -0400
Subject: [PATCH 2/5] add pre-commit config and custom hook

---
 .git-hooks/detect-api-keys.py | 73 +++++++++++++++++++++++++++++++++++
 .pre-commit-config.yaml       | 18 +++++++++
 2 files changed, 91 insertions(+)
 create mode 100755 .git-hooks/detect-api-keys.py
 create mode 100644 .pre-commit-config.yaml

diff --git a/.git-hooks/detect-api-keys.py b/.git-hooks/detect-api-keys.py
new file mode 100755
index 00000000..a050de76
--- /dev/null
+++ b/.git-hooks/detect-api-keys.py
@@ -0,0 +1,73 @@
+#!/usr/bin/env python
+from __future__ import print_function
+
+import argparse
+import re
+import sys
+
+
+def detect_aws_access_key(line):
+    match = re.search(r"(?<![A-Z0-9])[A-Z0-9]{20}(?![A-Z0-9])", line)
+    return match, "AWS access key"
+
+
+def detect_aws_secret_key(line):
+    match = re.search(r"(?<![A-Za-z0-9/+=])[A-Za-z0-9/+=]{40}(?![A-Za-z0-9/+=])", line)
+    return match, "AWS secret key"
+
+
+def detect_dd_api_key(line):
+    match = re.search(r"(?<![a-fA-F0-9])[a-fA-F0-9]{32}(?![a-fA-F0-9])", line)
+    return match, "Datadog API key"
+
+
+def detect_dd_app_key(line):
+    match = re.search(r"(?<![a-fA-F0-9])[a-fA-F0-9]{40}(?![a-fA-F0-9])", line)
+    return match, "Datadog app key"
+
+
+def key_found_message(args):
+    return (
+        "\033[91m"
+        "Potential {} found in {} at line {} and column {}. "
+        "Please remove the key before committing these changes."
+        "\033[0m".format(*args)
+    )
+
+
+def main(argv=None):
+    parser = argparse.ArgumentParser()
+    parser.add_argument("filenames", nargs="*", help="Filenames to check.")
+    args = parser.parse_args(argv)
+
+    # add or remove functions here
+    functions_to_run = [
+        detect_aws_access_key,
+        detect_aws_secret_key,
+        detect_dd_api_key,
+        detect_dd_app_key,
+    ]
+
+    files_with_key = []
+
+    for filename in args.filenames:
+        with open(filename, "r") as f:
+            content = f.readlines()
+            f.close()
+
+        for i, line in enumerate(content):
+            for func in functions_to_run:
+                match, name = func(line)
+                if match != None:
+                    files_with_key.append((name, filename, i + 1, match.end()))
+
+        if files_with_key:
+            for file in files_with_key:
+                print(key_found_message(file))
+            return 1
+        else:
+            return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 00000000..2b056502
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,18 @@
+repos:
+  - repo: git@github.com:pre-commit/pre-commit-hooks
+    rev: v2.1.0
+    hooks:
+      - id: check-merge-conflict
+        files: \.py$
+  - repo: git@github.com:psf/black
+    rev: 21.6b0
+    hooks:
+      - id: black
+        files: \.py$
+  - repo: local
+    hooks:
+      - id: detect-api-keys
+        name: detect-api-keys
+        description: Checks for AWS or Datadog API keys
+        entry: ".git-hooks/detect-api-keys.py"
+        language: python

From 4fbeeed0b0a09b54e21b7fda0fc1021d515c5af3 Mon Sep 17 00:00:00 2001
From: Jordan Storms <jordan.storms@datadoghq.com>
Date: Thu, 1 Jul 2021 10:06:27 -0400
Subject: [PATCH 3/5] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 28f2df98..9b4a7b74 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 Datadog Lambda Library for Python (2.7, 3.6, 3.7 and 3.8) enables enhanced Lambda metrics, distributed tracing, and custom metric submission from AWS Lambda functions.  
 
-**IMPORTANT NOTE:** AWS Lambda is expected to recieve a [breaking change](https://aws.amazon.com/blogs/compute/upcoming-changes-to-the-python-sdk-in-aws-lambda/) on **March 31, 2021**. If you are using Datadog Python Lambda layer version 7 or below, please upgrade to the latest.
+**IMPORTANT NOTE:** AWS Lambda is expected to recieve a [breaking change](https://aws.amazon.com/blogs/compute/upcoming-changes-to-the-python-sdk-in-aws-lambda/) on **December 1st, 2021**. If you are using Datadog Python Lambda layer version 7 or below, please upgrade to the latest.
 
 ## Installation
 

From bb3dccc6bd853ad5c0fb0447157f2f8ada16ca99 Mon Sep 17 00:00:00 2001
From: Jordan Storms <jordan.storms@datadoghq.com>
Date: Thu, 1 Jul 2021 10:08:07 -0400
Subject: [PATCH 4/5] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9b4a7b74..daaad7d1 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 Datadog Lambda Library for Python (2.7, 3.6, 3.7 and 3.8) enables enhanced Lambda metrics, distributed tracing, and custom metric submission from AWS Lambda functions.  
 
-**IMPORTANT NOTE:** AWS Lambda is expected to recieve a [breaking change](https://aws.amazon.com/blogs/compute/upcoming-changes-to-the-python-sdk-in-aws-lambda/) on **December 1st, 2021**. If you are using Datadog Python Lambda layer version 7 or below, please upgrade to the latest.
+**IMPORTANT NOTE:** AWS Lambda is expected to recieve a [breaking change](https://aws.amazon.com/blogs/compute/upcoming-changes-to-the-python-sdk-in-aws-lambda/) on **December 1, 2021**. If you are using Datadog Python Lambda layer version 7 or below, please upgrade to the latest.
 
 ## Installation
 

From 3c6ab59a74a10f3cfea283b30e956a517853d207 Mon Sep 17 00:00:00 2001
From: Jordan Storms <jordan.storms@datadoghq.com>
Date: Thu, 1 Jul 2021 10:09:06 -0400
Subject: [PATCH 5/5] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index daaad7d1..807b7df9 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 Datadog Lambda Library for Python (2.7, 3.6, 3.7 and 3.8) enables enhanced Lambda metrics, distributed tracing, and custom metric submission from AWS Lambda functions.  
 
-**IMPORTANT NOTE:** AWS Lambda is expected to recieve a [breaking change](https://aws.amazon.com/blogs/compute/upcoming-changes-to-the-python-sdk-in-aws-lambda/) on **December 1, 2021**. If you are using Datadog Python Lambda layer version 7 or below, please upgrade to the latest.
+**IMPORTANT NOTE:** AWS Lambda is expected to receive a [breaking change](https://aws.amazon.com/blogs/compute/upcoming-changes-to-the-python-sdk-in-aws-lambda/) on **December 1, 2021**. If you are using Datadog Python Lambda layer version 7 or below, please upgrade to the latest.
 
 ## Installation