From c0b92c4e96e54cf60156865a6c2e0a6fe044556f Mon Sep 17 00:00:00 2001 From: Bryant Biggs Date: Thu, 22 May 2025 14:34:46 -0500 Subject: [PATCH] chore: Update protobuf definitions using latest containerd version v2.1.1 --- .github/workflows/ci.yml | 4 ++-- .../containerd/api/events/content.proto | 5 +++++ .../api/services/images/v1/images.proto | 2 +- .../containerd/api/types/fieldpath.proto | 4 ++-- .../api/types/transfer/registry.proto | 17 +++++++++++++++++ .../containerd/api/events/content.proto | 5 +++++ .../api/types/transfer/registry.proto | 17 +++++++++++++++++ scripts/update-vendor.sh | 2 +- 8 files changed, 50 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 31c4eda..a1b6483 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -128,8 +128,8 @@ jobs: strategy: matrix: - os: [ubuntu-22.04] - containerd: [v1.6.38, v1.7.27, v2.0.5] + os: [ubuntu-latest] + containerd: [v1.6.38, v1.7.27, v2.1.1] steps: - name: Checkout extensions diff --git a/crates/client/vendor/github.com/containerd/containerd/api/events/content.proto b/crates/client/vendor/github.com/containerd/containerd/api/events/content.proto index 6b023d6..58bd915 100644 --- a/crates/client/vendor/github.com/containerd/containerd/api/events/content.proto +++ b/crates/client/vendor/github.com/containerd/containerd/api/events/content.proto @@ -23,6 +23,11 @@ import "github.com/containerd/containerd/api/types/fieldpath.proto"; option go_package = "github.com/containerd/containerd/api/events;events"; option (containerd.types.fieldpath_all) = true; +message ContentCreate { + string digest = 1; + int64 size = 2; +} + message ContentDelete { string digest = 1; } diff --git a/crates/client/vendor/github.com/containerd/containerd/api/services/images/v1/images.proto b/crates/client/vendor/github.com/containerd/containerd/api/services/images/v1/images.proto index 97862c4..2f47ab2 100644 --- a/crates/client/vendor/github.com/containerd/containerd/api/services/images/v1/images.proto +++ b/crates/client/vendor/github.com/containerd/containerd/api/services/images/v1/images.proto @@ -145,5 +145,5 @@ message DeleteImageRequest { // // If image descriptor does not match the same digest, // the delete operation will return "not found" error. - containerd.types.Descriptor target = 3; + optional containerd.types.Descriptor target = 3; } diff --git a/crates/client/vendor/github.com/containerd/containerd/api/types/fieldpath.proto b/crates/client/vendor/github.com/containerd/containerd/api/types/fieldpath.proto index 01ff106..8b29084 100644 --- a/crates/client/vendor/github.com/containerd/containerd/api/types/fieldpath.proto +++ b/crates/client/vendor/github.com/containerd/containerd/api/types/fieldpath.proto @@ -34,9 +34,9 @@ import "google/protobuf/descriptor.proto"; option go_package = "github.com/containerd/containerd/api/types;types"; extend google.protobuf.FileOptions { - bool fieldpath_all = 63300; + optional bool fieldpath_all = 63300; } extend google.protobuf.MessageOptions { - bool fieldpath = 64400; + optional bool fieldpath = 64400; } diff --git a/crates/client/vendor/github.com/containerd/containerd/api/types/transfer/registry.proto b/crates/client/vendor/github.com/containerd/containerd/api/types/transfer/registry.proto index 3331ecb..88248fd 100644 --- a/crates/client/vendor/github.com/containerd/containerd/api/types/transfer/registry.proto +++ b/crates/client/vendor/github.com/containerd/containerd/api/types/transfer/registry.proto @@ -27,6 +27,16 @@ message OCIRegistry { RegistryResolver resolver = 2; } +enum HTTPDebug { + DISABLED = 0; + // Enable HTTP debugging + DEBUG = 1; + // Enable HTTP requests tracing + TRACE = 2; + // Enable both HTTP debugging and requests tracing + BOTH = 3; +} + message RegistryResolver { // auth_stream is used to refer to a stream which auth callbacks may be // made on. @@ -40,6 +50,13 @@ message RegistryResolver { string default_scheme = 4; // Force skip verify // CA callback? Client TLS callback? + + // Whether to debug/trace HTTP requests to OCI registry. + HTTPDebug http_debug = 5; + + // Stream ID to use for HTTP logs (when logs are streamed to client). + // When empty, logs are written to containerd logs. + string logs_stream = 6; } // AuthRequest is sent as a callback on a stream diff --git a/crates/client/vendor/github.com/containerd/containerd/vendor/github.com/containerd/containerd/api/events/content.proto b/crates/client/vendor/github.com/containerd/containerd/vendor/github.com/containerd/containerd/api/events/content.proto index 6b023d6..58bd915 100644 --- a/crates/client/vendor/github.com/containerd/containerd/vendor/github.com/containerd/containerd/api/events/content.proto +++ b/crates/client/vendor/github.com/containerd/containerd/vendor/github.com/containerd/containerd/api/events/content.proto @@ -23,6 +23,11 @@ import "github.com/containerd/containerd/api/types/fieldpath.proto"; option go_package = "github.com/containerd/containerd/api/events;events"; option (containerd.types.fieldpath_all) = true; +message ContentCreate { + string digest = 1; + int64 size = 2; +} + message ContentDelete { string digest = 1; } diff --git a/crates/client/vendor/github.com/containerd/containerd/vendor/github.com/containerd/containerd/api/types/transfer/registry.proto b/crates/client/vendor/github.com/containerd/containerd/vendor/github.com/containerd/containerd/api/types/transfer/registry.proto index 3331ecb..88248fd 100644 --- a/crates/client/vendor/github.com/containerd/containerd/vendor/github.com/containerd/containerd/api/types/transfer/registry.proto +++ b/crates/client/vendor/github.com/containerd/containerd/vendor/github.com/containerd/containerd/api/types/transfer/registry.proto @@ -27,6 +27,16 @@ message OCIRegistry { RegistryResolver resolver = 2; } +enum HTTPDebug { + DISABLED = 0; + // Enable HTTP debugging + DEBUG = 1; + // Enable HTTP requests tracing + TRACE = 2; + // Enable both HTTP debugging and requests tracing + BOTH = 3; +} + message RegistryResolver { // auth_stream is used to refer to a stream which auth callbacks may be // made on. @@ -40,6 +50,13 @@ message RegistryResolver { string default_scheme = 4; // Force skip verify // CA callback? Client TLS callback? + + // Whether to debug/trace HTTP requests to OCI registry. + HTTPDebug http_debug = 5; + + // Stream ID to use for HTTP logs (when logs are streamed to client). + // When empty, logs are written to containerd logs. + string logs_stream = 6; } // AuthRequest is sent as a callback on a stream diff --git a/scripts/update-vendor.sh b/scripts/update-vendor.sh index 08f41aa..f69c79e 100755 --- a/scripts/update-vendor.sh +++ b/scripts/update-vendor.sh @@ -8,7 +8,7 @@ # For each crate, the script expects a text file named `rsync.txt` in the crate's directory. # The file should contain a list of proto files that should be synchronized from containerd. -VERSION="v2.0.1" +VERSION="v2.1.1" set -x