From 680df820122509268272935e00ef4ae8468df7d6 Mon Sep 17 00:00:00 2001 From: gVisor bot Date: Wed, 20 Nov 2024 14:49:46 -0800 Subject: [PATCH] Internal change PiperOrigin-RevId: 698529562 --- WORKSPACE | 68 +++++++++++++++++++++++++++++--- pkg/test/dockerutil/BUILD | 1 + pkg/test/dockerutil/container.go | 15 +++---- pkg/test/dockerutil/network.go | 3 +- 4 files changed, 72 insertions(+), 15 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 0f5d277c2c..7d656cf6f7 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -387,6 +387,13 @@ go_repository( version = "v0.0.0-20160727233714-3ac0863d7acf", ) +go_repository( + name = "com_github_distribution_reference", + importpath = "github.com/distribution/reference", + sum = "h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=", + version = "v0.6.0", +) + go_repository( name = "com_github_docopt_docopt_go", importpath = "github.com/docopt/docopt-go", @@ -394,6 +401,13 @@ go_repository( version = "v0.0.0-20180111231733-ee0de3bc6815", ) +go_repository( + name = "com_github_felixge_httpsnoop", + importpath = "github.com/felixge/httpsnoop", + sum = "h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o=", + version = "v1.0.2", +) + go_repository( name = "com_github_frankban_quicktest", importpath = "github.com/frankban/quicktest", @@ -562,6 +576,34 @@ go_repository( version = "v1.3.3", ) +go_repository( + name = "io_opentelemetry_go_contrib_instrumentation_net_http_otelhttp", + importpath = "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp", + sum = "h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA=", + version = "v0.53.0", +) + +go_repository( + name = "io_opentelemetry_go_otel", + importpath = "go.opentelemetry.io/otel", + sum = "h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo=", + version = "v1.28.0", +) + +go_repository( + name = "io_opentelemetry_go_otel_metric", + importpath = "go.opentelemetry.io/otel/metric", + sum = "h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q=", + version = "v1.28.0", +) + +go_repository( + name = "io_opentelemetry_go_otel_trace", + importpath = "go.opentelemetry.io/otel/trace", + sum = "h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g=", + version = "v1.28.0", +) + go_repository( name = "org_uber_go_zap", importpath = "go.uber.org/zap", @@ -2575,18 +2617,25 @@ go_repository( version = "v1.5.3", ) +go_repository( + name = "com_github_moby_docker_image_spec", + importpath = "github.com/moby/docker-image-spec", + sum = "h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=", + version = "v1.3.1", +) + go_repository( name = "com_github_moby_moby", importpath = "github.com/moby/moby", - sum = "h1:uUbydai/Y9J7Ybt+lFI3zBdnsMYXnXE9vEcfZDoEE8Q=", - version = "v24.0.5+incompatible", + sum = "h1:AhSu/R7C5uiyd+JCts3kxrKyTzXa3FilBJ0KCLUHXqA=", + version = "v27.3.0+incompatible", ) go_repository( name = "com_github_docker_docker", importpath = "github.com/docker/docker", - sum = "h1:WmgcE4fxyI6EEXxBRxsHnZXrO1pQ3smi0k/jho4HLeY=", - version = "v24.0.5+incompatible", + sum = "h1:BNb1QY6o4JdKpqwi9IB+HUYcRRrVN4aGFUTvDmWYK1A=", + version = "v27.3.0+incompatible", ) go_repository( @@ -3177,8 +3226,15 @@ go_repository( go_repository( name = "com_github_go_logr_logr", importpath = "github.com/go-logr/logr", - sum = "h1:QK40JKJyMdUDz+h+xvCsru/bJhvG0UxvePV0ufL/AcE=", - version = "v1.2.0", + sum = "h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=", + version = "v1.4.2", +) + +go_repository( + name = "com_github_go_logr_stdr", + importpath = "github.com/go-logr/stdr", + sum = "h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=", + version = "v1.2.2", ) go_repository( diff --git a/pkg/test/dockerutil/BUILD b/pkg/test/dockerutil/BUILD index 4ed00ce93b..894e7d97a3 100644 --- a/pkg/test/dockerutil/BUILD +++ b/pkg/test/dockerutil/BUILD @@ -37,6 +37,7 @@ go_library( "//pkg/test/testutil", "//runsc/cgroup", "@com_github_docker_docker//api/types:go_default_library", + "@com_github_docker_docker//api/types/checkpoint:go_default_library", "@com_github_docker_docker//api/types/container:go_default_library", "@com_github_docker_docker//api/types/mount:go_default_library", "@com_github_docker_docker//api/types/network:go_default_library", diff --git a/pkg/test/dockerutil/container.go b/pkg/test/dockerutil/container.go index 3b20e7524d..f6975150a3 100644 --- a/pkg/test/dockerutil/container.go +++ b/pkg/test/dockerutil/container.go @@ -31,6 +31,7 @@ import ( "time" "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/checkpoint" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/mount" "github.com/docker/docker/api/types/network" @@ -199,7 +200,7 @@ func (c *Container) SpawnProcess(ctx context.Context, r RunOpts, args ...string) // Open a connection to the container for parsing logs and for TTY. stream, err := c.client.ContainerAttach(ctx, c.id, - types.ContainerAttachOptions{ + container.AttachOptions{ Stream: true, Stdin: true, Stdout: true, @@ -371,7 +372,7 @@ func (c *Container) hostConfig(r RunOpts) *container.HostConfig { // Start is analogous to 'docker start'. func (c *Container) Start(ctx context.Context) error { - if err := c.client.ContainerStart(ctx, c.id, types.ContainerStartOptions{}); err != nil { + if err := c.client.ContainerStart(ctx, c.id, container.StartOptions{}); err != nil { return fmt.Errorf("ContainerStart failed: %v", err) } @@ -401,17 +402,17 @@ func (c *Container) Unpause(ctx context.Context) error { // Checkpoint is analogous to 'docker checkpoint'. func (c *Container) Checkpoint(ctx context.Context, name string) error { - return c.client.CheckpointCreate(ctx, c.Name, types.CheckpointCreateOptions{CheckpointID: name, Exit: true}) + return c.client.CheckpointCreate(ctx, c.Name, checkpoint.CreateOptions{CheckpointID: name, Exit: true}) } // Restore is analogous to 'docker start --checkpoint [name]'. func (c *Container) Restore(ctx context.Context, name string) error { - return c.client.ContainerStart(ctx, c.id, types.ContainerStartOptions{CheckpointID: name}) + return c.client.ContainerStart(ctx, c.id, container.StartOptions{CheckpointID: name}) } // CheckpointResume is analogous to 'docker checkpoint'. func (c *Container) CheckpointResume(ctx context.Context, name string) error { - return c.client.CheckpointCreate(ctx, c.Name, types.CheckpointCreateOptions{CheckpointID: name, Exit: false}) + return c.client.CheckpointCreate(ctx, c.Name, checkpoint.CreateOptions{CheckpointID: name, Exit: false}) } // Logs is analogous 'docker logs'. @@ -430,7 +431,7 @@ func (c *Container) OutputStreams(ctx context.Context) (string, string, error) { } func (c *Container) logs(ctx context.Context, stdout, stderr *bytes.Buffer) error { - opts := types.ContainerLogsOptions{ShowStdout: true, ShowStderr: true} + opts := container.LogsOptions{ShowStdout: true, ShowStderr: true} writer, err := c.client.ContainerLogs(ctx, c.id, opts) if err != nil { return err @@ -663,7 +664,7 @@ func (c *Container) Kill(ctx context.Context) error { // Remove is analogous to 'docker rm'. func (c *Container) Remove(ctx context.Context) error { // Remove the image. - remove := types.ContainerRemoveOptions{ + remove := container.RemoveOptions{ RemoveVolumes: c.mounts != nil, RemoveLinks: c.links != nil, Force: true, diff --git a/pkg/test/dockerutil/network.go b/pkg/test/dockerutil/network.go index d730b601bf..1923161189 100644 --- a/pkg/test/dockerutil/network.go +++ b/pkg/test/dockerutil/network.go @@ -65,8 +65,7 @@ func (n *Network) networkCreate() types.NetworkCreate { } return types.NetworkCreate{ - CheckDuplicate: true, - IPAM: &ipam, + IPAM: &ipam, } }