Skip to content
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

Ignore null template key values #679

Closed
wants to merge 3 commits into from
Closed
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
2 changes: 1 addition & 1 deletion src/_base/_twig/docker-compose.yml/service/nginx.yml.twig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% set syncvolume = true %}
{% endif %}
{% set hostnames = [@('hostname')] %}
{% set hostnames = hostnames|merge(@('hostname_aliases')|map(alias => "#{alias}." ~ @('domain'))) %}
{% set hostnames = hostnames|merge(@('hostname_aliases')| filter(v => v is not empty) | map(alias => "#{alias}." ~ @('domain'))) %}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just this bit now that is what we want to keep after @Chemaclass's PRs now merged

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

although should also be done for varnish. I'll create a PR

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#689, I've instead done at the source


nginx:
build: .my127ws/docker/image/nginx
Expand Down
3 changes: 3 additions & 0 deletions src/_base/harness/config/functions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,9 @@ function('template_key_value', [template, key_value]): |
#!php
$output = [];
foreach ($key_value as $key => $value) {
if ($value === null) {
continue;
}
Comment on lines +258 to +260
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already done: #686

$output[str_replace('{{key}}', $key, $template)] = $value;
}
= $output;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{% for store_code, glue_external_host in @('glue.external_hosts') %}
{% if glue_external_host is not empty %}
server {
listen 80;
listen 443 ssl http2;
Expand Down Expand Up @@ -50,4 +51,5 @@ server {
fastcgi_param APPLICATION_STORE {{ store_code }};
}
}
{% endif %}
{% endfor %}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{% for store_code, yves_external_host in @('yves.external_hosts') %}
{% if yves_external_host is not empty %}
server {
listen 80;
listen 443 ssl http2;
Expand Down Expand Up @@ -62,4 +63,5 @@ server {
fastcgi_param APPLICATION_STORE {{ store_code }};
}
}
{% endif %}
{% endfor %}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{% for store_code, zed_external_host in @('zed.external_hosts') %}
{% if zed_external_host is not empty %}
server {
listen 80;
listen 443 ssl http2;
Expand Down Expand Up @@ -85,4 +86,5 @@ server {
fastcgi_param APPLICATION_STORE {{ store_code }};
}
}
{% endif %}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

misses zed api further down, however there's another PR for that #685

{% endfor %}