Merge pull request #16070 from boaz0/fix_system_service_uri

Return error in podman system service if URI scheme is not unix/tcp
This commit is contained in:
OpenShift Merge Robot
2022-10-06 18:34:47 +02:00
committed by GitHub
2 changed files with 9 additions and 1 deletions

View File

@ -89,7 +89,7 @@ func restService(flags *pflag.FlagSet, cfg *entities.PodmanConfig, opts entities
return fmt.Errorf("unable to create socket %v: %w", host, err)
}
default:
logrus.Debugf("Attempting API Service endpoint scheme %q", uri.Scheme)
return fmt.Errorf("API Service endpoint scheme %q is not supported. Try tcp://%s or unix:/%s", uri.Scheme, opts.URI, opts.URI)
}
libpodRuntime.SetRemoteURI(uri.String())
}

View File

@ -14,6 +14,14 @@ function teardown() {
basic_teardown
}
@test "podman systerm service <bad_scheme_uri> returns error" {
skip_if_remote "podman system service unavailable over remote"
run_podman 125 system service localhost:9292
is "$output" "Error: API Service endpoint scheme \"localhost\" is not supported. Try tcp://localhost:9292 or unix:/localhost:9292"
run_podman 125 system service myunix.sock
is "$output" "Error: API Service endpoint scheme \"\" is not supported. Try tcp://myunix.sock or unix:/myunix.sock"
}
@test "podman-system-service containers survive service stop" {
skip_if_remote "podman system service unavailable over remote"