Merge pull request #5272 from thaJeztah/sync_test_replaces

fuweid · web-flow · commit ff05d499e29d · 2021-04-06T10:33:35.000+08:00
synchronize replace rules in integration/client go.mod with main go.mod
diff --git a/go.mod b/go.mod
@@ -65,6 +65,7 @@ require (
 	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
 )
 
+// When updating replace rules, make sure to also update the rules in integration/client/go.mod
 replace (
 	github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2
 	github.com/golang/protobuf => github.com/golang/protobuf v1.3.5
diff --git a/integration/client/benchmark_test.go b/integration/client/benchmark_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"fmt"
diff --git a/integration/client/client_test.go b/integration/client/client_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"bytes"
diff --git a/integration/client/client_ttrpc_test.go b/integration/client/client_ttrpc_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"
diff --git a/integration/client/client_unix_test.go b/integration/client/client_unix_test.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"testing"
diff --git a/integration/client/client_windows_test.go b/integration/client/client_windows_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"fmt"
diff --git a/integration/client/container_checkpoint_test.go b/integration/client/container_checkpoint_test.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"bytes"
diff --git a/integration/client/container_linux_test.go b/integration/client/container_linux_test.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"bytes"
diff --git a/integration/client/container_test.go b/integration/client/container_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"bytes"
diff --git a/integration/client/content_test.go b/integration/client/content_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"
diff --git a/integration/client/convert_test.go b/integration/client/convert_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"testing"
diff --git a/integration/client/daemon_config_linux_test.go b/integration/client/daemon_config_linux_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"bufio"
diff --git a/integration/client/daemon_test.go b/integration/client/daemon_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"
diff --git a/integration/client/export_test.go b/integration/client/export_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"archive/tar"
diff --git a/integration/client/go.mod b/integration/client/go.mod
@@ -4,9 +4,10 @@ go 1.15
 
 require (
 	github.com/Microsoft/hcsshim v0.8.15
-	github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3
+	github.com/Microsoft/hcsshim/test v0.0.0-20210326183024-65090e5b3e45
 	github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68
-	github.com/containerd/containerd v1.5.0-beta.3
+	// the actual version of containerd is replaced with the code at the root of this repository
+	github.com/containerd/containerd v1.5.0-beta.4
 	github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0
 	github.com/containerd/ttrpc v1.0.2
 	github.com/containerd/typeurl v1.0.1
@@ -15,9 +16,26 @@ require (
 	github.com/opencontainers/image-spec v1.0.1
 	github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d
 	github.com/pkg/errors v0.9.1
-	github.com/sirupsen/logrus v1.8.0
-	golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c
+	github.com/sirupsen/logrus v1.7.0
+	golang.org/x/sys v0.0.0-20210324051608-47abb6519492
 	gotest.tools/v3 v3.0.3
 )
 
-replace github.com/containerd/containerd => ../../
+replace (
+	// use the containerd module from this repository instead of downloading
+	//
+	// IMPORTANT: this replace rule ONLY replaces containerd itself; dependencies
+	// in the "require" section above are still taken into account for version
+	// resolution if newer.
+	github.com/containerd/containerd => ../../
+
+	// Replace rules below must be kept in sync with the main go.mod file at the
+	// root, because that's the actual version expected by the "containerd/containerd"
+	// dependency above.
+	github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2
+	github.com/golang/protobuf => github.com/golang/protobuf v1.3.5
+	// urfave/cli must be <= v1.22.1 due to a regression: https://github.com/urfave/cli/issues/1092
+	github.com/urfave/cli => github.com/urfave/cli v1.22.1
+	google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63
+	google.golang.org/grpc => google.golang.org/grpc v1.27.1
+)
diff --git a/integration/client/go.sum b/integration/client/go.sum
diff --git a/integration/client/helpers_unix_test.go b/integration/client/helpers_unix_test.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"
diff --git a/integration/client/helpers_windows_test.go b/integration/client/helpers_windows_test.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"
diff --git a/integration/client/image_test.go b/integration/client/image_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"
diff --git a/integration/client/import_test.go b/integration/client/import_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"bytes"
diff --git a/integration/client/lease_test.go b/integration/client/lease_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"runtime"
diff --git a/integration/client/restart_monitor_linux_test.go b/integration/client/restart_monitor_linux_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"
diff --git a/integration/client/signals_test.go b/integration/client/signals_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"fmt"
diff --git a/integration/client/snapshot_test.go b/integration/client/snapshot_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"
diff --git a/integration/client/task_opts_unix_test.go b/integration/client/task_opts_unix_test.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package containerd
+package client
 
 import (
 	"context"

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ require (`
`65`	`65`	`k8s.io/utils v0.0.0-20201110183641-67b214c5f920`
`66`	`66`	`)`
`67`	`67`
	`68`	`+// When updating replace rules, make sure to also update the rules in integration/client/go.mod`
`68`	`69`	`replace (`
`69`	`70`	`github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2`
`70`	`71`	`github.com/golang/protobuf => github.com/golang/protobuf v1.3.5`