From 8489dc43458da43d12ae37bac63753811acf96d9 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Mon, 6 Jul 2020 15:38:20 +0200 Subject: move go module to v2 With the advent of Podman 2.0.0 we crossed the magical barrier of go modules. While we were able to continue importing all packages inside of the project, the project could not be vendored anymore from the outside. Move the go module to new major version and change all imports to `github.com/containers/libpod/v2`. The renaming of the imports was done via `gomove` [1]. [1] https://github.com/KSubedi/gomove Signed-off-by: Valentin Rothberg --- pkg/api/handlers/libpod/containers.go | 12 ++++++------ pkg/api/handlers/libpod/containers_create.go | 10 +++++----- pkg/api/handlers/libpod/copy.go | 2 +- pkg/api/handlers/libpod/generate.go | 8 ++++---- pkg/api/handlers/libpod/healthcheck.go | 6 +++--- pkg/api/handlers/libpod/images.go | 24 ++++++++++++------------ pkg/api/handlers/libpod/info.go | 4 ++-- pkg/api/handlers/libpod/manifests.go | 8 ++++---- pkg/api/handlers/libpod/networks.go | 10 +++++----- pkg/api/handlers/libpod/play.go | 10 +++++----- pkg/api/handlers/libpod/pods.go | 18 +++++++++--------- pkg/api/handlers/libpod/swagger.go | 6 +++--- pkg/api/handlers/libpod/system.go | 10 +++++----- pkg/api/handlers/libpod/volumes.go | 12 ++++++------ 14 files changed, 70 insertions(+), 70 deletions(-) (limited to 'pkg/api/handlers/libpod') diff --git a/pkg/api/handlers/libpod/containers.go b/pkg/api/handlers/libpod/containers.go index 506286736..008bff8c5 100644 --- a/pkg/api/handlers/libpod/containers.go +++ b/pkg/api/handlers/libpod/containers.go @@ -6,12 +6,12 @@ import ( "os" "strconv" - "github.com/containers/libpod/libpod" - "github.com/containers/libpod/libpod/define" - "github.com/containers/libpod/pkg/api/handlers/compat" - "github.com/containers/libpod/pkg/api/handlers/utils" - "github.com/containers/libpod/pkg/domain/entities" - "github.com/containers/libpod/pkg/ps" + "github.com/containers/libpod/v2/libpod" + "github.com/containers/libpod/v2/libpod/define" + "github.com/containers/libpod/v2/pkg/api/handlers/compat" + "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/libpod/v2/pkg/ps" "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 8fbff9be7..2d9ffecce 100644 --- a/pkg/api/handlers/libpod/containers_create.go +++ b/pkg/api/handlers/libpod/containers_create.go @@ -5,11 +5,11 @@ import ( "encoding/json" "net/http" - "github.com/containers/libpod/libpod" - "github.com/containers/libpod/pkg/api/handlers/utils" - "github.com/containers/libpod/pkg/domain/entities" - "github.com/containers/libpod/pkg/specgen" - "github.com/containers/libpod/pkg/specgen/generate" + "github.com/containers/libpod/v2/libpod" + "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/libpod/v2/pkg/specgen" + "github.com/containers/libpod/v2/pkg/specgen/generate" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/libpod/copy.go b/pkg/api/handlers/libpod/copy.go index a3b404bce..045d87576 100644 --- a/pkg/api/handlers/libpod/copy.go +++ b/pkg/api/handlers/libpod/copy.go @@ -3,7 +3,7 @@ package libpod import ( "net/http" - "github.com/containers/libpod/pkg/api/handlers/utils" + "github.com/containers/libpod/v2/pkg/api/handlers/utils" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/libpod/generate.go b/pkg/api/handlers/libpod/generate.go index 23320d346..63dfcbf90 100644 --- a/pkg/api/handlers/libpod/generate.go +++ b/pkg/api/handlers/libpod/generate.go @@ -3,10 +3,10 @@ package libpod import ( "net/http" - "github.com/containers/libpod/libpod" - "github.com/containers/libpod/pkg/api/handlers/utils" - "github.com/containers/libpod/pkg/domain/entities" - "github.com/containers/libpod/pkg/domain/infra/abi" + "github.com/containers/libpod/v2/libpod" + "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/libpod/v2/pkg/domain/infra/abi" "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 0ca3574b7..93fd68403 100644 --- a/pkg/api/handlers/libpod/healthcheck.go +++ b/pkg/api/handlers/libpod/healthcheck.go @@ -3,9 +3,9 @@ package libpod import ( "net/http" - "github.com/containers/libpod/libpod" - "github.com/containers/libpod/libpod/define" - "github.com/containers/libpod/pkg/api/handlers/utils" + "github.com/containers/libpod/v2/libpod" + "github.com/containers/libpod/v2/libpod/define" + "github.com/containers/libpod/v2/pkg/api/handlers/utils" ) 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 ebcb1f460..b21c3b8f7 100644 --- a/pkg/api/handlers/libpod/images.go +++ b/pkg/api/handlers/libpod/images.go @@ -15,18 +15,18 @@ import ( "github.com/containers/image/v5/docker/reference" "github.com/containers/image/v5/manifest" "github.com/containers/image/v5/types" - "github.com/containers/libpod/libpod" - "github.com/containers/libpod/libpod/define" - "github.com/containers/libpod/libpod/image" - image2 "github.com/containers/libpod/libpod/image" - "github.com/containers/libpod/pkg/api/handlers" - "github.com/containers/libpod/pkg/api/handlers/utils" - "github.com/containers/libpod/pkg/auth" - "github.com/containers/libpod/pkg/domain/entities" - "github.com/containers/libpod/pkg/domain/infra/abi" - "github.com/containers/libpod/pkg/errorhandling" - "github.com/containers/libpod/pkg/util" - utils2 "github.com/containers/libpod/utils" + "github.com/containers/libpod/v2/libpod" + "github.com/containers/libpod/v2/libpod/define" + "github.com/containers/libpod/v2/libpod/image" + image2 "github.com/containers/libpod/v2/libpod/image" + "github.com/containers/libpod/v2/pkg/api/handlers" + "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/libpod/v2/pkg/auth" + "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/libpod/v2/pkg/domain/infra/abi" + "github.com/containers/libpod/v2/pkg/errorhandling" + "github.com/containers/libpod/v2/pkg/util" + utils2 "github.com/containers/libpod/v2/utils" "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 cbf03aa17..9cdc08597 100644 --- a/pkg/api/handlers/libpod/info.go +++ b/pkg/api/handlers/libpod/info.go @@ -3,8 +3,8 @@ package libpod import ( "net/http" - "github.com/containers/libpod/libpod" - "github.com/containers/libpod/pkg/api/handlers/utils" + "github.com/containers/libpod/v2/libpod" + "github.com/containers/libpod/v2/pkg/api/handlers/utils" ) 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 aef92368b..24769b316 100644 --- a/pkg/api/handlers/libpod/manifests.go +++ b/pkg/api/handlers/libpod/manifests.go @@ -7,10 +7,10 @@ import ( "github.com/containers/buildah/manifests" copy2 "github.com/containers/image/v5/copy" "github.com/containers/image/v5/transports/alltransports" - "github.com/containers/libpod/libpod" - "github.com/containers/libpod/libpod/image" - "github.com/containers/libpod/pkg/api/handlers" - "github.com/containers/libpod/pkg/api/handlers/utils" + "github.com/containers/libpod/v2/libpod" + "github.com/containers/libpod/v2/libpod/image" + "github.com/containers/libpod/v2/pkg/api/handlers" + "github.com/containers/libpod/v2/pkg/api/handlers/utils" "github.com/gorilla/schema" "github.com/opencontainers/go-digest" "github.com/pkg/errors" diff --git a/pkg/api/handlers/libpod/networks.go b/pkg/api/handlers/libpod/networks.go index 7de285e5e..12409bf50 100644 --- a/pkg/api/handlers/libpod/networks.go +++ b/pkg/api/handlers/libpod/networks.go @@ -4,11 +4,11 @@ import ( "encoding/json" "net/http" - "github.com/containers/libpod/libpod" - "github.com/containers/libpod/pkg/api/handlers/utils" - "github.com/containers/libpod/pkg/domain/entities" - "github.com/containers/libpod/pkg/domain/infra/abi" - "github.com/containers/libpod/pkg/network" + "github.com/containers/libpod/v2/libpod" + "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/libpod/v2/pkg/domain/infra/abi" + "github.com/containers/libpod/v2/pkg/network" "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 1cb5cdb6c..fcb56b130 100644 --- a/pkg/api/handlers/libpod/play.go +++ b/pkg/api/handlers/libpod/play.go @@ -7,11 +7,11 @@ import ( "os" "github.com/containers/image/v5/types" - "github.com/containers/libpod/libpod" - "github.com/containers/libpod/pkg/api/handlers/utils" - "github.com/containers/libpod/pkg/auth" - "github.com/containers/libpod/pkg/domain/entities" - "github.com/containers/libpod/pkg/domain/infra/abi" + "github.com/containers/libpod/v2/libpod" + "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/libpod/v2/pkg/auth" + "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/libpod/v2/pkg/domain/infra/abi" "github.com/gorilla/schema" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go index 4b57ef26a..dee5a7d33 100644 --- a/pkg/api/handlers/libpod/pods.go +++ b/pkg/api/handlers/libpod/pods.go @@ -6,15 +6,15 @@ import ( "net/http" "strings" - "github.com/containers/libpod/libpod" - "github.com/containers/libpod/libpod/define" - "github.com/containers/libpod/pkg/api/handlers" - "github.com/containers/libpod/pkg/api/handlers/utils" - "github.com/containers/libpod/pkg/domain/entities" - "github.com/containers/libpod/pkg/domain/infra/abi" - "github.com/containers/libpod/pkg/specgen" - "github.com/containers/libpod/pkg/specgen/generate" - "github.com/containers/libpod/pkg/util" + "github.com/containers/libpod/v2/libpod" + "github.com/containers/libpod/v2/libpod/define" + "github.com/containers/libpod/v2/pkg/api/handlers" + "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/libpod/v2/pkg/domain/infra/abi" + "github.com/containers/libpod/v2/pkg/specgen" + "github.com/containers/libpod/v2/pkg/specgen/generate" + "github.com/containers/libpod/v2/pkg/util" "github.com/gorilla/schema" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/api/handlers/libpod/swagger.go b/pkg/api/handlers/libpod/swagger.go index 057fbfb41..21f5c1e59 100644 --- a/pkg/api/handlers/libpod/swagger.go +++ b/pkg/api/handlers/libpod/swagger.go @@ -5,9 +5,9 @@ import ( "os" "github.com/containers/image/v5/manifest" - "github.com/containers/libpod/libpod/define" - "github.com/containers/libpod/pkg/api/handlers/utils" - "github.com/containers/libpod/pkg/domain/entities" + "github.com/containers/libpod/v2/libpod/define" + "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/libpod/v2/pkg/domain/entities" "github.com/pkg/errors" ) diff --git a/pkg/api/handlers/libpod/system.go b/pkg/api/handlers/libpod/system.go index 52d3b91ab..c09480bd1 100644 --- a/pkg/api/handlers/libpod/system.go +++ b/pkg/api/handlers/libpod/system.go @@ -3,11 +3,11 @@ package libpod import ( "net/http" - "github.com/containers/libpod/libpod" - "github.com/containers/libpod/pkg/api/handlers/compat" - "github.com/containers/libpod/pkg/api/handlers/utils" - "github.com/containers/libpod/pkg/domain/entities" - "github.com/containers/libpod/pkg/domain/infra/abi" + "github.com/containers/libpod/v2/libpod" + "github.com/containers/libpod/v2/pkg/api/handlers/compat" + "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/libpod/v2/pkg/domain/infra/abi" "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 6523244f3..0d83218e3 100644 --- a/pkg/api/handlers/libpod/volumes.go +++ b/pkg/api/handlers/libpod/volumes.go @@ -4,12 +4,12 @@ import ( "encoding/json" "net/http" - "github.com/containers/libpod/libpod" - "github.com/containers/libpod/libpod/define" - "github.com/containers/libpod/pkg/api/handlers/utils" - "github.com/containers/libpod/pkg/domain/entities" - "github.com/containers/libpod/pkg/domain/filters" - "github.com/containers/libpod/pkg/domain/infra/abi/parse" + "github.com/containers/libpod/v2/libpod" + "github.com/containers/libpod/v2/libpod/define" + "github.com/containers/libpod/v2/pkg/api/handlers/utils" + "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/libpod/v2/pkg/domain/filters" + "github.com/containers/libpod/v2/pkg/domain/infra/abi/parse" "github.com/gorilla/schema" "github.com/pkg/errors" ) -- cgit v1.2.3-54-g00ecf