Skip to content

Commit 45588d7

Browse files
committed
Address reviewer comments
1 parent 832b5bc commit 45588d7

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

manifester/commands.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def delete(allocations, all_, remove_manifest_file):
6161
)
6262
if remove_manifest_file:
6363
manifester_directory = (
64-
Path(os.environ["MANIFESTER_DIRECTORY"])
64+
Path(os.environ["MANIFESTER_DIRECTORY"]).resolve()
6565
if "MANIFESTER_DIRECTORY" in os.environ
6666
else Path()
6767
)

manifester/helpers.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ def login(self, **kwargs):
347347

348348
def logout(self):
349349
"""Revoke Vault auth token and remove it from .env file."""
350-
# Teardown - Setting dymmy token in env file
350+
# Teardown - Setting dummy token in env file
351351
_envdata = re.sub(
352352
".*VAULT_TOKEN_FOR_DYNACONF=.*", "# VAULT_TOKEN_FOR_DYNACONF=myroot", self.envdata
353353
)

manifester/settings.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import os
33
from pathlib import Path
44

5-
from dynaconf import LazySettings, Validator
5+
from dynaconf import Dynaconf, Validator
66

77
settings_file = "manifester_settings.yaml"
88
MANIFESTER_DIRECTORY = Path()
@@ -18,10 +18,10 @@
1818
Validator("simple_content_access", default="enabled"),
1919
Validator("username_prefix", len_min=3),
2020
]
21-
settings = LazySettings(
21+
settings = Dynaconf(
2222
settings_file=str(settings_path.absolute()),
2323
ENVVAR_PREFIX_FOR_DYNACONF="MANIFESTER",
2424
load_dotenv=True,
2525
validators=validators,
2626
)
27-
settings.validators.validate()
27+
# settings.validators.validate()

scripts/vault_login.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#!/usr/bin/env python
2-
# This Enables and Disables individuals OIDC token to access secrets from vault
2+
"""Enables and Disables an OIDC token to access secrets from HashiCorp Vault."""
33
import sys
44

55
from manifester.helpers import Vault
66

7-
if __name__ == '__main__':
7+
if __name__ == "__main__":
88
with Vault() as vclient:
9-
if sys.argv[-1] == '--login':
9+
if sys.argv[-1] == "--login":
1010
vclient.login()
11-
elif sys.argv[-1] == '--status':
11+
elif sys.argv[-1] == "--status":
1212
vclient.status()
1313
else:
1414
vclient.logout()

0 commit comments

Comments
 (0)