Merge pull request #16 from deeprave/action-upgrades

Action upgrades

.github/workflows/poetry-test-and-build.yml

@@ -17,7 +17,7 @@ jobs:
         poetry-version: ["1.7.1"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           # Fetch all tags
           fetch-depth: 0
@@ -26,7 +26,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup python and poetry
-        uses: abatilo/actions-poetry@v2.3.0
+        uses: abatilo/actions-poetry@v2.4.0
         with:
           poetry-version: ${{ matrix.poetry-version }}
 

.github/workflows/release-build-and-publish.yml

@@ -14,12 +14,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Setup python and poetry
-        uses: abatilo/actions-poetry@v2.3.0
+        uses: abatilo/actions-poetry@v2.4.0
         with:
           poetry-version: ${{ matrix.poetry-version }}
           python-version: ${{ matrix.python-version }}

envex/lib/hvac_env.py

@@ -72,7 +72,7 @@ def __init__(
         """
         self._mount_point = None
         if verify in (True, None):
-            verify = os.getenv("VAULT_åCACERT") or True
+            verify = os.getenv("VAULT_CACERT") or True
         if isinstance(verify, str):
             verify = expand(verify)
         if cert is None:
@@ -124,6 +124,13 @@ def client(self):
         except Exception as exc:
             logging.debug(f"{exc.__class__.__name__} Vault client cannot authenticate {exc}")
 
+    @property
+    def sealed(self) -> bool:
+        if self.client:
+            response = self.client.seal_status
+            return response["sealed"]
+        return None
+
     @property
     def base_path(self) -> str:
         return self._base_path

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "envex"
-version = "2.2.1"
+version = "2.3.0"
 description = "Environment interface with .env and hashicorp vault support"
 authors = ["David Nugent <[email protected]>"]
 readme = "README.md"

tests/lib/test_hvac_env.py

@@ -68,7 +68,7 @@ def test_set_secret_in_vault(self, mocker):
         secrets_manager.set_secret("key", "secret_value")
 
         # Assert that the secret is set in the Vault
-        secrets_manager._client.write.assert_called_once_with("secret/test/key", value="secret_value")
+        secrets_manager._client.write.assert_called_once_with("test/key", value="secret_value")
 
         # Assert that the secret is cached
         secrets_manager._cache.put.assert_called_once_with("key", "secret_value")

tests/test_wrapper.py

@@ -111,27 +111,35 @@ def test_env_list(monkeypatch):
     monkeypatch.setattr(envex.dot_env, "open_env", dotenv)
     env = envex.Env(readenv=True)
 
-    result = env.list("ALISTOFIPS")
-    assert isinstance(result, list)
-    assert len(result) == 3
+    result = _extracted_from_test_env_list_5(env, "ALISTOFIPS", 3)
     assert result == ["::1", "127.0.0.1", "mydomain.com"]
 
-    result = env("ALISTOFIPS", type=list)
-    assert isinstance(result, list)
-    assert len(result) == 3
+    result = _extracted_from_test_env_list_10(env, "ALISTOFIPS", 3)
     assert result == ["::1", "127.0.0.1", "mydomain.com"]
 
-    result = env.list("LISTOFQUOTEDVALUES")
-    assert isinstance(result, list)
-    assert len(result) == 4
+    result = _extracted_from_test_env_list_5(env, "LISTOFQUOTEDVALUES", 4)
     assert result == ["1", "two", "3", "four"]
 
-    result = env("LISTOFQUOTEDVALUES", type=list)
-    assert isinstance(result, list)
-    assert len(result) == 4
+    result = _extracted_from_test_env_list_10(env, "LISTOFQUOTEDVALUES", 4)
     assert result == ["1", "two", "3", "four"]
 
 
+def _extracted_from_test_env_list_5(env, arg1, arg2):
+    result = env.list(arg1)
+    return _extracted_from__extracted_from_test_env_list_10_11(result, arg2)
+
+
+def _extracted_from__extracted_from_test_env_list_10_11(result, arg2):
+    assert isinstance(result, list)
+    assert len(result) == arg2
+    return result
+
+
+def _extracted_from_test_env_list_10(env, arg1, arg2):
+    result = env(arg1, type=list)
+    return _extracted_from__extracted_from_test_env_list_10_11(result, arg2)
+
+
 def test_env_iter(monkeypatch):
     monkeypatch.setattr(envex.dot_env, "open_env", dotenv)
     env = envex.Env(readenv=True, update=False)