TyleoDvDelaware3217/GoDoxy
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2025-07-02 05:14:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(docker): wildcard properties not working with FQDN aliases

Browse source
This commit is contained in:
yusing 2025-06-16 21:23:23 +08:00
parent e906b358fa
commit 4189ffa1db
2 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
internal/docker/label.go
View file

@ -59,12 +59,12 @@ func ParseLabels(labels map[string]string, aliases ...string) (LabelMap, gperr.E
func ExpandWildcard(labels map[string]string, aliases ...string) {
// collect all explicit aliases first
aliasSet := make(map[string]struct{}, len(labels))
aliasSet := make(map[string]int, len(labels))
// wildcardLabels holds mapping suffix -> value derived from wildcard label definitions
wildcardLabels := make(map[string]string)
for _, alias := range aliases {
aliasSet[alias] = struct{}{}
for i, alias := range aliases {
aliasSet[alias] = i
}
// iterate over a copy of the keys to safely mutate the map while ranging
@ -89,7 +89,9 @@ func ExpandWildcard(labels map[string]string, aliases ...string) {
continue
}
// explicit alias label – remember the alias
aliasSet[alias] = struct{}{}
if _, ok := aliasSet[alias]; !ok {
aliasSet[alias] = len(aliasSet)
}
}
if len(aliasSet) == 0 || len(wildcardLabels) == 0 {
@ -98,7 +100,11 @@ func ExpandWildcard(labels map[string]string, aliases ...string) {
// expand collected wildcard labels for every alias
for suffix, v := range wildcardLabels {
for alias := range aliasSet {
for alias, i := range aliasSet {
// for FQDN aliases, use numeric index instead of the alias name
if strings.Contains(alias, ".") {
alias = fmt.Sprintf("#%d", i+1)
}
key := fmt.Sprintf("%s.%s.%s", NSProxy, alias, suffix)
if suffix == "" { // this should not happen (root wildcard handled earlier) but keep safe
key = fmt.Sprintf("%s.%s", NSProxy, alias)

14
internal/docker/label_test.go
View file

@ -28,6 +28,20 @@ func TestExpandWildcard(t *testing.T) {
}, labels)
}
func TestExpandWildcardWithFQDNAliases(t *testing.T) {
labels := map[string]string{
"proxy.c.host": "localhost",
"proxy.*.port": "5555",
}
docker.ExpandWildcard(labels, "a.example.com", "b.example.com")
require.Equal(t, map[string]string{
"proxy.#1.port": "5555",
"proxy.#2.port": "5555",
"proxy.c.host": "localhost",
"proxy.c.port": "5555",
}, labels)
}
func TestExpandWildcardYAML(t *testing.T) {
yaml := `
host: localhost