chore(Python): Rename Python MPL package (#882)

AwsCryptographicMaterialProviders/Makefile

@@ -94,7 +94,7 @@ _sed_index_file_add_extern:
 
 # Python
 
-PYTHON_MODULE_NAME=aws_cryptographic_materialproviders
+PYTHON_MODULE_NAME=aws_cryptographic_material_providers
 
 TRANSLATION_RECORD_PYTHON := \
     --translation-record ../StandardLibrary/runtimes/python/src/smithy_dafny_standard_library/internaldafny/generated/dafny_src-py.dtr \
@@ -106,5 +106,5 @@ PYTHON_DEPENDENCY_MODULE_NAMES := \
 	--dependency-library-name=aws.cryptography.primitives=aws_cryptography_primitives \
 	--dependency-library-name=com.amazonaws.kms=aws_cryptography_internal_kms \
 	--dependency-library-name=com.amazonaws.dynamodb=aws_cryptography_internal_dynamodb \
-	--dependency-library-name=aws.cryptography.materialProviders=aws_cryptographic_materialproviders \
-	--dependency-library-name=aws.cryptography.keyStore=aws_cryptographic_materialproviders \
+	--dependency-library-name=aws.cryptography.materialProviders=aws_cryptographic_material_providers \
+	--dependency-library-name=aws.cryptography.keyStore=aws_cryptographic_material_providers \

AwsCryptographicMaterialProviders/codebuild/release-python/validate.yml

@@ -33,11 +33,11 @@ phases:
       # Install the published artifact from PyPI.
       # The tests will use the installed package, not the local code.
       # The actual test code must be from local, since we don't publish tests.
-      - pip install aws-cryptographic-materialproviders==$VERSION
+      - pip install aws-cryptographic-material-providers==$VERSION
       # Install ESDK-Python, override its requirements to force use of the just-published MPL version
       - git clone -b mpl-reviewed https://github.com/aws/aws-encryption-sdk-python.git
       - cd aws-encryption-sdk-python
-      - sed -i "s/aws-cryptographic-materialproviders.*/aws-cryptographic-materialproviders==$VERSION/" requirements_mpl.txt
+      - sed -i "s/aws-cryptographic-material-providers.*/aws-cryptographic-material-providers==$VERSION/" requirements_mpl.txt
       - cd ..
       # Get CI Creds to be able to call KMS and DDB
       - TMP_ROLE=$(aws sts assume-role --role-arn "arn:aws:iam::370957321024:role/GitHub-CI-MPL-Dafny-Role-us-west-2" --role-session-name "MPL-Python-Release")

AwsCryptographicMaterialProviders/runtimes/python/doc/conf.py

@@ -21,7 +21,7 @@ def get_version():
         return ".".join(split_version[:2])
     return release
 
-project = u"aws-cryptographic-materialproviders"
+project = u"aws-cryptographic-material-providers"
 version = get_version()
 release = get_release()
 

AwsCryptographicMaterialProviders/runtimes/python/doc/index.rst

@@ -10,15 +10,15 @@ Modules
 .. autosummary::
     :toctree: generated
 
-    aws_cryptographic_materialproviders.smithygenerated.aws_cryptography_keystore.client
-    aws_cryptographic_materialproviders.smithygenerated.aws_cryptography_keystore.config
-    aws_cryptographic_materialproviders.smithygenerated.aws_cryptography_keystore.errors
-    aws_cryptographic_materialproviders.smithygenerated.aws_cryptography_keystore.models
-    aws_cryptographic_materialproviders.smithygenerated.aws_cryptography_materialproviders.client
-    aws_cryptographic_materialproviders.smithygenerated.aws_cryptography_materialproviders.config
-    aws_cryptographic_materialproviders.smithygenerated.aws_cryptography_materialproviders.errors
-    aws_cryptographic_materialproviders.smithygenerated.aws_cryptography_materialproviders.models
-    aws_cryptographic_materialproviders.smithygenerated.aws_cryptography_materialproviders.references
+    aws_cryptographic_material_providers.smithygenerated.aws_cryptography_keystore.client
+    aws_cryptographic_material_providers.smithygenerated.aws_cryptography_keystore.config
+    aws_cryptographic_material_providers.smithygenerated.aws_cryptography_keystore.errors
+    aws_cryptographic_material_providers.smithygenerated.aws_cryptography_keystore.models
+    aws_cryptographic_material_providers.smithygenerated.aws_cryptography_materialproviders.client
+    aws_cryptographic_material_providers.smithygenerated.aws_cryptography_materialproviders.config
+    aws_cryptographic_material_providers.smithygenerated.aws_cryptography_materialproviders.errors
+    aws_cryptographic_material_providers.smithygenerated.aws_cryptography_materialproviders.models
+    aws_cryptographic_material_providers.smithygenerated.aws_cryptography_materialproviders.references
 
 .. include:: ../../../../CHANGELOG.md
     :parser: myst_parser.docutils_

AwsCryptographicMaterialProviders/runtimes/python/pyproject.toml

@@ -1,10 +1,10 @@
 [tool.poetry]
-name = "aws-cryptographic-materialproviders"
+name = "aws-cryptographic-material-providers"
 version = "1.7.1"
 description = "AWS Cryptographic Material Providers Library for Python"
 authors = ["AWS Crypto Tools <[email protected]>"]
 packages = [
-    { include = "aws_cryptographic_materialproviders", from = "src" },
+    { include = "aws_cryptographic_material_providers", from = "src" },
 ]
 # Include generated internaldafny files in package distributions,
 # even though they are not included in version control

AwsCryptographicMaterialProviders/runtimes/python/src/aws_cryptographic_materialproviders/__init__.py → AwsCryptographicMaterialProviders/runtimes/python/src/aws_cryptographic_material_providers/__init__.py

@@ -8,8 +8,8 @@
 from .internaldafny import extern
 
 # Export user-friendly access paths
-import aws_cryptographic_materialproviders.smithygenerated.aws_cryptography_materialproviders as mpl
-import aws_cryptographic_materialproviders.smithygenerated.aws_cryptography_keystore as keystore
+import aws_cryptographic_material_providers.smithygenerated.aws_cryptography_materialproviders as mpl
+import aws_cryptographic_material_providers.smithygenerated.aws_cryptography_keystore as keystore
 
 __all__ = [
     mpl,

AwsCryptographicMaterialProviders/runtimes/python/src/aws_cryptographic_materialproviders/internaldafny/extern/StormTrackingCMC.py → AwsCryptographicMaterialProviders/runtimes/python/src/aws_cryptographic_material_providers/internaldafny/extern/StormTrackingCMC.py

@@ -1,7 +1,7 @@
 import time
-import aws_cryptographic_materialproviders.internaldafny.generated.StormTrackingCMC
+import aws_cryptographic_material_providers.internaldafny.generated.StormTrackingCMC
 import smithy_dafny_standard_library.internaldafny.generated.Wrappers as Wrappers
-import aws_cryptographic_materialproviders.internaldafny.generated.AwsCryptographyMaterialProvidersTypes
+import aws_cryptographic_material_providers.internaldafny.generated.AwsCryptographyMaterialProvidersTypes
 from . import Lock
 
 class StormTrackingCMC:
@@ -61,7 +61,7 @@ def GetCacheEntry_k(self, input):
                 return Wrappers.Result_Success(result.value.data)
             elif result.value.is_EmptyFetch:
                 return Wrappers.Result_Failure(
-                    aws_cryptographic_materialproviders.internaldafny.generated.AwsCryptographyMaterialProvidersTypes.Error_EntryDoesNotExist(
+                    aws_cryptographic_material_providers.internaldafny.generated.AwsCryptographyMaterialProvidersTypes.Error_EntryDoesNotExist(
                         "Entry does not exist"
                     )
                 ) 
@@ -80,4 +80,4 @@ def DeleteCacheEntry_k(self, input):
     def __str__(self):
         return "StormTracker.StormTrackerCMC"
 
-aws_cryptographic_materialproviders.internaldafny.generated.StormTrackingCMC.StormTrackingCMC = StormTrackingCMC
+aws_cryptographic_material_providers.internaldafny.generated.StormTrackingCMC.StormTrackingCMC = StormTrackingCMC

AwsCryptographicMaterialProviders/runtimes/python/src/aws_cryptographic_materialproviders/internaldafny/extern/SynchronizedLocalCMC.py → AwsCryptographicMaterialProviders/runtimes/python/src/aws_cryptographic_material_providers/internaldafny/extern/SynchronizedLocalCMC.py

@@ -1,7 +1,7 @@
-import aws_cryptographic_materialproviders.internaldafny.generated.StormTrackingCMC
-import aws_cryptographic_materialproviders.internaldafny.generated.SynchronizedLocalCMC
+import aws_cryptographic_material_providers.internaldafny.generated.StormTrackingCMC
+import aws_cryptographic_material_providers.internaldafny.generated.SynchronizedLocalCMC
 import smithy_dafny_standard_library.internaldafny.generated.Wrappers as Wrappers
-import aws_cryptographic_materialproviders.internaldafny.generated.AwsCryptographyMaterialProvidersTypes
+import aws_cryptographic_material_providers.internaldafny.generated.AwsCryptographyMaterialProvidersTypes
 from . import Lock
 
 class SynchronizedLocalCMC:
@@ -67,4 +67,4 @@ def DeleteCacheEntry_k(self, input):
     def __str__(self):
         return "LocalCMC.SynchronizedLocalCMC"
 
-aws_cryptographic_materialproviders.internaldafny.generated.SynchronizedLocalCMC.SynchronizedLocalCMC = SynchronizedLocalCMC
+aws_cryptographic_material_providers.internaldafny.generated.SynchronizedLocalCMC.SynchronizedLocalCMC = SynchronizedLocalCMC

AwsCryptographicMaterialProviders/runtimes/python/src/aws_cryptographic_material_providers/internaldafny/generated/dafny_src-py.dtr

@@ -0,0 +1,179 @@
+file_format_version = "1.0"
+dafny_version = "4.8.0.0"
+[options_by_module.AwsCryptographyKeyStoreTypes]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.AbstractAwsCryptographyKeyStoreOperations]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.AbstractAwsCryptographyKeyStoreService]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.AwsCryptographyMaterialProvidersTypes]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.AwsArnParsing]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.AwsKmsMrkMatchForDecrypt]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.AwsKmsUtils]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.KeyStoreErrorMessages]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.KmsArn]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.Structure]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.KMSKeystoreOperations]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.DDBKeystoreOperations]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.CreateKeys]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.CreateKeyStoreTable]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.GetKeys]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.AwsCryptographyKeyStoreOperations]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.KeyStore]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.AbstractAwsCryptographyMaterialProvidersOperations]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.AbstractAwsCryptographyMaterialProvidersService]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.AlgorithmSuites]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.Materials]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.Keyring]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.MultiKeyring]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.AwsKmsMrkAreUnique]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.Constants]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.MaterialWrapping]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.CanonicalEncryptionContext]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.IntermediateKeyWrapping]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.EdkWrapping]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.ErrorMessages]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.AwsKmsKeyring]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.StrictMultiKeyring]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.AwsKmsDiscoveryKeyring]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.DiscoveryMultiKeyring]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.AwsKmsMrkDiscoveryKeyring]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.MrkAwareDiscoveryMultiKeyring]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.AwsKmsMrkKeyring]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.MrkAwareStrictMultiKeyring]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.LocalCMC]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.SynchronizedLocalCMC]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.StormTracker]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.StormTrackingCMC]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.CacheConstants]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.AwsKmsHierarchicalKeyring]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.AwsKmsRsaKeyring]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.EcdhEdkWrapping]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.RawECDHKeyring]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.AwsKmsEcdhKeyring]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.RawAESKeyring]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.RawRSAKeyring]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.CMM]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.Defaults]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.Commitment]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.DefaultCMM]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.DefaultClientSupplier]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.Utils]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.RequiredEncryptionContextCMM]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.AwsCryptographyMaterialProvidersOperations]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"
+[options_by_module.MaterialProviders]
+legacy-module-names = false
+python-module-name = "aws_cryptographic_material_providers.internaldafny.generated"

AwsCryptographicMaterialProviders/runtimes/python/src/aws_cryptographic_materialproviders/keystore/client.py → AwsCryptographicMaterialProviders/runtimes/python/src/aws_cryptographic_material_providers/keystore/client.py

@@ -1,3 +1,3 @@
 # Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
-from aws_cryptographic_materialproviders.smithygenerated.aws_cryptography_keystore.client import *
+from aws_cryptographic_material_providers.smithygenerated.aws_cryptography_keystore.client import *

AwsCryptographicMaterialProviders/runtimes/python/src/aws_cryptographic_materialproviders/keystore/config.py → AwsCryptographicMaterialProviders/runtimes/python/src/aws_cryptographic_material_providers/keystore/config.py

@@ -1,3 +1,3 @@
 # Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
-from aws_cryptographic_materialproviders.smithygenerated.aws_cryptography_keystore.config import *
+from aws_cryptographic_material_providers.smithygenerated.aws_cryptography_keystore.config import *

AwsCryptographicMaterialProviders/runtimes/python/src/aws_cryptographic_materialproviders/keystore/errors.py → AwsCryptographicMaterialProviders/runtimes/python/src/aws_cryptographic_material_providers/keystore/errors.py

@@ -1,3 +1,3 @@
 # Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
-from aws_cryptographic_materialproviders.smithygenerated.aws_cryptography_keystore.errors import *
+from aws_cryptographic_material_providers.smithygenerated.aws_cryptography_keystore.errors import *

AwsCryptographicMaterialProviders/runtimes/python/src/aws_cryptographic_materialproviders/keystore/models.py → AwsCryptographicMaterialProviders/runtimes/python/src/aws_cryptographic_material_providers/keystore/models.py

@@ -1,3 +1,3 @@
 # Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
-from aws_cryptographic_materialproviders.smithygenerated.aws_cryptography_keystore.models import *
+from aws_cryptographic_material_providers.smithygenerated.aws_cryptography_keystore.models import *

AwsCryptographicMaterialProviders/runtimes/python/src/aws_cryptographic_material_providers/mpl/client.py

@@ -0,0 +1,3 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+from aws_cryptographic_material_providers.smithygenerated.aws_cryptography_materialproviders.client import *

AwsCryptographicMaterialProviders/runtimes/python/src/aws_cryptographic_material_providers/mpl/config.py

@@ -0,0 +1,3 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+from aws_cryptographic_material_providers.smithygenerated.aws_cryptography_materialproviders.config import *

AwsCryptographicMaterialProviders/runtimes/python/src/aws_cryptographic_material_providers/mpl/errors.py

@@ -0,0 +1,3 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+from aws_cryptographic_material_providers.smithygenerated.aws_cryptography_materialproviders.errors import *

AwsCryptographicMaterialProviders/runtimes/python/src/aws_cryptographic_material_providers/mpl/models.py

@@ -0,0 +1,3 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+from aws_cryptographic_material_providers.smithygenerated.aws_cryptography_materialproviders.models import *

AwsCryptographicMaterialProviders/runtimes/python/src/aws_cryptographic_material_providers/mpl/references.py

@@ -0,0 +1,3 @@
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+from aws_cryptographic_material_providers.smithygenerated.aws_cryptography_materialproviders.references import *

AwsCryptographicMaterialProviders/runtimes/python/src/aws_cryptographic_materialproviders/smithygenerated/aws_cryptography_keystore/client.py → AwsCryptographicMaterialProviders/runtimes/python/src/aws_cryptographic_material_providers/smithygenerated/aws_cryptography_keystore/client.py

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # Do not modify this file. This file is machine generated, and any changes to it will be overwritten.
 
-from aws_cryptographic_materialproviders.internaldafny.generated.AwsCryptographyKeyStoreTypes import (
+from aws_cryptographic_material_providers.internaldafny.generated.AwsCryptographyKeyStoreTypes import (
     IKeyStoreClient,
 )
 from typing import Callable, TypeVar, cast