chore: update workflows, examples, tests, readmes for api keys v2

Author: anitarua

.github/workflows/momento-local-tests.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     env:
-      TEST_API_KEY: ${{ secrets.ALPHA_TEST_AUTH_TOKEN }}
+      MOMENTO_API_KEY: ${{ secrets.ALPHA_API_KEY_V2 }}
       TEST_CACHE_NAME: python-integration-test-${{ matrix.python-version }}-${{ matrix.new-python-protobuf }}-${{ github.sha }}
 
     steps:

.github/workflows/on-pull-request.yml

@@ -15,7 +15,9 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     env:
-      TEST_API_KEY: ${{ secrets.ALPHA_TEST_AUTH_TOKEN }}
+      MOMENTO_API_KEY: ${{ secrets.ALPHA_API_KEY_V2 }}
+      MOMENTO_ENDPOINT: "cell-alpha-dev.preprod.a.momentohq.com"
+      V1_API_KEY: ${{ secrets.ALPHA_TEST_AUTH_TOKEN }}
       TEST_CACHE_NAME: python-integration-test-${{ matrix.python-version }}-${{ matrix.new-python-protobuf }}-${{ github.sha }}
 
     steps:
@@ -79,9 +81,9 @@ jobs:
       max-parallel: 1
 
     env:
-      # TODO: remove token stored as secret in favor of using a
-      # momento-local instance that can be spun up for testing
-      MOMENTO_API_KEY: ${{ secrets.ALPHA_TEST_AUTH_TOKEN }}
+      V1_API_KEY: ${{ secrets.ALPHA_TEST_AUTH_TOKEN }}
+      MOMENTO_API_KEY: ${{ secrets.ALPHA_API_KEY_V2 }}
+      MOMENTO_ENDPOINT: "cell-alpha-dev.preprod.a.momentohq.com"
     steps:
       - uses: actions/checkout@v3
 

CONTRIBUTING.md

@@ -169,13 +169,13 @@ poetry run isort .
 
 ## Tests :zap:
 
-Integration tests require an api key for testing. Set the env var `TEST_API_KEY` to
+Integration tests require an api key for testing. Set the env vars `MOMENTO_API_KEY` and `MOMENTO_ENDPOINT` to
 provide it. The env `TEST_CACHE_NAME` is also required, but for now any string value works.
 
 Example of running tests against all python versions:
 
 ```
-TEST_API_KEY=<api key> TEST_CACHE_NAME=<cache name> poetry run pytest
+MOMENTO_API_KEY=<api key> MOMENTO_ENDPOINT=<endpoint> TEST_CACHE_NAME=<cache name> poetry run pytest
 ```
 
 ### For M1 Users
@@ -188,7 +188,7 @@ a github issue with us to let us know.  And in the meantime you can work around
 issue by installing Rosetta 2 and re-running with:
 
 ```
-arch -x86_64 TEST_API_KEY=<api key> TEST_CACHE_NAME=<cache name> poetry run pytest
+arch -x86_64 MOMENTO_API_KEY=<api key> MOMENTO_ENDPOINT=<endpoint>  TEST_CACHE_NAME=<cache name> poetry run pytest
 ```
 
 ### Developing new test cases?

examples/observability.py

@@ -8,7 +8,7 @@
 
 example_observability_setup_tracing()
 
-_AUTH_PROVIDER = CredentialProvider.from_environment_variable("MOMENTO_API_KEY")
+_AUTH_PROVIDER = CredentialProvider.from_environment_variables_v2()
 _ITEM_DEFAULT_TTL_SECONDS = timedelta(seconds=60)
 _CACHE_NAME = "test-cache"
 _KEY = "test-key"

examples/poetry.lock

@@ -6,7 +6,7 @@
 
 from example_utils.example_logging import initialize_logging
 
-_AUTH_PROVIDER = CredentialProvider.from_environment_variable("MOMENTO_API_KEY")
+_AUTH_PROVIDER = CredentialProvider.from_environment_variables_v2()
 _CACHE_NAME = "cache"
 _ITEM_DEFAULT_TTL_SECONDS = timedelta(seconds=60)
 _KEY = "MyKey"

examples/prepy310/example.py

@@ -7,7 +7,7 @@
 
 from example_utils.example_logging import initialize_logging
 
-_AUTH_PROVIDER = CredentialProvider.from_environment_variable("MOMENTO_API_KEY")
+_AUTH_PROVIDER = CredentialProvider.from_environment_variables_v2()
 _CACHE_NAME = "cache"
 _ITEM_DEFAULT_TTL_SECONDS = timedelta(seconds=60)
 _KEY = "MyKey"

examples/prepy310/example_async.py

@@ -7,7 +7,7 @@
     cache_name = "default-cache"
     with CacheClient.create(
         configuration=Configurations.Laptop.v1(),
-        credential_provider=CredentialProvider.from_environment_variable("MOMENTO_API_KEY"),
+        credential_provider=CredentialProvider.from_environment_variables_v2(),
         default_ttl=timedelta(seconds=60),
     ) as cache_client:
         create_cache_response = cache_client.create_cache(cache_name)

examples/prepy310/quickstart.py

@@ -5,7 +5,7 @@
 
 cache_client = CacheClient(
     configuration=Configurations.Laptop.v1(),
-    credential_provider=CredentialProvider.from_environment_variable("MOMENTO_API_KEY"),
+    credential_provider=CredentialProvider.from_environment_variables_v2(),
     default_ttl=timedelta(seconds=60),
 )
 cache_client.create_cache("cache")

examples/prepy310/readme.py

@@ -12,7 +12,7 @@
 
 from example_utils.example_logging import initialize_logging
 
-_AUTH_PROVIDER = CredentialProvider.from_environment_variable("MOMENTO_API_KEY")
+_AUTH_PROVIDER = CredentialProvider.from_environment_variables_v2()
 _CACHE_NAME = "cache"
 _logger = logging.getLogger("topic-publish-example")
 
@@ -28,7 +28,9 @@ def main() -> None:
     initialize_logging()
     setup_cache()
     _logger.info("hello")
-    with TopicClient(TopicConfigurations.Default.v1(), _AUTH_PROVIDER) as client:
+    with TopicClient(
+        TopicConfigurations.Default.v1().with_client_timeout(timedelta(seconds=10)), _AUTH_PROVIDER
+    ) as client:
         response = client.publish("cache", "my_topic", "my_value")
         if isinstance(response, TopicPublish.Error):
             print("error: ", response.message)