Skip to content

Fix: Allow hyphens in environment variables #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 13, 2025
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
4 changes: 2 additions & 2 deletions cfc/environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from .config import config

NAME_PATTERN = r"^[^\-\.][\w\-\.]+$"
ENV_VARS_PATTERN = r"^([\w:.\/]+=[\w:.\/]+)(,[\w:.\/]+=[\w:.\/]+)*$"
ENV_VARS_PATTERN = r"^([\w:.\/\-]+=[\w:.\/\-]+)(,[\w:.\/\-]+=[\w:.\/\-]+)*$"
ENVIRONMENT_ENVVAR_NAME = "CFC_ENVIRONMENT"

env_app = typer.Typer()
Expand All @@ -35,7 +35,7 @@ def tag_callback(name: str) -> str:
return name_callback(name)


def env_var_callback(env_vars: str) -> dict:
def env_var_callback(env_vars: str) -> str:
if not env_vars:
return env_vars
if not re.fullmatch(ENV_VARS_PATTERN, env_vars):
Expand Down
25 changes: 25 additions & 0 deletions tests/test_environment.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
from unittest import TestCase

import typer

from cfc.environment import env_var_callback


class TestEnvironment(TestCase):
def test_env_var_callback(self):
# Test valid input
env_var_callback("VAR1=VALUE1,VAR2=VALUE2")
env_var_callback("VAR1=abc-123:as123")
env_var_callback("VAR1=abc-123:as123,VAR2=abc-123:as123")
env_var_callback("VAR1=https://example.com,VAR2=abc-123:as123")

# test empty input
env_var_callback("")

# test invalid input
with self.assertRaises(typer.BadParameter):
env_var_callback("VAR1=VALUE1,VAR2=VALUE2,")
with self.assertRaises(typer.BadParameter):
env_var_callback("VAR1=VALUE1,VAR2=VALUE2,VAR3")
with self.assertRaises(typer.BadParameter):
env_var_callback("VAR1=VALUE1,VAR2=VALUE2,VAR3=VALUE3=")
Loading