allow to find .env.vault #13

nsnguyen · 2023-07-12T07:19:28Z

this allows to search for .env.vault anywhere in the app.

motdotla · 2023-07-12T14:38:10Z

src/dotenv_vault/main.py

@@ -11,6 +11,9 @@
 import dotenv.main as dotenv


+DOTENV_VAULT_PATH = dotenv.find_dotenv(".env.vault")


change this to instead find the .env file and then find the .env.vault file right next to it.

That would then match user's expected behavior more closely. This is what the node lib does.

https://github.com/motdotla/dotenv/blob/master/lib/main.js#L152

@motdotla , made a new change. It should look for .env first, and expect .env.vault to be in same directory. Else, it will scream at you

motdotla · 2023-07-15T19:27:37Z

src/dotenv_vault/main.py

+        return path
+    path = os.path.dirname(path)
+    if '.env.vault' not in os.listdir(path):
+        raise FileNotFoundError('.env.vault is not in same directory as .env')


it shouldn't stacktrace fail.

on local development someone might be using this library and not have a .env.vault file. that's ok. it should fallback to dotenv.

this should have messaging like the dotenv lib:

https://github.com/motdotla/dotenv/blob/master/lib/main.js#L228

@motdotla , okay it should default to .env

src/dotenv_vault/__version__.py

motdotla · 2023-07-25T20:22:39Z

src/dotenv_vault/main.py

+    path = os.path.dirname(path)
+    if '.env.vault' not in os.listdir(path):
+        # we fall back to .env
+        logger.warning("No .env.vault file found. Falling back to .env")


Messaging should match the dotenv messaging.

https://github.com/motdotla/dotenv/blob/master/lib/main.js#L228C113-L228C113

motdotla

one last change!

motdotla · 2023-07-27T22:56:45Z

CHANGELOG.md

+
+### Changed
+
+- Allow to place .env.vault file anywhere in app [#13](https://github.com/dotenv-org/python-dotenv-vault/pull/13)


Update message to:

Look for .env.vault file at same location as .env file. Finds .env file anywhere in app (just like original python lib)

motdotla · 2023-07-29T21:02:40Z

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. See [standa

 ## [Unreleased](https://github.com/dotenv-org/python-dotenv-vault/compare/v0.5.1...master)

+## 0.7.0


This should be a 0.6.1 patch rather than a minor upgrade.

motdotla · 2023-07-29T21:05:32Z

src/dotenv_vault/__init__.py

@@ -1 +1 @@
-from .main import load_dotenv
+from .main import load_dotenv, load_dotenv_vault


This shouldn't be exposed to the developer as a public method.

https://github.com/motdotla/dotenv/blob/master/lib/main.js#L167

usage for developer should not ever change. just load_dotenv and it is smart enough to determine to load .env.vault or .env depending if DOTENV_KEY is set or not.

👍 i removed load_dotenvv_ault

looks like it is still there?? in __int__.py ?

Oops! Forgot to push 😎

…ault should be in same location

motdotla

just the change in __init__.py and then this is ready to go

motdotla · 2023-08-01T19:20:38Z

src/dotenv_vault/main.py

+        # we fall back to .env
+        logger.warning(f"You set DOTENV_KEY but you are missing a .env.vault file at {path}. Did you forget to build it?")
+        return f"{path}/.env"
+    return f"{path}/.env.vault"


looks good here 👍

motdotla · 2023-08-03T04:38:20Z

CHANGELOG.md

+
+### Changed
+
+- Look for .env.vault file at same location as .env file. Finds .env file anywhere in app (just like original python lib) [#13](https://github.com/dotenv-org/python-dotenv-vault/pull/13)


One more nitpick. This comment should be under 0.6.1 and the one above should be under 0.6.2. Then this PR should be ready to go.

okay, i switched this around @motdotla . It should be in correct place now

nsnguyen requested a review from motdotla July 12, 2023 07:19

nsnguyen force-pushed the find-dotenv-vault-file branch 2 times, most recently from 1e5781c to 43ed0d1 Compare July 12, 2023 07:33

motdotla requested changes Jul 12, 2023

View reviewed changes

nsnguyen force-pushed the find-dotenv-vault-file branch from 5e2af23 to 1a0ce86 Compare July 15, 2023 04:31

motdotla requested changes Jul 15, 2023

View reviewed changes

nsnguyen force-pushed the find-dotenv-vault-file branch from 1a0ce86 to 35f3545 Compare July 19, 2023 06:06

motdotla requested changes Jul 25, 2023

View reviewed changes

nsnguyen force-pushed the find-dotenv-vault-file branch from 48bb438 to 508d7e5 Compare July 27, 2023 06:35

motdotla requested changes Jul 27, 2023

View reviewed changes

nsnguyen force-pushed the find-dotenv-vault-file branch from 508d7e5 to 22c19c5 Compare July 28, 2023 07:41

motdotla requested changes Jul 29, 2023

View reviewed changes

nsnguyen added 5 commits July 31, 2023 21:28

allow to find .env.vault

7995e97

add 0.6.1 changelog

3e2ecec

add logic where it should look for .env file first, and expect .env.v…

5291f16

…ault should be in same location

add unit test

6e7bf4b

update python-dotenv dependecy version to 1.0.0

b1c8ca8

nsnguyen force-pushed the find-dotenv-vault-file branch from 4944f86 to 5d15763 Compare August 1, 2023 04:30

bump up major version

80361df

nsnguyen force-pushed the find-dotenv-vault-file branch from 5d15763 to 80361df Compare August 1, 2023 04:35

motdotla requested changes Aug 1, 2023

View reviewed changes

remove load_dotenv_vault from init

9af1c88

motdotla requested changes Aug 3, 2023

View reviewed changes

update changlog

8b9b1aa

motdotla merged commit 8d78a70 into master Aug 5, 2023

motdotla deleted the find-dotenv-vault-file branch August 5, 2023 06:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

allow to find .env.vault #13

allow to find .env.vault #13

nsnguyen commented Jul 12, 2023 •

edited

Loading

motdotla Jul 12, 2023

nsnguyen Jul 13, 2023

nsnguyen Jul 13, 2023

motdotla Jul 15, 2023

nsnguyen Jul 19, 2023

motdotla Jul 25, 2023

nsnguyen Jul 27, 2023

motdotla left a comment

motdotla Jul 27, 2023

nsnguyen Jul 28, 2023

motdotla Jul 29, 2023

motdotla Jul 29, 2023

nsnguyen Aug 1, 2023

motdotla Aug 1, 2023

nsnguyen Aug 1, 2023

motdotla left a comment

motdotla Aug 1, 2023

motdotla Aug 3, 2023

nsnguyen Aug 5, 2023

		@@ -11,6 +11,9 @@
		import dotenv.main as dotenv


		DOTENV_VAULT_PATH = dotenv.find_dotenv(".env.vault")


		### Changed

		- Allow to place .env.vault file anywhere in app [#13](https://github.com/dotenv-org/python-dotenv-vault/pull/13)

		@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. See [standa

		## [Unreleased](https://github.com/dotenv-org/python-dotenv-vault/compare/v0.5.1...master)

		## 0.7.0

		@@ -1 +1 @@
		from .main import load_dotenv
		from .main import load_dotenv, load_dotenv_vault


		### Changed

		- Look for .env.vault file at same location as .env file. Finds .env file anywhere in app (just like original python lib) [#13](https://github.com/dotenv-org/python-dotenv-vault/pull/13)

allow to find .env.vault #13

allow to find .env.vault #13

Conversation

nsnguyen commented Jul 12, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

motdotla left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

motdotla left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nsnguyen commented Jul 12, 2023 •

edited

Loading