Skip to content

adding replacement for special env var #89

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.

Sign up for GitHub

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
SethHollandsworth merged 1 commit into from
Apr 1, 2025
Merged

adding replacement for special env var #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions src/confcom/azext_confcom/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@
ACI_FIELD_YAML_LIVENESS_PROBE = "livenessProbe"
ACI_FIELD_YAML_READINESS_PROBE = "readinessProbe"
ACI_FIELD_YAML_STARTUP_PROBE = "startupProbe"
ACI_FIELD_TEMPLATE_SPECIAL_ENV_VAR_REGEX_NAME = "THIM_ENDPOINT"
ACI_FIELD_TEMPLATE_SPECIAL_ENV_VAR_REGEX_VALUE = "^===CONFIDENTIAL.THIM.ENDPOINT===$"

VIRTUAL_NODE_YAML_METADATA = "metadata"
VIRTUAL_NODE_YAML_COMMAND = "command"
VIRTUAL_NODE_YAML_ARGS = "args"
Expand Down
10 changes: 10 additions & 0 deletions src/confcom/azext_confcom/template_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,16 @@ def process_env_vars_from_template(params: dict,
config.ACI_FIELD_CONTAINERS_ENVS_VALUE: ".*",
config.ACI_FIELD_CONTAINERS_ENVS_STRATEGY: "re2",
})
elif (
re.match(config.ACI_FIELD_TEMPLATE_SPECIAL_ENV_VAR_REGEX_VALUE, value) and
name == config.ACI_FIELD_TEMPLATE_SPECIAL_ENV_VAR_REGEX_NAME
):
# special case for adding THIM endpoint to container
env_vars.append({
config.ACI_FIELD_CONTAINERS_ENVS_NAME: config.ACI_FIELD_TEMPLATE_SPECIAL_ENV_VAR_REGEX_NAME,
config.ACI_FIELD_CONTAINERS_ENVS_VALUE: ".*",
config.ACI_FIELD_CONTAINERS_ENVS_STRATEGY: "re2",
})
else:
env_vars.append({
config.ACI_FIELD_CONTAINERS_ENVS_NAME: name,
Expand Down
11 changes: 11 additions & 0 deletions src/confcom/azext_confcom/tests/latest/test_confcom_arm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -970,6 +970,12 @@ def test_arm_template_with_parameter_file_injected_env_vars(self):
"name": "[parameters('containername')]",
"properties": {
"image": "[parameters('image')]",
"environmentVariables": [
{
"name": "THIM_ENDPOINT",
"value": "===CONFIDENTIAL.THIM.ENDPOINT==="
}
],
"ports": [
{
"port": "[parameters('port')]"
Expand Down Expand Up @@ -1023,10 +1029,15 @@ def test_arm_template_with_parameter_file_injected_env_vars(self):

# see if we have environment variables specific to the python image in the parameter file
python_flag = False
thim_flag = False
for value in output_json[0][config.POLICY_FIELD_CONTAINERS_ELEMENTS_ENVS]:
if "PYTHON" in value[config.POLICY_FIELD_CONTAINERS_ELEMENTS_ENVS_RULE]:
python_flag = True
if f"{config.ACI_FIELD_TEMPLATE_SPECIAL_ENV_VAR_REGEX_NAME}=.*" == value[config.POLICY_FIELD_CONTAINERS_ELEMENTS_ENVS_RULE]:
thim_flag = True
self.assertTrue(python_flag)
self.assertTrue(thim_flag)



class PolicyGeneratingArmContainerConfig(unittest.TestCase):
Expand Down