diff --git a/setup.py b/setup.py index 531ff21..d521f69 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ with open("README.md", "r", encoding="utf-8") as fh: long_description = fh.read() setuptools.setup( - name="VaultDb", + name="vaultdb", version="0.0.1", version_config=True, setup_requires=['setuptools-git-versioning'], diff --git a/src/VaultDb/__main__.py b/src/VaultDb/__main__.py deleted file mode 100644 index 079a489..0000000 --- a/src/VaultDb/__main__.py +++ /dev/null @@ -1,48 +0,0 @@ -import requests as rq -import datetime as dt - -class Database2: - def __init__(self, dbname, vault_url, token, vault_port=8200): - self.dbname = dbname - self.url = vault_url + ":" + str(vault_port) + "/v1/database/creds/" + dbname - self.lastReq = None #TODO some datetime in here - self.ttl = None - self.token = token - self.username = "" - self.password = "" - self.get_creds() - - def check_valid(self): - #TODO check datetime for current datetime - if self.ttl == None: - return False - return True - - def update_creds(self): - r = rq.get(url=self.url, headers={"X-Vault-Token": self.token, "Content-Type": "application/json"}) - # print(r.status_code) - # print(r.text) - if r.status_code != 200: - raise Exception("status code was nog 200") - data = r.json() - # TODO set datetime for current datetime - # TODO set these to the correct response values - self.username = data["data"]["username"] - self.password = data["data"]["password"] - self.lease_id = data["lease_id"] - self.request_id = data["request_id"] - self.wrap_info = data["wrap_info"] - self.warnings = data["warnings"] - self.auth = data["auth"] - self.ttl = dt.datetime.now() + dt.timedelta(seconds=float(data["lease_duration"])) - - - def get_creds(self): - if not (self.check_valid()): - self.update_creds() - return {"username": self.username, "password": self.password} - - def get_username(self): - if not (self.check_valid()): - self.update_creds() - return self.username diff --git a/src/VaultDb/__init__.py b/src/vaultdb/__init__.py similarity index 100% rename from src/VaultDb/__init__.py rename to src/vaultdb/__init__.py