From bd09b7aa79aee34608e71fd4ba90d157dae828fc Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Tue, 18 Jan 2022 10:14:48 +0100 Subject: bump go module to version 4 Automated for .go files via gomove [1]: `gomove github.com/containers/podman/v3 github.com/containers/podman/v4` Remaining files via vgrep [2]: `vgrep github.com/containers/podman/v3` [1] https://github.com/KSubedi/gomove [2] https://github.com/vrothberg/vgrep Signed-off-by: Valentin Rothberg --- pkg/api/handlers/libpod/containers.go | 16 ++++++++-------- pkg/api/handlers/libpod/containers_create.go | 12 ++++++------ pkg/api/handlers/libpod/containers_stats.go | 12 ++++++------ pkg/api/handlers/libpod/generate.go | 12 ++++++------ pkg/api/handlers/libpod/healthcheck.go | 8 ++++---- pkg/api/handlers/libpod/images.go | 22 +++++++++++----------- pkg/api/handlers/libpod/images_pull.go | 12 ++++++------ pkg/api/handlers/libpod/info.go | 8 ++++---- pkg/api/handlers/libpod/manifests.go | 16 ++++++++-------- pkg/api/handlers/libpod/networks.go | 14 +++++++------- pkg/api/handlers/libpod/play.go | 12 ++++++------ pkg/api/handlers/libpod/pods.go | 22 +++++++++++----------- pkg/api/handlers/libpod/secrets.go | 10 +++++----- pkg/api/handlers/libpod/swagger.go | 6 +++--- pkg/api/handlers/libpod/system.go | 12 ++++++------ pkg/api/handlers/libpod/volumes.go | 20 ++++++++++---------- 16 files changed, 107 insertions(+), 107 deletions(-) (limited to 'pkg/api/handlers/libpod') diff --git a/pkg/api/handlers/libpod/containers.go b/pkg/api/handlers/libpod/containers.go index 21c72bbda..2a0af6976 100644 --- a/pkg/api/handlers/libpod/containers.go +++ b/pkg/api/handlers/libpod/containers.go @@ -7,14 +7,14 @@ import ( "os" "strings" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers/compat" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers/compat" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" + "github.com/containers/podman/v4/pkg/util" "github.com/gorilla/schema" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/api/handlers/libpod/containers_create.go b/pkg/api/handlers/libpod/containers_create.go index d1841769a..d579cc032 100644 --- a/pkg/api/handlers/libpod/containers_create.go +++ b/pkg/api/handlers/libpod/containers_create.go @@ -5,12 +5,12 @@ import ( "encoding/json" "net/http" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/specgen" - "github.com/containers/podman/v3/pkg/specgen/generate" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v4/pkg/specgen/generate" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/libpod/containers_stats.go b/pkg/api/handlers/libpod/containers_stats.go index 016214aa2..d808bf1c0 100644 --- a/pkg/api/handlers/libpod/containers_stats.go +++ b/pkg/api/handlers/libpod/containers_stats.go @@ -5,12 +5,12 @@ import ( "net/http" "github.com/containers/common/pkg/cgroups" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" - "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" + "github.com/containers/podman/v4/pkg/rootless" "github.com/gorilla/schema" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/api/handlers/libpod/generate.go b/pkg/api/handlers/libpod/generate.go index 88fd69d45..aadb5ad52 100644 --- a/pkg/api/handlers/libpod/generate.go +++ b/pkg/api/handlers/libpod/generate.go @@ -3,12 +3,12 @@ package libpod import ( "net/http" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" + "github.com/containers/podman/v4/pkg/util" "github.com/gorilla/schema" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/libpod/healthcheck.go b/pkg/api/handlers/libpod/healthcheck.go index cad4378e5..ba6e81bf1 100644 --- a/pkg/api/handlers/libpod/healthcheck.go +++ b/pkg/api/handlers/libpod/healthcheck.go @@ -3,10 +3,10 @@ package libpod import ( "net/http" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" ) func RunHealthCheck(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go index d3dbf3023..f9aade0ec 100644 --- a/pkg/api/handlers/libpod/images.go +++ b/pkg/api/handlers/libpod/images.go @@ -14,17 +14,17 @@ import ( "github.com/containers/common/libimage" "github.com/containers/image/v5/manifest" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/auth" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" - "github.com/containers/podman/v3/pkg/errorhandling" - "github.com/containers/podman/v3/pkg/util" - utils2 "github.com/containers/podman/v3/utils" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/auth" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" + "github.com/containers/podman/v4/pkg/errorhandling" + "github.com/containers/podman/v4/pkg/util" + utils2 "github.com/containers/podman/v4/utils" "github.com/containers/storage" "github.com/gorilla/schema" "github.com/pkg/errors" diff --git a/pkg/api/handlers/libpod/images_pull.go b/pkg/api/handlers/libpod/images_pull.go index 518e7cc65..945c5947a 100644 --- a/pkg/api/handlers/libpod/images_pull.go +++ b/pkg/api/handlers/libpod/images_pull.go @@ -8,12 +8,12 @@ import ( "github.com/containers/common/libimage" "github.com/containers/common/pkg/config" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/auth" - "github.com/containers/podman/v3/pkg/channel" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/auth" + "github.com/containers/podman/v4/pkg/channel" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/gorilla/schema" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/api/handlers/libpod/info.go b/pkg/api/handlers/libpod/info.go index 67dc8637c..a8c0cf1d8 100644 --- a/pkg/api/handlers/libpod/info.go +++ b/pkg/api/handlers/libpod/info.go @@ -3,10 +3,10 @@ package libpod import ( "net/http" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/infra/abi" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/infra/abi" ) func GetInfo(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/api/handlers/libpod/manifests.go b/pkg/api/handlers/libpod/manifests.go index ef0839d1f..69cf4fe7f 100644 --- a/pkg/api/handlers/libpod/manifests.go +++ b/pkg/api/handlers/libpod/manifests.go @@ -12,14 +12,14 @@ import ( "github.com/containers/image/v5/docker/reference" "github.com/containers/image/v5/manifest" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/auth" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" - "github.com/containers/podman/v3/pkg/errorhandling" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/auth" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" + "github.com/containers/podman/v4/pkg/errorhandling" "github.com/gorilla/mux" "github.com/gorilla/schema" "github.com/opencontainers/go-digest" diff --git a/pkg/api/handlers/libpod/networks.go b/pkg/api/handlers/libpod/networks.go index d140ec07f..aebf601b7 100644 --- a/pkg/api/handlers/libpod/networks.go +++ b/pkg/api/handlers/libpod/networks.go @@ -5,13 +5,13 @@ import ( "net/http" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" + "github.com/containers/podman/v4/pkg/util" "github.com/gorilla/schema" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/libpod/play.go b/pkg/api/handlers/libpod/play.go index 6ef83ad92..0c480dfbf 100644 --- a/pkg/api/handlers/libpod/play.go +++ b/pkg/api/handlers/libpod/play.go @@ -8,12 +8,12 @@ import ( "os" "github.com/containers/image/v5/types" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/auth" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/auth" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" "github.com/gorilla/schema" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go index 43b39060b..4b15c9675 100644 --- a/pkg/api/handlers/libpod/pods.go +++ b/pkg/api/handlers/libpod/pods.go @@ -7,17 +7,17 @@ import ( "strings" "time" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" - "github.com/containers/podman/v3/pkg/specgen" - "github.com/containers/podman/v3/pkg/specgen/generate" - "github.com/containers/podman/v3/pkg/specgenutil" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" + "github.com/containers/podman/v4/pkg/specgen" + "github.com/containers/podman/v4/pkg/specgen/generate" + "github.com/containers/podman/v4/pkg/specgenutil" + "github.com/containers/podman/v4/pkg/util" "github.com/gorilla/schema" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/api/handlers/libpod/secrets.go b/pkg/api/handlers/libpod/secrets.go index 5cdff8387..2523dc139 100644 --- a/pkg/api/handlers/libpod/secrets.go +++ b/pkg/api/handlers/libpod/secrets.go @@ -5,11 +5,11 @@ import ( "net/http" "reflect" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" "github.com/gorilla/schema" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/libpod/swagger.go b/pkg/api/handlers/libpod/swagger.go index db93d7ac6..5f33e6c01 100644 --- a/pkg/api/handlers/libpod/swagger.go +++ b/pkg/api/handlers/libpod/swagger.go @@ -6,9 +6,9 @@ import ( "github.com/containers/common/libnetwork/types" "github.com/containers/image/v5/manifest" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - "github.com/containers/podman/v3/pkg/domain/entities" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + "github.com/containers/podman/v4/pkg/domain/entities" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/libpod/system.go b/pkg/api/handlers/libpod/system.go index b7c60736f..f06d4b8c5 100644 --- a/pkg/api/handlers/libpod/system.go +++ b/pkg/api/handlers/libpod/system.go @@ -3,12 +3,12 @@ package libpod import ( "net/http" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/infra/abi" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/infra/abi" + "github.com/containers/podman/v4/pkg/util" "github.com/gorilla/schema" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/libpod/volumes.go b/pkg/api/handlers/libpod/volumes.go index ffdb30551..29085c06f 100644 --- a/pkg/api/handlers/libpod/volumes.go +++ b/pkg/api/handlers/libpod/volumes.go @@ -5,16 +5,16 @@ import ( "net/http" "net/url" - "github.com/containers/podman/v3/libpod" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/api/handlers/utils" - api "github.com/containers/podman/v3/pkg/api/types" - "github.com/containers/podman/v3/pkg/domain/entities" - "github.com/containers/podman/v3/pkg/domain/entities/reports" - "github.com/containers/podman/v3/pkg/domain/filters" - "github.com/containers/podman/v3/pkg/domain/infra/abi" - "github.com/containers/podman/v3/pkg/domain/infra/abi/parse" - "github.com/containers/podman/v3/pkg/util" + "github.com/containers/podman/v4/libpod" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/api/handlers/utils" + api "github.com/containers/podman/v4/pkg/api/types" + "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/domain/entities/reports" + "github.com/containers/podman/v4/pkg/domain/filters" + "github.com/containers/podman/v4/pkg/domain/infra/abi" + "github.com/containers/podman/v4/pkg/domain/infra/abi/parse" + "github.com/containers/podman/v4/pkg/util" "github.com/gorilla/schema" "github.com/pkg/errors" ) -- cgit v1.2.3-54-g00ecf