merge

Author: lucasmcdonald3

.github/workflows/ci_tests.yaml

@@ -32,7 +32,6 @@ jobs:
           # - windows-latest
           - macos-12
         python:
-          - 3.7
           - 3.8
           - 3.9
           - "3.10"

.gitignore

@@ -32,7 +32,7 @@ __pycache__
 # PyTest
 .pytest_cache
 # Ignore key materials generated by examples or tests
-test_keys/
+test_keyrings/
 
 # PyCharm
 .idea/

README.rst

@@ -34,7 +34,7 @@ Getting Started
 Required Prerequisites
 ======================
 
-* Python 3.7+
+* Python 3.8+
 * cryptography >= 3.4.6
 * boto3 >= 1.10.0
 * attrs

buildspec.yml

@@ -4,44 +4,6 @@ batch:
   fast-fail: false
   build-graph:
 
-    # 3.7
-    - identifier: py37_integ
-      buildspec: codebuild/py37/integ.yml
-      env:
-        image: aws/codebuild/standard:5.0
-    - identifier: py37_examples
-      buildspec: codebuild/py37/examples.yml
-      env:
-        image: aws/codebuild/standard:5.0
-    - identifier: py37_decrypt_dafny_esdk_vectors
-      buildspec: codebuild/py37/decrypt_dafny_esdk_vectors.yml
-      env:
-        image: aws/codebuild/standard:5.0
-    - identifier: py37_decrypt_net_401_vectors
-      buildspec: codebuild/py37/decrypt_net_401_vectors.yml
-      env:
-        image: aws/codebuild/standard:5.0
-    - identifier: py37_encrypt_masterkey
-      buildspec: codebuild/py37/encrypt_masterkey.yml
-      env:
-        image: aws/codebuild/standard:5.0
-    - identifier: py37_generate_decrypt_vectors_masterkey
-      buildspec: codebuild/py37/generate_decrypt_vectors_masterkey.yml
-      env:
-        image: aws/codebuild/standard:5.0
-    - identifier: py37_decrypt_masterkey_with_masterkey
-      depend-on: 
-       - py37_generate_decrypt_vectors_masterkey
-      buildspec: codebuild/py37/decrypt_masterkey_with_masterkey.yml
-      env:
-        image: aws/codebuild/standard:5.0
-    - identifier: py37_decrypt_masterkey_with_js
-      depend-on: 
-       - py37_generate_decrypt_vectors_masterkey
-      buildspec: codebuild/py37/decrypt_masterkey_with_js.yml
-      env:
-        image: aws/codebuild/standard:5.0
-
     # 3.8
     - identifier: py38_integ
       buildspec: codebuild/py38/integ.yml

codebuild/py37/awses_local.yml

@@ -1,14 +1,4 @@
-# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You
-# may not use this file except in compliance with the License. A copy of
-# the License is located at
-#
-# http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-# ANY KIND, either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
 """Shim to pull decryption oracle app into expected location for Chalice."""
 from aws_encryption_sdk_decrypt_oracle.app import APP as app  # noqa pylint: disable=unused-import

codebuild/py37/examples.yml

@@ -45,7 +45,6 @@ def get_requirements():
         "Natural Language :: English",
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: Implementation :: CPython",

codebuild/py37/integ.yml

@@ -1,14 +1,4 @@
-# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You
-# may not use this file except in compliance with the License. A copy of
-# the License is located at
-#
-# http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-# ANY KIND, either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
 """Decrypt Oracle using the AWS Encryption SDK for Python."""
 __version__ = "0.0.1"

decrypt_oracle/app.py

@@ -1,15 +1,5 @@
-# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You
-# may not use this file except in compliance with the License. A copy of
-# the License is located at
-#
-# http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-# ANY KIND, either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
 """Decrypt Oracle powered by the AWS Encryption SDK for Python."""
 import json
 import logging

decrypt_oracle/setup.py

@@ -1,13 +1,3 @@
-# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You
-# may not use this file except in compliance with the License. A copy of
-# the License is located at
-#
-# http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-# ANY KIND, either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
 """Special key providers for use by the decrypt oracle."""

decrypt_oracle/src/aws_encryption_sdk_decrypt_oracle/__init__.py

@@ -1,15 +1,5 @@
-# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You
-# may not use this file except in compliance with the License. A copy of
-# the License is located at
-#
-# http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-# ANY KIND, either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
 """
 Master key that generates deterministic data keys and decrypts a pre-defined
 encrypted data key value to that deterministic data keys.

decrypt_oracle/src/aws_encryption_sdk_decrypt_oracle/app.py

@@ -1,15 +1,5 @@
-# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You
-# may not use this file except in compliance with the License. A copy of
-# the License is located at
-#
-# http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-# ANY KIND, either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
 """Master key that provides null data keys."""
 from typing import Dict, NoReturn, Text
 

decrypt_oracle/src/aws_encryption_sdk_decrypt_oracle/key_providers/__init__.py

@@ -1,13 +1,3 @@
-# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You
-# may not use this file except in compliance with the License. A copy of
-# the License is located at
-#
-# http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-# ANY KIND, either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
 """Dummy stub to make linters work better."""

decrypt_oracle/src/aws_encryption_sdk_decrypt_oracle/key_providers/counting.py

@@ -1,13 +1,3 @@
-# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You
-# may not use this file except in compliance with the License. A copy of
-# the License is located at
-#
-# http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-# ANY KIND, either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
 """Dummy stub to make linters work better."""

decrypt_oracle/src/aws_encryption_sdk_decrypt_oracle/key_providers/null.py

@@ -1,15 +1,5 @@
-# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You
-# may not use this file except in compliance with the License. A copy of
-# the License is located at
-#
-# http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-# ANY KIND, either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
 """Helper utilities for use by integration tests."""
 import base64
 import json

decrypt_oracle/test/__init__.py

@@ -1,15 +1,5 @@
-# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You
-# may not use this file except in compliance with the License. A copy of
-# the License is located at
-#
-# http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-# ANY KIND, either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
 """Integration tests for deployed API."""
 import pytest
 import requests

decrypt_oracle/test/integration/__init__.py

@@ -1,15 +1,5 @@
-# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You
-# may not use this file except in compliance with the License. A copy of
-# the License is located at
-#
-# http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-# ANY KIND, either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
 """Generate test vectors for use in testing the decrypt oracle."""
 import base64
 import binascii

decrypt_oracle/test/integration/integration_test_utils.py

@@ -1,13 +1,3 @@
-# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You
-# may not use this file except in compliance with the License. A copy of
-# the License is located at
-#
-# http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-# ANY KIND, either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
 """Dummy stub to make linters work better."""

decrypt_oracle/test/integration/test_i_decrypt_oracle.py

@@ -1,13 +1,3 @@
-# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You
-# may not use this file except in compliance with the License. A copy of
-# the License is located at
-#
-# http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-# ANY KIND, either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
 """Dummy stub to make linters work better."""

decrypt_oracle/test/test_n_generate_test_vectors.py

@@ -1,15 +1,5 @@
-# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You
-# may not use this file except in compliance with the License. A copy of
-# the License is located at
-#
-# http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-# ANY KIND, either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
 """Unit test for ``aws_encryption_sdk_decrypt_oracle.key_providers.counting``."""
 import pytest
 from aws_encryption_sdk_decrypt_oracle.key_providers.counting import CountingMasterKey