diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-10-06 18:34:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-06 18:34:47 +0200 |
| commit | eb85012064804a5d6c027b77bf434970a6a141f9 (patch) | |
| tree | 0cb08d281efae1442fe03d60df870124b6eb60c1 | |
| parent | 13a1c55d3f0d0cb9a34e865844278e935337cd1b (diff) | |
| parent | d4f622da7d81a9e92fc6c67fa5eec3c8e3172b93 (diff) | |
| download | podman-eb85012064804a5d6c027b77bf434970a6a141f9.tar.gz podman-eb85012064804a5d6c027b77bf434970a6a141f9.tar.bz2 podman-eb85012064804a5d6c027b77bf434970a6a141f9.zip | |
Merge pull request #16070 from boaz0/fix_system_service_uri
Return error in podman system service if URI scheme is not unix/tcp
| -rw-r--r-- | cmd/podman/system/service_abi.go | 2 | ||||
| -rw-r--r-- | test/system/251-system-service.bats | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/cmd/podman/system/service_abi.go b/cmd/podman/system/service_abi.go index 68ac8902b..82419ff1a 100644 --- a/cmd/podman/system/service_abi.go +++ b/cmd/podman/system/service_abi.go @@ -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()) } diff --git a/test/system/251-system-service.bats b/test/system/251-system-service.bats index 197d1cb18..3af42b455 100644 --- a/test/system/251-system-service.bats +++ b/test/system/251-system-service.bats @@ -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" |