Fix oracle CI, and update the release tox environments

Author: farleyb-amazon

decrypt_oracle/test/integration/integration_test_utils.py

@@ -17,7 +17,9 @@
 from collections import namedtuple
 from typing import Any, Callable, Iterable, Optional, Text
 
+import aws_encryption_sdk
 import pytest
+from aws_encryption_sdk.identifiers import CommitmentPolicy
 from aws_encryption_sdk.key_providers.kms import StrictAwsKmsMasterKeyProvider
 
 HERE = os.path.abspath(os.path.dirname(__file__))
@@ -27,6 +29,8 @@
 _KMS_MKP = None
 _ENDPOINT = None
 
+CLIENT = aws_encryption_sdk.EncryptionSDKClient(commitment_policy=CommitmentPolicy.REQUIRE_ENCRYPT_ALLOW_DECRYPT)
+
 
 def decrypt_endpoint() -> Text:
     """Build the API endpoint based on environment variables."""

decrypt_oracle/test/unit/key_providers/test_u_counting.py

@@ -11,21 +11,19 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 """Unit test for ``aws_encryption_sdk_decrypt_oracle.key_providers.counting``."""
-import aws_encryption_sdk
 import pytest
 from aws_encryption_sdk_decrypt_oracle.key_providers.counting import CountingMasterKey
 
-from aws_encryption_sdk.identifiers import CommitmentPolicy
-from ...integration.integration_test_utils import filtered_test_vectors
+from ...integration.integration_test_utils import CLIENT, filtered_test_vectors
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 
 
 @pytest.mark.parametrize("vector", filtered_test_vectors(lambda x: x.key_type == "test_counting"))
 def test_counting_master_key_decrypt_vectors(vector):
     master_key = CountingMasterKey()
-    client = aws_encryption_sdk.EncryptionSDKClient(commitment_policy=CommitmentPolicy.REQUIRE_ENCRYPT_ALLOW_DECRYPT)
-    plaintext, _header = client.decrypt(source=vector.ciphertext, key_provider=master_key)
+
+    plaintext, _header = CLIENT.decrypt(source=vector.ciphertext, key_provider=master_key)
 
     assert plaintext == vector.plaintext
 
@@ -34,10 +32,8 @@ def test_counting_master_key_cycle():
     plaintext = b"some super secret plaintext"
     master_key = CountingMasterKey()
 
-    client = aws_encryption_sdk.EncryptionSDKClient(commitment_policy=CommitmentPolicy.REQUIRE_ENCRYPT_ALLOW_DECRYPT)
-
-    ciphertext, _header = client.encrypt(source=plaintext, key_provider=master_key)
-    decrypted, _header = client.decrypt(source=ciphertext, key_provider=master_key)
+    ciphertext, _header = CLIENT.encrypt(source=plaintext, key_provider=master_key)
+    decrypted, _header = CLIENT.decrypt(source=ciphertext, key_provider=master_key)
 
     assert plaintext != ciphertext
     assert plaintext == decrypted

decrypt_oracle/test/unit/key_providers/test_u_null.py

@@ -11,32 +11,28 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 """Unit test for ``aws_encryption_sdk_decrypt_oracle.key_providers.null``."""
-import aws_encryption_sdk
 import pytest
 from aws_encryption_sdk_decrypt_oracle.key_providers.null import NullMasterKey
 
-from aws_encryption_sdk.identifiers import CommitmentPolicy
-from ...integration.integration_test_utils import filtered_test_vectors
+from ...integration.integration_test_utils import CLIENT, filtered_test_vectors
 
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 
 
 @pytest.mark.parametrize("vector", filtered_test_vectors(lambda x: x.key_type == "null"))
 def test_null_master_key_decrypt_vectors(vector):
     master_key = NullMasterKey()
-    client = aws_encryption_sdk.EncryptionSDKClient(commitment_policy=CommitmentPolicy.REQUIRE_ENCRYPT_ALLOW_DECRYPT)
-    plaintext, _header = client.decrypt(source=vector.ciphertext, key_provider=master_key)
+    plaintext, _header = CLIENT.decrypt(source=vector.ciphertext, key_provider=master_key)
 
     assert plaintext == vector.plaintext
 
 
 def test_null_master_key_cycle():
     plaintext = b"some super secret plaintext"
     master_key = NullMasterKey()
-    client = aws_encryption_sdk.EncryptionSDKClient(commitment_policy=CommitmentPolicy.REQUIRE_ENCRYPT_ALLOW_DECRYPT)
 
-    ciphertext, _header = client.encrypt(source=plaintext, key_provider=master_key)
-    decrypted, _header = client.decrypt(source=ciphertext, key_provider=master_key)
+    ciphertext, _header = CLIENT.encrypt(source=plaintext, key_provider=master_key)
+    decrypted, _header = CLIENT.decrypt(source=ciphertext, key_provider=master_key)
 
     assert plaintext != ciphertext
     assert plaintext == decrypted

tox.ini

@@ -345,30 +345,24 @@ deps =
 passenv =
     {[testenv]passenv} \
     TWINE_USERNAME \
-    TWINE_PASSWORD \
-    TWINE_REPOSITORY_URL
+    TWINE_PASSWORD
 commands =
     {[testenv:build]commands}
-    twine upload --skip-existing {toxinidir}/dist/*
 
 [testenv:test-release]
 basepython = python3
 skip_install = true
 deps = {[testenv:release-base]deps}
 passenv =
     {[testenv:release-base]passenv}
-setenv =
-    TWINE_REPOSITORY_URL = https://test.pypi.org/legacy/
-commands = {[testenv:release-base]commands}
+commands =
+    twine upload --skip-existing --repository testpypi {toxinidir}/dist/*
 
 [testenv:release]
 basepython = python3
 skip_install = true
 deps = {[testenv:release-base]deps}
 passenv =
     {[testenv:release-base]passenv}
-whitelist_externals = unset
 commands =
-    # Unsetting the TWINE_REPOSITORY_URL defaults twine to using production PyPI
-    unset TWINE_REPOSITORY_URL
-    {[testenv:release-base]commands}
+    twine upload --skip-existing --repository pypi {toxinidir}/dist/*