Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 40 additions & 21 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,36 +14,55 @@ docker-upload:
docker push $(IMAGE_BASE)

docker-doctest: docker-build
docker run -v $(CURDIR):/var/workdir\
-v /tmp/power:/tmp/power\
$(IMAGE_BASE) "baw test docs"
docker run\
-v $(CURDIR):/var/workdir\
-v /tmp/power:/tmp/power\
$(IMAGE_BASE)\
"baw test docs"

docker-fasttest: docker-build
docker run -v $(CURDIR):/var/workdir\
-v /tmp/power:/tmp/power\
$(IMAGE_BASE) "baw test fast"
docker run\
-v $(CURDIR):/var/workdir\
-v /tmp/power:/tmp/power\
$(IMAGE_BASE)\
"baw test fast"

docker-longtest: docker-build
docker run -v $(CURDIR):/var/workdir\
-v /tmp/power:/tmp/power\
$(IMAGE_BASE) "baw test long"
docker run\
-v $(CURDIR):/var/workdir\
-v /tmp/power:/tmp/power\
$(IMAGE_BASE)\
"baw test long"

docker-alltest: docker-build
docker run -v $(CURDIR):/var/workdir\
-v /tmp/power:/tmp/power\
$(IMAGE_BASE) "baw test all"
docker run\
-v $(CURDIR):/var/workdir\
-v /tmp/power:/tmp/power\
$(IMAGE_BASE)\
"baw test all"

docker-lint: docker-build
docker run -v $(CURDIR):/var/workdir $(IMAGE_BASE) "baw lint all"
docker run\
-v $(CURDIR):/var/workdir\
$(IMAGE_BASE)\
"baw lint all"

docker-decrypt: docker-build
docker run -v $(CURDIR):/var/workdir\
-v /tmp/power:/tmp/power\
-e HOVERPOWER_STORE=/var/workdir/hoverpower/repo\
-e HOVERPOWER_SECRET=$(HOVERPOWER_SECRET)\
$(IMAGE_BASE) "powerdecrypt"
docker run\
-v $(CURDIR):/var/workdir\
-v /tmp/power:/tmp/power\
-e HOVERPOWER_STORE=/var/workdir/hoverpower/repo\
-e HOVERPOWER_SECRET\
$(IMAGE_BASE)\
"powerdecrypt"

docker-release: docker-build
docker run -v $(CURDIR):/var/workdir\
-e GH_TOKEN=$(GH_TOKEN) $(IMAGE_BASE)\
"baw release --no_test --no_linter"
@if git describe --exact-match --tags HEAD >/dev/null 2>&1; then\
echo "Current commit is already tagged. Skipping release.";\
else \
docker run\
-v $(CURDIR):/var/workdir\
-e GH_TOKEN\
$(IMAGE_BASE)\
"baw release --no_test --no_linter";\
fi
14 changes: 11 additions & 3 deletions hoverpower/secret.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,18 @@

HOVERPOWER_SECRET = os.environ.get('HOVERPOWER_SECRET', DEFAULT_SECRET)


def invalid_secret_msg() -> str:
replaced = len(f'{HOVERPOWER_SECRET}') * '*'
result = f'Invalid HOVERPOWER_SECRET {replaced}\n'
result += f'Example : {DEFAULT_SECRET}'
return result


try:
CIPHER = cryptography.fernet.Fernet(key=HOVERPOWER_SECRET)
except ValueError:
utilo.exitx(f'Invalid HOVERPOWER_SECRET format: {HOVERPOWER_SECRET}\n'
f'Example : {DEFAULT_SECRET}')
utilo.exitx(invalid_secret_msg())


def decrypt(path: str) -> bytes | None:
Expand All @@ -32,7 +39,8 @@ def decrypt(path: str) -> bytes | None:
try:
data = CIPHER.decrypt(encrypted)
except cryptography.fernet.InvalidToken:
utilo.error(f'invalid HOVERPOWER_SECRET for: {path}')
utilo.error(path)
utilo.error(invalid_secret_msg())
return None
return data

Expand Down
11 changes: 7 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,19 @@ changelog_file = "CHANGELOG"

[tool.semantic_release.commit_parser_options]
patch_tags = [
"fix",
"perf",
"build",
"chore",
"ci",
"deps",
"docs",
"style",
"fix",
"perf",
"refactor",
"style",
"test",
"deps",
]
minor_tags = [
"feat",
]

[tool.setuptools.packages.find]
Expand Down
6 changes: 4 additions & 2 deletions tests/test_secret.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def test_decode_invalid_format():
'powerdecrypt',
expect=False,
)
assert '[ERROR] Invalid HOVERPOWER_SECRET format: newvalue' in completed.stderr
assert '[ERROR] Invalid HOVERPOWER_SECRET ********' in completed.stderr


@unittest.mock.patch.dict(
Expand All @@ -41,5 +41,7 @@ def test_decode_invalid_secret():
expect=False,
)
error = completed.stderr
count = error.count('[ERROR] invalid HOVERPOWER_SECRET for')
count = error.count(
'[ERROR] Invalid HOVERPOWER_SECRET ********************************************'
)
assert count == 1