fix compilation error

update containerd typeurl

Signed-off-by: Rui Yang <ruiya@vmware.com>

go.mod

@@ -20,10 +20,11 @@ require (
 	github.com/concourse/dex v1.6.0
 	github.com/concourse/flag v1.1.0
 	github.com/concourse/go-archive v1.0.1
-	github.com/concourse/retryhttp v1.2.0
+	github.com/concourse/retryhttp v1.1.1
 	github.com/containerd/containerd v1.7.0
 	github.com/containerd/go-cni v1.1.9
 	github.com/containerd/typeurl v1.0.2
+	github.com/containerd/typeurl/v2 v2.1.0
 	github.com/coreos/go-iptables v0.6.0
 	github.com/cppforlife/go-semi-semantic v0.0.0-20160921010311-576b6af77ae4
 	github.com/cyberark/conjur-api-go v0.11.0
@@ -196,7 +197,6 @@ require (
 
 require (
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
-	code.cloudfoundry.org/lager/v3 v3.0.0 // indirect
 	filippo.io/edwards25519 v1.0.0-rc.1 // indirect
 	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 // indirect
 	github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20221215162035-5330a85ea652 // indirect
@@ -208,7 +208,6 @@ require (
 	github.com/Masterminds/sprig/v3 v3.2.2 // indirect
 	github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
 	github.com/alessio/shellescape v1.4.1 // indirect
-	github.com/containerd/typeurl/v2 v2.1.0 // indirect
 	github.com/coreos/go-oidc/v3 v3.4.0 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.3 // indirect
 	github.com/danieljoos/wincred v1.1.2 // indirect

go.sum

@@ -71,8 +71,6 @@ code.cloudfoundry.org/garden v0.0.0-20220318131934-d57de807d0ca h1:GPt+rCb96uyb2
 code.cloudfoundry.org/garden v0.0.0-20220318131934-d57de807d0ca/go.mod h1:Mg38xaqXA1GOyf9+uRV75imzy1HVj6WrvjcRXEE+SGM=
 code.cloudfoundry.org/lager v2.0.0+incompatible h1:WZwDKDB2PLd/oL+USK4b4aEjUymIej9My2nUQ9oWEwQ=
 code.cloudfoundry.org/lager v2.0.0+incompatible/go.mod h1:O2sS7gKP3HM2iemG+EnwvyNQK7pTSC6Foi4QiMp9sSk=
-code.cloudfoundry.org/lager/v3 v3.0.0 h1:08qGFO5LbugMVCslmmvdR2RqFaUM4Hm96mCgoOGS/4A=
-code.cloudfoundry.org/lager/v3 v3.0.0/go.mod h1:F/mhRcjfCJSSES/yTwB67aJRdRbkwBkgK+yBKzOvPB0=
 code.cloudfoundry.org/localip v0.0.0-20220131190813-865a62baabe7 h1:S+uvaEc3JXIbA+WlmevaJiALf2ZFKaXKCWSHZXdhhJM=
 code.cloudfoundry.org/localip v0.0.0-20220131190813-865a62baabe7/go.mod h1:Eu+N72uCGHvVYzx25F0NbiuWgnCKCalyDnd4Jg0ZQ5o=
 code.cloudfoundry.org/urljoiner v0.0.0-20170223060717-5cabba6c0a50 h1:y+DtLO/eX/9NZjGGHntWs1bNG6uxdql8SqrHzu6VH3Q=
@@ -148,6 +146,7 @@ github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEe
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/cenkalti/backoff/v3 v3.0.0 h1:ske+9nBpD9qZsTBoF41nW5L+AIuFBKMeze18XQ3eG1c=
 github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
+github.com/cenkalti/backoff/v4 v4.1.0/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
 github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+MN3u4=
 github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
@@ -185,8 +184,8 @@ github.com/concourse/flag v1.1.0/go.mod h1:ngs845OZCESOe8vgeK5fsCNIiS0vUSqB8MGQM
 github.com/concourse/go-archive v1.0.0/go.mod h1:Xfo080IPQBmVz3I5ehjCddW3phA2mwv0NFwlpjf5CO8=
 github.com/concourse/go-archive v1.0.1 h1:6jQk0VDiE4G6lNJQ0mLZ7XmxbqI3spO4x0wgVwk4pfo=
 github.com/concourse/go-archive v1.0.1/go.mod h1:Xfo080IPQBmVz3I5ehjCddW3phA2mwv0NFwlpjf5CO8=
-github.com/concourse/retryhttp v1.2.0 h1:Zl+JFlX5gIUgPixgyVMxBQ5hnKP/G2jF3Uwlu2l0k7A=
-github.com/concourse/retryhttp v1.2.0/go.mod h1:7hRDrqZJTTAaDuisPoH1JitGpf5MaqnEpjW4+AwSgLY=
+github.com/concourse/retryhttp v1.1.1 h1:Yc+kJKHupCcAmxW78EZWzC87JN0qjqZfjcdmvsww6Ro=
+github.com/concourse/retryhttp v1.1.1/go.mod h1:QHhy6lQHGmqOKNv0UdoUPYzsTOy9wrf6nHfYsJpow0o=
 github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM=
 github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw=
 github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=

worker/baggageclaim/client/client.go

@@ -35,8 +35,7 @@ type client struct {
 
 	retryBackOffFactory retryhttp.BackOffFactory
 	nestedRoundTripper  http.RoundTripper
-
-	givenHttpClient *http.Client
+	givenHttpClient     *http.Client
 }
 
 func New(apiURL string, nestedRoundTripper http.RoundTripper) Client {
@@ -389,7 +388,7 @@ func (c *client) streamP2pOut(ctx context.Context, srcHandle string, encoding ba
 	var result string
 	buf := make([]byte, 1024)
 	for {
-		len, err := response.Body.Read(buf);
+		len, err := response.Body.Read(buf)
 		if len > 0 {
 			result += strings.TrimSpace(string(buf[:len]))
 		}

worker/runtime/libcontainerd/client.go

@@ -19,7 +19,6 @@ import (
 
 // Client represents the minimum interface used to communicate with containerd
 // to manage containers.
-//
 type Client interface {
 
 	// Init provides the initialization of internal structures necessary by

worker/runtime/libcontainerd/container.go

@@ -8,7 +8,7 @@ import (
 	"github.com/containerd/containerd/cio"
 	"github.com/containerd/containerd/containers"
 	"github.com/containerd/containerd/oci"
-	prototypes "github.com/gogo/protobuf/types"
+	"github.com/containerd/typeurl/v2"
 )
 
 var _ containerd.Container = (*container)(nil)
@@ -64,7 +64,7 @@ func (c *container) SetLabels(ctx context.Context, labels map[string]string) (ma
 
 }
 
-func (c *container) Extensions(ctx context.Context) (map[string]prototypes.Any, error) {
+func (c *container) Extensions(ctx context.Context) (map[string]typeurl.Any, error) {
 	return c.container.Extensions(ctx)
 
 }