Skip to content

Commit 4e64473

Browse files
committed
Update warning message
1 parent d86eb01 commit 4e64473

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/pkg/cli/compose/convert.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ func ConvertServices(ctx context.Context, c client.Client, serviceConfigs compos
138138
// Check if the environment variable is an existing config; if so, mark it as such
139139
if _, ok := slices.BinarySearch(config.Names, key); ok {
140140
if serviceNameRegex != nil && serviceNameRegex.MatchString(*value) {
141-
term.Warnf("service %q: The environment variable %q, with the value %q, contains a service name that needs to be normalized. however, it will be replaced by an existing configuration. service names within a configuration will not be normalized.", svccfg.Name, key, *value)
141+
term.Warnf("service %q: environment variable %q needs service name fix-up, but is overridden by config, which will not be fixed up.", svccfg.Name, key)
142142
} else {
143143
term.Warnf("service %q: environment variable %q overridden by config", svccfg.Name, key)
144144
}
@@ -153,9 +153,9 @@ func ConvertServices(ctx context.Context, c client.Client, serviceConfigs compos
153153
return c.ServiceDNS(NormalizeServiceName(serviceName))
154154
})
155155
if val != *value {
156-
term.Warnf("service %q: service names were replaced in environment variable %q: %q", svccfg.Name, key, val)
156+
term.Warnf("service %q: service names were fixed up in environment variable %q: %q", svccfg.Name, key, val)
157157
} else if nonReplaceServiceNameRegex != nil && nonReplaceServiceNameRegex.MatchString(*value) {
158-
term.Warnf("service %q: service names in the environment variable %q (%q) were not replaced. only services with port mode set to host will be replaced.", svccfg.Name, key, val)
158+
term.Warnf("service %q: service names in the environment variable %q were not fixed up, only services with port mode set to host will be fixed up.", svccfg.Name, key)
159159
}
160160
}
161161
envs[key] = val

0 commit comments

Comments
 (0)