From 4bb43b898d72cb938d317055e4ade2771cfc9c54 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 9 Jun 2020 16:47:30 -0400 Subject: Fixup issues found by golint Signed-off-by: Daniel J Walsh --- pkg/api/server/handler_api.go | 6 +++--- pkg/api/server/server.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkg/api/server') diff --git a/pkg/api/server/handler_api.go b/pkg/api/server/handler_api.go index 7a7db12f3..dbdb7f17b 100644 --- a/pkg/api/server/handler_api.go +++ b/pkg/api/server/handler_api.go @@ -34,9 +34,9 @@ func (s *APIServer) APIHandler(h http.HandlerFunc) http.HandlerFunc { } // TODO: Use r.ConnContext when ported to go 1.13 - c := context.WithValue(r.Context(), "decoder", s.Decoder) - c = context.WithValue(c, "runtime", s.Runtime) - c = context.WithValue(c, "shutdownFunc", s.Shutdown) + c := context.WithValue(r.Context(), "decoder", s.Decoder) //nolint + c = context.WithValue(c, "runtime", s.Runtime) //nolint + c = context.WithValue(c, "shutdownFunc", s.Shutdown) //nolint r = r.WithContext(c) h(w, r) diff --git a/pkg/api/server/server.go b/pkg/api/server/server.go index 499a4c58a..bd6a99b96 100644 --- a/pkg/api/server/server.go +++ b/pkg/api/server/server.go @@ -257,7 +257,7 @@ func (t *IdleTracker) ConnState(conn net.Conn, state http.ConnState) { if oldActive == 0 { t.timer.Stop() } - t.total += 1 + t.total++ case http.StateIdle, http.StateClosed: delete(t.active, conn) // Restart the timer if we've become idle -- cgit v1.2.3-54-g00ecf From dee1bf0d2f99389e0906568f5379ff89ef4ea1fe Mon Sep 17 00:00:00 2001 From: TomSweeneyRedHat Date: Wed, 10 Jun 2020 18:28:05 -0400 Subject: [CI:DOCS] Add quick start directions to APIv2 Dock Adds some quick start up directions to the top of the API v2 documentation and a few examples. This strongly leverages comments from @jgallucci32 in #6535. Fixes: #6535 Signed-off-by: TomSweeneyRedHat --- pkg/api/server/docs.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'pkg/api/server') diff --git a/pkg/api/server/docs.go b/pkg/api/server/docs.go index c989c7927..d9e0a7eba 100644 --- a/pkg/api/server/docs.go +++ b/pkg/api/server/docs.go @@ -4,6 +4,24 @@ // only as experimental as this point. The endpoints, parameters, inputs, and // return values can all change. // +// To start the service and keep it running for 5,000 seconds (-t 0 runs forever): +// podman system service -t 5000 & +// +// You can then use cURL on the socket using requests documented below. +// +// NOTE: if you install the package podman-docker, it will create a symbolic +// link for /var/run/docker.sock to /run/podman/podman.sock +// +// See podman-service(1) for more information. +// +// Quick Examples: +// 'podman info' +// curl --unix-socket /run/podman/podman.sock http://d/v1.0.0/libpod/info +// 'podman pull quay.io/containers/podman' +// curl -XPOST --unix-socket /run/podman/podman.sock -v 'http://d/v1.0.0/images/create?fromImage=quay.io%2Fcontainers%2Fpodman' +// 'podman list images' +// curl --unix-socket /run/podman/podman.sock -v 'http://d/v1.0.0/libpod/images/json' | jq +// // Terms Of Service: // // Schemes: http, https -- cgit v1.2.3-54-g00ecf From 05b90a04b27a1dc65535e4f2bf42980dd6593a57 Mon Sep 17 00:00:00 2001 From: TomSweeneyRedHat Date: Thu, 11 Jun 2020 16:02:02 -0400 Subject: [CI:DOCS] Fix carriage returns in API v2 header ReadTheDocs was wrapping lines and removing leading spaces unless there a blank line in between. This adds the blank lines to make the examples more readable on https://docs.podman.io/en/latest/_static/api.html Signed-off-by: TomSweeneyRedHat --- pkg/api/server/docs.go | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'pkg/api/server') diff --git a/pkg/api/server/docs.go b/pkg/api/server/docs.go index d9e0a7eba..124c16092 100644 --- a/pkg/api/server/docs.go +++ b/pkg/api/server/docs.go @@ -5,6 +5,7 @@ // return values can all change. // // To start the service and keep it running for 5,000 seconds (-t 0 runs forever): +// // podman system service -t 5000 & // // You can then use cURL on the socket using requests documented below. @@ -15,11 +16,17 @@ // See podman-service(1) for more information. // // Quick Examples: +// // 'podman info' +// // curl --unix-socket /run/podman/podman.sock http://d/v1.0.0/libpod/info +// // 'podman pull quay.io/containers/podman' +// // curl -XPOST --unix-socket /run/podman/podman.sock -v 'http://d/v1.0.0/images/create?fromImage=quay.io%2Fcontainers%2Fpodman' +// // 'podman list images' +// // curl --unix-socket /run/podman/podman.sock -v 'http://d/v1.0.0/libpod/images/json' | jq // // Terms Of Service: -- cgit v1.2.3-54-g00ecf