refactor: template internal data structure #2405
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Looks good. I'll need some time to try to rebase my fork on top of it. |
pini-gh
reviewed
Feb 26, 2024
Co-authored-by: pini-gh <pini@debian.org>
SchoNie
reviewed
Feb 27, 2024
Co-authored-by: Niek <100143256+SchoNie@users.noreply.github.com>
SchoNie
approved these changes
Mar 1, 2024
|
Yes, please go ahead. Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR refactors the template internals to facilitate #1504
It centralise vhosts and vpaths values precomputation in a single
rangeloop and remove some duplicated code.The data structure stored for now in
$globals.vhostslook like this :{ "foo.bar.com": { "cert": "", "cert_ok": false, "default": false, "hsts": "max-age=31536000", "http2_enabled": true, "http3_enabled": false, "https_method": "redirect", "paths": { "/": { "containers": [{}], "dest": "", "network_tag": "external", "proto": "http", "upstream": "foo.bar.com" } }, "server_tokens": "", "ssl_policy": "", "vhost_root": "/var/www/public" },{ "multipath.bar.com": { "cert": "", "cert_ok": false, "default": false, "hsts": "max-age=31536000", "http2_enabled": true, "http3_enabled":false,
"https_method": "redirect",
"paths": {
"/": {
"containers": [{}],
"dest": "",
"network_tag": "external",
"proto": "http",
"upstream": "multipath.bar.com-somesha"
},
"/anotherpath": {
"containers": [{}],
"dest": "",
"network_tag": "external",
"proto": "http",
"upstream": "multipath.bar.com-anothersha"
}
},
"server_tokens": "",
"ssl_policy": "",
"vhost_root": "/var/www/public"
}
} Prior to this PR, it looked like this:
{ "foo.bar.com": { "cert": "", "cert_ok": false, "containers": [{}], "default": false, "http3": false, "https_method": "redirect", },{ "multipath.bar.com": { "cert": "", "cert_ok": false, "containers": [{}], "default": false, "http3": false, "https_method": "redirect", } }At this point
containerscontains the list of containers objects (as generated by docker-gen) corresponding to each host / path combinations.They look like this:
{ "ID": "68aafce89930f680cb3714f4c1f4348058eb646abf5f69e84065fa7464437fa2", "Created": "2024-02-24T20:40:11.669487339Z", "Addresses": [ { "IP": "172.17.0.3", "IP6LinkLocal": "", "IP6Global": "", "Port": "80", "HostPort": "", "Proto": "tcp", "HostIP": "" } ], "Networks": [ { "IP": "172.17.0.3", "Name": "bridge", "Gateway": "172.17.0.1", "EndpointID": "20fdad73206d1b67ec068597c892515f3ec6af1f731d966e45a0db8c8ad50ba6", "IPv6Gateway": "", "GlobalIPv6Address": "", "MacAddress": "02:42:ac:11:00:03", "GlobalIPv6PrefixLen": 0, "IPPrefixLen": 16, "Internal": false } ], "Gateway": "172.17.0.1", "Name": "wonderful_ardinghelli", "Hostname": "68aafce89930", "NetworkMode": "default", "Image": { "Registry": "", "Repository": "nginx", "Tag": "" }, "Env": { "NGINX_VERSION": "1.25.4", "NJS_VERSION": "0.8.3", "PATH": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", "PKG_RELEASE": "1~bookworm", "VIRTUAL_HOST": "foo.bar.com" }, "Volumes": {}, "Node": { "ID": "", "Name": "", "Address": { "IP": "", "IP6LinkLocal": "", "IP6Global": "", "Port": "", "HostPort": "", "Proto": "", "HostIP": "" } }, "Labels": { "maintainer": "NGINX Docker Maintainers <docker-maint@nginx.com>" }, "IP": "172.17.0.3", "IP6LinkLocal": "", "IP6Global": "", "Mounts": null, "State": { "Running": true, "Health": { "Status": "" } } }ping @pini-gh