From e34e0a34b9c59586aa705d893fe98f2fbef9f5a4 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 21 Jan 2026 15:23:53 -0800 Subject: [PATCH 1/2] Add support for buf to generate protos Signed-off-by: Derek McGowan --- .github/workflows/ci.yml | 13 +- Makefile | 8 +- api/Protobuild.toml | 30 - api/buf.gen.yaml | 12 + api/buf.lock | 9 + api/buf.yaml | 6 + api/next.pb.txt | 269 ------- api/next.txtpb | 671 ++++++++++++++++++ .../nerdbox}/services/bundle/v1/bundle.proto | 0 .../nerdbox}/services/system/v1/info.proto | 0 .../services/vmevents/v1/events.proto | 2 +- api/services/bundle/v1/bundle.pb.go | 131 ++-- api/services/bundle/v1/bundle_ttrpc.pb.go | 2 +- api/services/system/v1/info.pb.go | 105 ++- api/services/system/v1/info_ttrpc.pb.go | 2 +- api/services/vmevents/v1/events.pb.go | 71 +- api/services/vmevents/v1/events_ttrpc.pb.go | 2 +- script/install-proto-tools | 2 - script/install-protobuf | 71 -- 19 files changed, 865 insertions(+), 541 deletions(-) delete mode 100644 api/Protobuild.toml create mode 100644 api/buf.gen.yaml create mode 100644 api/buf.lock create mode 100644 api/buf.yaml delete mode 100755 api/next.pb.txt create mode 100644 api/next.txtpb rename api/{ => proto/nerdbox}/services/bundle/v1/bundle.proto (100%) rename api/{ => proto/nerdbox}/services/system/v1/info.proto (100%) rename api/{ => proto/nerdbox}/services/vmevents/v1/events.proto (93%) delete mode 100755 script/install-protobuf diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca31c80..b26e33a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,13 +81,14 @@ jobs: echo "GOPATH=${{ github.workspace }}" >> $GITHUB_ENV echo "${{ github.workspace }}/bin" >> $GITHUB_PATH - - name: Install protobuf + - name: Install buf run: | - sudo -E PATH=$PATH script/install-protobuf - sudo chmod +x /usr/local/bin/protoc - sudo chmod og+rx /usr/local/include/google /usr/local/include/google/protobuf /usr/local/include/google/protobuf/compiler - sudo chmod -R og+r /usr/local/include/google/protobuf/ - protoc --version + BIN="/usr/local/bin" && \ + VERSION="1.64.0" && \ + curl -sSL \ + "https://github.com/bufbuild/buf/releases/download/v${VERSION}/buf-$(uname -s)-$(uname -m)" \ + -o "${BIN}/buf" && \ + chmod +x "${BIN}/buf" - run: script/install-proto-tools - run: make proto-fmt diff --git a/Makefile b/Makefile index f875037..7b17978 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,9 @@ generate: protos protos: @echo "$(WHALE) $@" - @(cd ${ROOTDIR}/api && PATH="${ROOTDIR}/bin:${PATH}" protobuild --quiet ${API_PACKAGES}) + @(cd ${ROOTDIR}/api && buf dep update) + @(cd ${ROOTDIR}/api && PATH="${ROOTDIR}/bin:${PATH}" buf generate) + @(cd ${ROOTDIR}/api && buf build --exclude-imports -o next.txtpb) go-fix-acronym -w -a '^Os' $(shell find api/ -name '*.pb.go') go-fix-acronym -w -a '(Id|Io|Uuid|Os)$$' $(shell find api/ -name '*.pb.go') @@ -108,8 +110,8 @@ check-protos: protos ## check if protobufs needs to be generated again check-api-descriptors: protos ## check that protobuf changes aren't present. @echo "$(WHALE) $@" - @test -z "$$(git status --short | grep ".pb.txt" | tee /dev/stderr)" || \ - ((git diff $$(find . -name '*.pb.txt') | cat) && \ + @test -z "$$(git status --short | grep ".txtpb" | tee /dev/stderr)" || \ + ((git diff $$(find . -name '*.txtpb') | cat) && \ (echo "$(ONI) please run 'make protos' when making changes to proto files and check-in the generated descriptor file changes" && false)) proto-fmt: ## check format of proto files diff --git a/api/Protobuild.toml b/api/Protobuild.toml deleted file mode 100644 index 18b0124..0000000 --- a/api/Protobuild.toml +++ /dev/null @@ -1,30 +0,0 @@ -version = "2" -generators = ["go", "go-ttrpc"] - -# Control protoc include paths. Below are usually some good defaults, but feel -# free to try it without them if it works for your project. -[includes] - # Include paths that will be added before all others. Typically, you want to - # treat the root of the project as an include, but this may not be necessary. - before = [] - - # Paths that will be added untouched to the end of the includes. We use - # `/usr/local/include` to pickup the common install location of protobuf. - # This is the default. - after = ["/usr/local/include"] - -# This section maps protobuf imports to Go packages. These will become -# `-M` directives in the call to the go protobuf generator. -[packages] - "google/rpc/status.proto" = "google.golang.org/genproto/googleapis/rpc/status" - -[parameters.go-ttrpc] -prefix = "TTRPC" - -# Aggregrate the API descriptors to lock down API changes. -[[descriptors]] -prefix = "github.com/containerd/nerdbox/api" -target = "next.pb.txt" -ignore_files = [ - "google/protobuf/descriptor.proto", -] diff --git a/api/buf.gen.yaml b/api/buf.gen.yaml new file mode 100644 index 0000000..ad8a968 --- /dev/null +++ b/api/buf.gen.yaml @@ -0,0 +1,12 @@ +version: v2 +plugins: + - remote: buf.build/protocolbuffers/go:v1.28.1 + out: . + opt: + - module=github.com/containerd/nerdbox/api + - Mgoogle/rpc/status.proto=google.golang.org/genproto/googleapis/rpc/status + - local: protoc-gen-go-ttrpc + out: . + opt: + - module=github.com/containerd/nerdbox/api + - prefix=TTRPC diff --git a/api/buf.lock b/api/buf.lock new file mode 100644 index 0000000..7d13045 --- /dev/null +++ b/api/buf.lock @@ -0,0 +1,9 @@ +# Generated by buf. DO NOT EDIT. +version: v2 +deps: + - name: buf.build/containerd/api-dev + commit: f5087db925de43418b7d3653b696e1df + digest: b5:97797fd6f6ab6cdd8f36de346ab539657348f4ff9cb37a5cb0c006447d354c8a46193131048defd4ad18e494fb9481ef23aafd9e9c9b6745d4b2a66f6786caff + - name: buf.build/googleapis/googleapis + commit: 004180b77378443887d3b55cabc00384 + digest: b5:e8f475fe3330f31f5fd86ac689093bcd274e19611a09db91f41d637cb9197881ce89882b94d13a58738e53c91c6e4bae7dc1feba85f590164c975a89e25115dc diff --git a/api/buf.yaml b/api/buf.yaml new file mode 100644 index 0000000..cf8e874 --- /dev/null +++ b/api/buf.yaml @@ -0,0 +1,6 @@ +version: v2 +deps: + - buf.build/googleapis/googleapis + - buf.build/containerd/api-dev +modules: + - path: . diff --git a/api/next.pb.txt b/api/next.pb.txt deleted file mode 100755 index 13ca9cf..0000000 --- a/api/next.pb.txt +++ /dev/null @@ -1,269 +0,0 @@ -file { - name: "github.com/containerd/nerdbox/api/services/bundle/v1/bundle.proto" - package: "containerd.vminitd.services.bundle.v1" - message_type { - name: "CreateRequest" - field { - name: "id" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "id" - } - field { - name: "files" - number: 2 - label: LABEL_REPEATED - type: TYPE_MESSAGE - type_name: ".containerd.vminitd.services.bundle.v1.CreateRequest.FilesEntry" - json_name: "files" - } - nested_type { - name: "FilesEntry" - field { - name: "key" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "key" - } - field { - name: "value" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_BYTES - json_name: "value" - } - options { - map_entry: true - } - } - } - message_type { - name: "CreateResponse" - field { - name: "bundle" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "bundle" - } - } - service { - name: "Bundle" - method { - name: "Create" - input_type: ".containerd.vminitd.services.bundle.v1.CreateRequest" - output_type: ".containerd.vminitd.services.bundle.v1.CreateResponse" - } - } - options { - go_package: "github.com/containerd/nerdbox/api/services/bundle/v1;bundle" - } - syntax: "proto3" -} -file { - name: "google/protobuf/empty.proto" - package: "google.protobuf" - message_type { - name: "Empty" - } - options { - java_package: "com.google.protobuf" - java_outer_classname: "EmptyProto" - java_multiple_files: true - go_package: "google.golang.org/protobuf/types/known/emptypb" - cc_enable_arenas: true - objc_class_prefix: "GPB" - csharp_namespace: "Google.Protobuf.WellKnownTypes" - } - syntax: "proto3" -} -file { - name: "github.com/containerd/nerdbox/api/services/system/v1/info.proto" - package: "containerd.vminitd.services.system.v1" - dependency: "google/protobuf/empty.proto" - message_type { - name: "InfoResponse" - field { - name: "version" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "version" - } - field { - name: "kernel_version" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "kernelVersion" - } - } - service { - name: "System" - method { - name: "Info" - input_type: ".google.protobuf.Empty" - output_type: ".containerd.vminitd.services.system.v1.InfoResponse" - } - } - options { - go_package: "github.com/containerd/nerdbox/api/services/system/v1;system" - } - syntax: "proto3" -} -file { - name: "github.com/containerd/containerd/api/types/fieldpath.proto" - package: "containerd.types" - dependency: "google/protobuf/descriptor.proto" - extension { - name: "fieldpath_all" - extendee: ".google.protobuf.FileOptions" - number: 63300 - label: LABEL_OPTIONAL - type: TYPE_BOOL - json_name: "fieldpathAll" - proto3_optional: true - } - extension { - name: "fieldpath" - extendee: ".google.protobuf.MessageOptions" - number: 64400 - label: LABEL_OPTIONAL - type: TYPE_BOOL - json_name: "fieldpath" - proto3_optional: true - } - options { - go_package: "github.com/containerd/containerd/api/types;types" - } - syntax: "proto3" -} -file { - name: "google/protobuf/any.proto" - package: "google.protobuf" - message_type { - name: "Any" - field { - name: "type_url" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "typeUrl" - } - field { - name: "value" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_BYTES - json_name: "value" - } - } - options { - java_package: "com.google.protobuf" - java_outer_classname: "AnyProto" - java_multiple_files: true - go_package: "google.golang.org/protobuf/types/known/anypb" - objc_class_prefix: "GPB" - csharp_namespace: "Google.Protobuf.WellKnownTypes" - } - syntax: "proto3" -} -file { - name: "google/protobuf/timestamp.proto" - package: "google.protobuf" - message_type { - name: "Timestamp" - field { - name: "seconds" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_INT64 - json_name: "seconds" - } - field { - name: "nanos" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_INT32 - json_name: "nanos" - } - } - options { - java_package: "com.google.protobuf" - java_outer_classname: "TimestampProto" - java_multiple_files: true - go_package: "google.golang.org/protobuf/types/known/timestamppb" - cc_enable_arenas: true - objc_class_prefix: "GPB" - csharp_namespace: "Google.Protobuf.WellKnownTypes" - } - syntax: "proto3" -} -file { - name: "github.com/containerd/containerd/api/types/event.proto" - package: "containerd.types" - dependency: "github.com/containerd/containerd/api/types/fieldpath.proto" - dependency: "google/protobuf/any.proto" - dependency: "google/protobuf/timestamp.proto" - message_type { - name: "Envelope" - field { - name: "timestamp" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_MESSAGE - type_name: ".google.protobuf.Timestamp" - json_name: "timestamp" - } - field { - name: "namespace" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "namespace" - } - field { - name: "topic" - number: 3 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "topic" - } - field { - name: "event" - number: 4 - label: LABEL_OPTIONAL - type: TYPE_MESSAGE - type_name: ".google.protobuf.Any" - json_name: "event" - } - options { - 64400: 1 - } - } - options { - go_package: "github.com/containerd/containerd/api/types;types" - } - syntax: "proto3" -} -file { - name: "github.com/containerd/nerdbox/api/services/vmevents/v1/events.proto" - package: "nerdbox.services.vmevents.v1" - dependency: "github.com/containerd/containerd/api/types/event.proto" - dependency: "google/protobuf/empty.proto" - service { - name: "Events" - method { - name: "Stream" - input_type: ".google.protobuf.Empty" - output_type: ".containerd.types.Envelope" - server_streaming: true - } - } - options { - go_package: "github.com/containerd/nerdbox/api/services/vmevents/v1;vmevents" - } - syntax: "proto3" -} diff --git a/api/next.txtpb b/api/next.txtpb new file mode 100644 index 0000000..f379b10 --- /dev/null +++ b/api/next.txtpb @@ -0,0 +1,671 @@ +file: { + name: "proto/nerdbox/services/bundle/v1/bundle.proto" + package: "containerd.vminitd.services.bundle.v1" + message_type: { + name: "CreateRequest" + field: { + name: "id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "id" + } + field: { + name: "files" + number: 2 + label: LABEL_REPEATED + type: TYPE_MESSAGE + type_name: ".containerd.vminitd.services.bundle.v1.CreateRequest.FilesEntry" + json_name: "files" + } + nested_type: { + name: "FilesEntry" + field: { + name: "key" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "key" + } + field: { + name: "value" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_BYTES + json_name: "value" + } + options: { + map_entry: true + } + } + } + message_type: { + name: "CreateResponse" + field: { + name: "bundle" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "bundle" + } + } + service: { + name: "Bundle" + method: { + name: "Create" + input_type: ".containerd.vminitd.services.bundle.v1.CreateRequest" + output_type: ".containerd.vminitd.services.bundle.v1.CreateResponse" + } + } + options: { + go_package: "github.com/containerd/nerdbox/api/services/bundle/v1;bundle" + } + source_code_info: { + location: { + span: 16 + span: 0 + span: 33 + span: 1 + } + location: { + path: 12 + span: 16 + span: 0 + span: 18 + leading_detached_comments: "\nCopyright The containerd Authors.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n" + } + location: { + path: 2 + span: 18 + span: 0 + span: 46 + } + location: { + path: 8 + span: 20 + span: 0 + span: 82 + } + location: { + path: 8 + path: 11 + span: 20 + span: 0 + span: 82 + } + location: { + path: 6 + path: 0 + span: 22 + span: 0 + span: 24 + span: 1 + } + location: { + path: 6 + path: 0 + path: 1 + span: 22 + span: 8 + span: 14 + } + location: { + path: 6 + path: 0 + path: 2 + path: 0 + span: 23 + span: 8 + span: 59 + } + location: { + path: 6 + path: 0 + path: 2 + path: 0 + path: 1 + span: 23 + span: 12 + span: 18 + } + location: { + path: 6 + path: 0 + path: 2 + path: 0 + path: 2 + span: 23 + span: 19 + span: 32 + } + location: { + path: 6 + path: 0 + path: 2 + path: 0 + path: 3 + span: 23 + span: 43 + span: 57 + } + location: { + path: 4 + path: 0 + span: 26 + span: 0 + span: 29 + span: 1 + } + location: { + path: 4 + path: 0 + path: 1 + span: 26 + span: 8 + span: 21 + } + location: { + path: 4 + path: 0 + path: 2 + path: 0 + span: 27 + span: 8 + span: 22 + } + location: { + path: 4 + path: 0 + path: 2 + path: 0 + path: 5 + span: 27 + span: 8 + span: 14 + } + location: { + path: 4 + path: 0 + path: 2 + path: 0 + path: 1 + span: 27 + span: 15 + span: 17 + } + location: { + path: 4 + path: 0 + path: 2 + path: 0 + path: 3 + span: 27 + span: 20 + span: 21 + } + location: { + path: 4 + path: 0 + path: 2 + path: 1 + span: 28 + span: 8 + span: 37 + } + location: { + path: 4 + path: 0 + path: 2 + path: 1 + path: 6 + span: 28 + span: 8 + span: 26 + } + location: { + path: 4 + path: 0 + path: 2 + path: 1 + path: 1 + span: 28 + span: 27 + span: 32 + } + location: { + path: 4 + path: 0 + path: 2 + path: 1 + path: 3 + span: 28 + span: 35 + span: 36 + } + location: { + path: 4 + path: 1 + span: 31 + span: 0 + span: 33 + span: 1 + } + location: { + path: 4 + path: 1 + path: 1 + span: 31 + span: 8 + span: 22 + } + location: { + path: 4 + path: 1 + path: 2 + path: 0 + span: 32 + span: 8 + span: 26 + } + location: { + path: 4 + path: 1 + path: 2 + path: 0 + path: 5 + span: 32 + span: 8 + span: 14 + } + location: { + path: 4 + path: 1 + path: 2 + path: 0 + path: 1 + span: 32 + span: 15 + span: 21 + } + location: { + path: 4 + path: 1 + path: 2 + path: 0 + path: 3 + span: 32 + span: 24 + span: 25 + } + } + syntax: "proto3" + buf_extension: { + is_import: false + is_syntax_unspecified: false + } +} +file: { + name: "proto/nerdbox/services/system/v1/info.proto" + package: "containerd.vminitd.services.system.v1" + dependency: "google/protobuf/empty.proto" + message_type: { + name: "InfoResponse" + field: { + name: "version" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "version" + } + field: { + name: "kernel_version" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "kernelVersion" + } + } + service: { + name: "System" + method: { + name: "Info" + input_type: ".google.protobuf.Empty" + output_type: ".containerd.vminitd.services.system.v1.InfoResponse" + } + } + options: { + go_package: "github.com/containerd/nerdbox/api/services/system/v1;system" + } + source_code_info: { + location: { + span: 16 + span: 0 + span: 31 + span: 1 + } + location: { + path: 12 + span: 16 + span: 0 + span: 18 + leading_detached_comments: "\nCopyright The containerd Authors.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n" + } + location: { + path: 2 + span: 18 + span: 0 + span: 46 + } + location: { + path: 3 + path: 0 + span: 20 + span: 0 + span: 37 + } + location: { + path: 8 + span: 22 + span: 0 + span: 82 + } + location: { + path: 8 + path: 11 + span: 22 + span: 0 + span: 82 + } + location: { + path: 6 + path: 0 + span: 24 + span: 0 + span: 26 + span: 1 + } + location: { + path: 6 + path: 0 + path: 1 + span: 24 + span: 8 + span: 14 + } + location: { + path: 6 + path: 0 + path: 2 + path: 0 + span: 25 + span: 8 + span: 63 + } + location: { + path: 6 + path: 0 + path: 2 + path: 0 + path: 1 + span: 25 + span: 12 + span: 16 + } + location: { + path: 6 + path: 0 + path: 2 + path: 0 + path: 2 + span: 25 + span: 17 + span: 38 + } + location: { + path: 6 + path: 0 + path: 2 + path: 0 + path: 3 + span: 25 + span: 49 + span: 61 + } + location: { + path: 4 + path: 0 + span: 28 + span: 0 + span: 31 + span: 1 + } + location: { + path: 4 + path: 0 + path: 1 + span: 28 + span: 8 + span: 20 + } + location: { + path: 4 + path: 0 + path: 2 + path: 0 + span: 29 + span: 8 + span: 27 + } + location: { + path: 4 + path: 0 + path: 2 + path: 0 + path: 5 + span: 29 + span: 8 + span: 14 + } + location: { + path: 4 + path: 0 + path: 2 + path: 0 + path: 1 + span: 29 + span: 15 + span: 22 + } + location: { + path: 4 + path: 0 + path: 2 + path: 0 + path: 3 + span: 29 + span: 25 + span: 26 + } + location: { + path: 4 + path: 0 + path: 2 + path: 1 + span: 30 + span: 8 + span: 34 + } + location: { + path: 4 + path: 0 + path: 2 + path: 1 + path: 5 + span: 30 + span: 8 + span: 14 + } + location: { + path: 4 + path: 0 + path: 2 + path: 1 + path: 1 + span: 30 + span: 15 + span: 29 + } + location: { + path: 4 + path: 0 + path: 2 + path: 1 + path: 3 + span: 30 + span: 32 + span: 33 + } + } + syntax: "proto3" + buf_extension: { + is_import: false + is_syntax_unspecified: false + } +} +file: { + name: "proto/nerdbox/services/vmevents/v1/events.proto" + package: "nerdbox.services.vmevents.v1" + dependency: "containerd/types/event.proto" + dependency: "google/protobuf/empty.proto" + service: { + name: "Events" + method: { + name: "Stream" + input_type: ".google.protobuf.Empty" + output_type: ".containerd.types.Envelope" + server_streaming: true + } + } + options: { + go_package: "github.com/containerd/nerdbox/api/services/vmevents/v1;vmevents" + } + source_code_info: { + location: { + span: 16 + span: 0 + span: 28 + span: 1 + } + location: { + path: 12 + span: 16 + span: 0 + span: 18 + leading_detached_comments: "\nCopyright The containerd Authors.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n" + } + location: { + path: 2 + span: 18 + span: 0 + span: 37 + } + location: { + path: 3 + path: 0 + span: 20 + span: 0 + span: 38 + } + location: { + path: 3 + path: 1 + span: 21 + span: 0 + span: 37 + } + location: { + path: 8 + span: 23 + span: 0 + span: 86 + } + location: { + path: 8 + path: 11 + span: 23 + span: 0 + span: 86 + } + location: { + path: 6 + path: 0 + span: 25 + span: 0 + span: 28 + span: 1 + } + location: { + path: 6 + path: 0 + path: 1 + span: 25 + span: 8 + span: 14 + } + location: { + path: 6 + path: 0 + path: 2 + path: 0 + span: 27 + span: 8 + span: 85 + leading_comments: " Stream events\n" + } + location: { + path: 6 + path: 0 + path: 2 + path: 0 + path: 1 + span: 27 + span: 12 + span: 18 + } + location: { + path: 6 + path: 0 + path: 2 + path: 0 + path: 2 + span: 27 + span: 19 + span: 40 + } + location: { + path: 6 + path: 0 + path: 2 + path: 0 + path: 6 + span: 27 + span: 51 + span: 57 + } + location: { + path: 6 + path: 0 + path: 2 + path: 0 + path: 3 + span: 27 + span: 58 + span: 83 + } + } + syntax: "proto3" + buf_extension: { + is_import: false + is_syntax_unspecified: false + } +} diff --git a/api/services/bundle/v1/bundle.proto b/api/proto/nerdbox/services/bundle/v1/bundle.proto similarity index 100% rename from api/services/bundle/v1/bundle.proto rename to api/proto/nerdbox/services/bundle/v1/bundle.proto diff --git a/api/services/system/v1/info.proto b/api/proto/nerdbox/services/system/v1/info.proto similarity index 100% rename from api/services/system/v1/info.proto rename to api/proto/nerdbox/services/system/v1/info.proto diff --git a/api/services/vmevents/v1/events.proto b/api/proto/nerdbox/services/vmevents/v1/events.proto similarity index 93% rename from api/services/vmevents/v1/events.proto rename to api/proto/nerdbox/services/vmevents/v1/events.proto index ac40d70..436c8a1 100644 --- a/api/services/vmevents/v1/events.proto +++ b/api/proto/nerdbox/services/vmevents/v1/events.proto @@ -18,7 +18,7 @@ syntax = "proto3"; package nerdbox.services.vmevents.v1; -import "github.com/containerd/containerd/api/types/event.proto"; +import "containerd/types/event.proto"; import "google/protobuf/empty.proto"; option go_package = "github.com/containerd/nerdbox/api/services/vmevents/v1;vmevents"; diff --git a/api/services/bundle/v1/bundle.pb.go b/api/services/bundle/v1/bundle.pb.go index 949c8b6..41775ab 100644 --- a/api/services/bundle/v1/bundle.pb.go +++ b/api/services/bundle/v1/bundle.pb.go @@ -16,8 +16,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.20.1 -// source: github.com/containerd/nerdbox/api/services/bundle/v1/bundle.proto +// protoc (unknown) +// source: proto/nerdbox/services/bundle/v1/bundle.proto package bundle @@ -47,7 +47,7 @@ type CreateRequest struct { func (x *CreateRequest) Reset() { *x = CreateRequest{} if protoimpl.UnsafeEnabled { - mi := &file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_msgTypes[0] + mi := &file_proto_nerdbox_services_bundle_v1_bundle_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -60,7 +60,7 @@ func (x *CreateRequest) String() string { func (*CreateRequest) ProtoMessage() {} func (x *CreateRequest) ProtoReflect() protoreflect.Message { - mi := &file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_msgTypes[0] + mi := &file_proto_nerdbox_services_bundle_v1_bundle_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -73,7 +73,7 @@ func (x *CreateRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use CreateRequest.ProtoReflect.Descriptor instead. func (*CreateRequest) Descriptor() ([]byte, []int) { - return file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_rawDescGZIP(), []int{0} + return file_proto_nerdbox_services_bundle_v1_bundle_proto_rawDescGZIP(), []int{0} } func (x *CreateRequest) GetID() string { @@ -101,7 +101,7 @@ type CreateResponse struct { func (x *CreateResponse) Reset() { *x = CreateResponse{} if protoimpl.UnsafeEnabled { - mi := &file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_msgTypes[1] + mi := &file_proto_nerdbox_services_bundle_v1_bundle_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -114,7 +114,7 @@ func (x *CreateResponse) String() string { func (*CreateResponse) ProtoMessage() {} func (x *CreateResponse) ProtoReflect() protoreflect.Message { - mi := &file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_msgTypes[1] + mi := &file_proto_nerdbox_services_bundle_v1_bundle_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -127,7 +127,7 @@ func (x *CreateResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use CreateResponse.ProtoReflect.Descriptor instead. func (*CreateResponse) Descriptor() ([]byte, []int) { - return file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_rawDescGZIP(), []int{1} + return file_proto_nerdbox_services_bundle_v1_bundle_proto_rawDescGZIP(), []int{1} } func (x *CreateResponse) GetBundle() string { @@ -137,63 +137,62 @@ func (x *CreateResponse) GetBundle() string { return "" } -var File_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto protoreflect.FileDescriptor - -var file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_rawDesc = []byte{ - 0x0a, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, - 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x6e, 0x65, 0x72, 0x64, 0x62, 0x6f, 0x78, 0x2f, - 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x62, 0x75, 0x6e, - 0x64, 0x6c, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x12, 0x25, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, - 0x76, 0x6d, 0x69, 0x6e, 0x69, 0x74, 0x64, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, - 0x2e, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x22, 0xb0, 0x01, 0x0a, 0x0d, 0x43, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x55, 0x0a, 0x05, - 0x66, 0x69, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3f, 0x2e, 0x63, 0x6f, - 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x76, 0x6d, 0x69, 0x6e, 0x69, 0x74, 0x64, - 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, - 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x66, 0x69, - 0x6c, 0x65, 0x73, 0x1a, 0x38, 0x0a, 0x0a, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x28, 0x0a, - 0x0e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, - 0x16, 0x0a, 0x06, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x06, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x32, 0x7f, 0x0a, 0x06, 0x42, 0x75, 0x6e, 0x64, 0x6c, - 0x65, 0x12, 0x75, 0x0a, 0x06, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x12, 0x34, 0x2e, 0x63, 0x6f, - 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x76, 0x6d, 0x69, 0x6e, 0x69, 0x74, 0x64, - 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, - 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x35, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x76, - 0x6d, 0x69, 0x6e, 0x69, 0x74, 0x64, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, - 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x3d, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, - 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, - 0x64, 0x2f, 0x6e, 0x65, 0x72, 0x64, 0x62, 0x6f, 0x78, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x2f, 0x76, 0x31, - 0x3b, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var File_proto_nerdbox_services_bundle_v1_bundle_proto protoreflect.FileDescriptor + +var file_proto_nerdbox_services_bundle_v1_bundle_proto_rawDesc = []byte{ + 0x0a, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x65, 0x72, 0x64, 0x62, 0x6f, 0x78, 0x2f, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x2f, + 0x76, 0x31, 0x2f, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, + 0x25, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x76, 0x6d, 0x69, 0x6e, + 0x69, 0x74, 0x64, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x62, 0x75, 0x6e, + 0x64, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x22, 0xb0, 0x01, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x55, 0x0a, 0x05, 0x66, 0x69, 0x6c, 0x65, + 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3f, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, + 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x76, 0x6d, 0x69, 0x6e, 0x69, 0x74, 0x64, 0x2e, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x2e, + 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x46, 0x69, + 0x6c, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x1a, + 0x38, 0x0a, 0x0a, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, + 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, + 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x28, 0x0a, 0x0e, 0x43, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x62, + 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x62, 0x75, 0x6e, + 0x64, 0x6c, 0x65, 0x32, 0x7f, 0x0a, 0x06, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x12, 0x75, 0x0a, + 0x06, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x12, 0x34, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, + 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x76, 0x6d, 0x69, 0x6e, 0x69, 0x74, 0x64, 0x2e, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x2e, + 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x35, 0x2e, + 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x76, 0x6d, 0x69, 0x6e, 0x69, + 0x74, 0x64, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x62, 0x75, 0x6e, 0x64, + 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x3d, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x6e, 0x65, + 0x72, 0x64, 0x62, 0x6f, 0x78, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x73, 0x2f, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x62, 0x75, 0x6e, + 0x64, 0x6c, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_rawDescOnce sync.Once - file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_rawDescData = file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_rawDesc + file_proto_nerdbox_services_bundle_v1_bundle_proto_rawDescOnce sync.Once + file_proto_nerdbox_services_bundle_v1_bundle_proto_rawDescData = file_proto_nerdbox_services_bundle_v1_bundle_proto_rawDesc ) -func file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_rawDescGZIP() []byte { - file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_rawDescOnce.Do(func() { - file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_rawDescData = protoimpl.X.CompressGZIP(file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_rawDescData) +func file_proto_nerdbox_services_bundle_v1_bundle_proto_rawDescGZIP() []byte { + file_proto_nerdbox_services_bundle_v1_bundle_proto_rawDescOnce.Do(func() { + file_proto_nerdbox_services_bundle_v1_bundle_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_nerdbox_services_bundle_v1_bundle_proto_rawDescData) }) - return file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_rawDescData + return file_proto_nerdbox_services_bundle_v1_bundle_proto_rawDescData } -var file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_goTypes = []interface{}{ +var file_proto_nerdbox_services_bundle_v1_bundle_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_proto_nerdbox_services_bundle_v1_bundle_proto_goTypes = []interface{}{ (*CreateRequest)(nil), // 0: containerd.vminitd.services.bundle.v1.CreateRequest (*CreateResponse)(nil), // 1: containerd.vminitd.services.bundle.v1.CreateResponse nil, // 2: containerd.vminitd.services.bundle.v1.CreateRequest.FilesEntry } -var file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_depIdxs = []int32{ +var file_proto_nerdbox_services_bundle_v1_bundle_proto_depIdxs = []int32{ 2, // 0: containerd.vminitd.services.bundle.v1.CreateRequest.files:type_name -> containerd.vminitd.services.bundle.v1.CreateRequest.FilesEntry 0, // 1: containerd.vminitd.services.bundle.v1.Bundle.Create:input_type -> containerd.vminitd.services.bundle.v1.CreateRequest 1, // 2: containerd.vminitd.services.bundle.v1.Bundle.Create:output_type -> containerd.vminitd.services.bundle.v1.CreateResponse @@ -204,13 +203,13 @@ var file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_depId 0, // [0:1] is the sub-list for field type_name } -func init() { file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_init() } -func file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_init() { - if File_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto != nil { +func init() { file_proto_nerdbox_services_bundle_v1_bundle_proto_init() } +func file_proto_nerdbox_services_bundle_v1_bundle_proto_init() { + if File_proto_nerdbox_services_bundle_v1_bundle_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_proto_nerdbox_services_bundle_v1_bundle_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CreateRequest); i { case 0: return &v.state @@ -222,7 +221,7 @@ func file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_init return nil } } - file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_proto_nerdbox_services_bundle_v1_bundle_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CreateResponse); i { case 0: return &v.state @@ -239,18 +238,18 @@ func file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_init out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_rawDesc, + RawDescriptor: file_proto_nerdbox_services_bundle_v1_bundle_proto_rawDesc, NumEnums: 0, NumMessages: 3, NumExtensions: 0, NumServices: 1, }, - GoTypes: file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_goTypes, - DependencyIndexes: file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_depIdxs, - MessageInfos: file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_msgTypes, + GoTypes: file_proto_nerdbox_services_bundle_v1_bundle_proto_goTypes, + DependencyIndexes: file_proto_nerdbox_services_bundle_v1_bundle_proto_depIdxs, + MessageInfos: file_proto_nerdbox_services_bundle_v1_bundle_proto_msgTypes, }.Build() - File_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto = out.File - file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_rawDesc = nil - file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_goTypes = nil - file_github_com_containerd_nerdbox_api_services_bundle_v1_bundle_proto_depIdxs = nil + File_proto_nerdbox_services_bundle_v1_bundle_proto = out.File + file_proto_nerdbox_services_bundle_v1_bundle_proto_rawDesc = nil + file_proto_nerdbox_services_bundle_v1_bundle_proto_goTypes = nil + file_proto_nerdbox_services_bundle_v1_bundle_proto_depIdxs = nil } diff --git a/api/services/bundle/v1/bundle_ttrpc.pb.go b/api/services/bundle/v1/bundle_ttrpc.pb.go index 62eeb96..4ffaf36 100644 --- a/api/services/bundle/v1/bundle_ttrpc.pb.go +++ b/api/services/bundle/v1/bundle_ttrpc.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go-ttrpc. DO NOT EDIT. -// source: github.com/containerd/nerdbox/api/services/bundle/v1/bundle.proto +// source: proto/nerdbox/services/bundle/v1/bundle.proto package bundle import ( diff --git a/api/services/system/v1/info.pb.go b/api/services/system/v1/info.pb.go index bcb4f82..e7035ee 100644 --- a/api/services/system/v1/info.pb.go +++ b/api/services/system/v1/info.pb.go @@ -16,8 +16,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.20.1 -// source: github.com/containerd/nerdbox/api/services/system/v1/info.proto +// protoc (unknown) +// source: proto/nerdbox/services/system/v1/info.proto package system @@ -48,7 +48,7 @@ type InfoResponse struct { func (x *InfoResponse) Reset() { *x = InfoResponse{} if protoimpl.UnsafeEnabled { - mi := &file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_msgTypes[0] + mi := &file_proto_nerdbox_services_system_v1_info_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -61,7 +61,7 @@ func (x *InfoResponse) String() string { func (*InfoResponse) ProtoMessage() {} func (x *InfoResponse) ProtoReflect() protoreflect.Message { - mi := &file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_msgTypes[0] + mi := &file_proto_nerdbox_services_system_v1_info_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -74,7 +74,7 @@ func (x *InfoResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use InfoResponse.ProtoReflect.Descriptor instead. func (*InfoResponse) Descriptor() ([]byte, []int) { - return file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_rawDescGZIP(), []int{0} + return file_proto_nerdbox_services_system_v1_info_proto_rawDescGZIP(), []int{0} } func (x *InfoResponse) GetVersion() string { @@ -91,53 +91,52 @@ func (x *InfoResponse) GetKernelVersion() string { return "" } -var File_github_com_containerd_nerdbox_api_services_system_v1_info_proto protoreflect.FileDescriptor - -var file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_rawDesc = []byte{ - 0x0a, 0x3f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, - 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x6e, 0x65, 0x72, 0x64, 0x62, 0x6f, 0x78, 0x2f, - 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x73, 0x79, 0x73, - 0x74, 0x65, 0x6d, 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x12, 0x25, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x76, 0x6d, - 0x69, 0x6e, 0x69, 0x74, 0x64, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x73, - 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x76, 0x31, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, - 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x4f, 0x0a, 0x0c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, - 0x25, 0x0a, 0x0e, 0x6b, 0x65, 0x72, 0x6e, 0x65, 0x6c, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, - 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6b, 0x65, 0x72, 0x6e, 0x65, 0x6c, 0x56, - 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x32, 0x5d, 0x0a, 0x06, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, - 0x12, 0x53, 0x0a, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, - 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, - 0x1a, 0x33, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x76, 0x6d, - 0x69, 0x6e, 0x69, 0x74, 0x64, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x73, - 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x3d, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, - 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x6e, - 0x65, 0x72, 0x64, 0x62, 0x6f, 0x78, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x73, 0x2f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x79, - 0x73, 0x74, 0x65, 0x6d, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var File_proto_nerdbox_services_system_v1_info_proto protoreflect.FileDescriptor + +var file_proto_nerdbox_services_system_v1_info_proto_rawDesc = []byte{ + 0x0a, 0x2b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x65, 0x72, 0x64, 0x62, 0x6f, 0x78, 0x2f, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2f, + 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x25, 0x63, + 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x76, 0x6d, 0x69, 0x6e, 0x69, 0x74, + 0x64, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x73, 0x79, 0x73, 0x74, 0x65, + 0x6d, 0x2e, 0x76, 0x31, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x22, 0x4f, 0x0a, 0x0c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x25, 0x0a, 0x0e, 0x6b, + 0x65, 0x72, 0x6e, 0x65, 0x6c, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6b, 0x65, 0x72, 0x6e, 0x65, 0x6c, 0x56, 0x65, 0x72, 0x73, 0x69, + 0x6f, 0x6e, 0x32, 0x5d, 0x0a, 0x06, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x53, 0x0a, 0x04, + 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x33, 0x2e, 0x63, + 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x76, 0x6d, 0x69, 0x6e, 0x69, 0x74, + 0x64, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x73, 0x79, 0x73, 0x74, 0x65, + 0x6d, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x42, 0x3d, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x6e, 0x65, 0x72, 0x64, 0x62, + 0x6f, 0x78, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, + 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_rawDescOnce sync.Once - file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_rawDescData = file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_rawDesc + file_proto_nerdbox_services_system_v1_info_proto_rawDescOnce sync.Once + file_proto_nerdbox_services_system_v1_info_proto_rawDescData = file_proto_nerdbox_services_system_v1_info_proto_rawDesc ) -func file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_rawDescGZIP() []byte { - file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_rawDescOnce.Do(func() { - file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_rawDescData = protoimpl.X.CompressGZIP(file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_rawDescData) +func file_proto_nerdbox_services_system_v1_info_proto_rawDescGZIP() []byte { + file_proto_nerdbox_services_system_v1_info_proto_rawDescOnce.Do(func() { + file_proto_nerdbox_services_system_v1_info_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_nerdbox_services_system_v1_info_proto_rawDescData) }) - return file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_rawDescData + return file_proto_nerdbox_services_system_v1_info_proto_rawDescData } -var file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_goTypes = []interface{}{ +var file_proto_nerdbox_services_system_v1_info_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_proto_nerdbox_services_system_v1_info_proto_goTypes = []interface{}{ (*InfoResponse)(nil), // 0: containerd.vminitd.services.system.v1.InfoResponse (*emptypb.Empty)(nil), // 1: google.protobuf.Empty } -var file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_depIdxs = []int32{ +var file_proto_nerdbox_services_system_v1_info_proto_depIdxs = []int32{ 1, // 0: containerd.vminitd.services.system.v1.System.Info:input_type -> google.protobuf.Empty 0, // 1: containerd.vminitd.services.system.v1.System.Info:output_type -> containerd.vminitd.services.system.v1.InfoResponse 1, // [1:2] is the sub-list for method output_type @@ -147,13 +146,13 @@ var file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_depIdxs 0, // [0:0] is the sub-list for field type_name } -func init() { file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_init() } -func file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_init() { - if File_github_com_containerd_nerdbox_api_services_system_v1_info_proto != nil { +func init() { file_proto_nerdbox_services_system_v1_info_proto_init() } +func file_proto_nerdbox_services_system_v1_info_proto_init() { + if File_proto_nerdbox_services_system_v1_info_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_proto_nerdbox_services_system_v1_info_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*InfoResponse); i { case 0: return &v.state @@ -170,18 +169,18 @@ func file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_init() out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_rawDesc, + RawDescriptor: file_proto_nerdbox_services_system_v1_info_proto_rawDesc, NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 1, }, - GoTypes: file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_goTypes, - DependencyIndexes: file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_depIdxs, - MessageInfos: file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_msgTypes, + GoTypes: file_proto_nerdbox_services_system_v1_info_proto_goTypes, + DependencyIndexes: file_proto_nerdbox_services_system_v1_info_proto_depIdxs, + MessageInfos: file_proto_nerdbox_services_system_v1_info_proto_msgTypes, }.Build() - File_github_com_containerd_nerdbox_api_services_system_v1_info_proto = out.File - file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_rawDesc = nil - file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_goTypes = nil - file_github_com_containerd_nerdbox_api_services_system_v1_info_proto_depIdxs = nil + File_proto_nerdbox_services_system_v1_info_proto = out.File + file_proto_nerdbox_services_system_v1_info_proto_rawDesc = nil + file_proto_nerdbox_services_system_v1_info_proto_goTypes = nil + file_proto_nerdbox_services_system_v1_info_proto_depIdxs = nil } diff --git a/api/services/system/v1/info_ttrpc.pb.go b/api/services/system/v1/info_ttrpc.pb.go index 61277a4..f83520f 100644 --- a/api/services/system/v1/info_ttrpc.pb.go +++ b/api/services/system/v1/info_ttrpc.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go-ttrpc. DO NOT EDIT. -// source: github.com/containerd/nerdbox/api/services/system/v1/info.proto +// source: proto/nerdbox/services/system/v1/info.proto package system import ( diff --git a/api/services/vmevents/v1/events.pb.go b/api/services/vmevents/v1/events.pb.go index 6ecbfe5..9ab054a 100644 --- a/api/services/vmevents/v1/events.pb.go +++ b/api/services/vmevents/v1/events.pb.go @@ -16,8 +16,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.20.1 -// source: github.com/containerd/nerdbox/api/services/vmevents/v1/events.proto +// protoc (unknown) +// source: proto/nerdbox/services/vmevents/v1/events.proto package vmevents @@ -36,37 +36,34 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -var File_github_com_containerd_nerdbox_api_services_vmevents_v1_events_proto protoreflect.FileDescriptor +var File_proto_nerdbox_services_vmevents_v1_events_proto protoreflect.FileDescriptor -var file_github_com_containerd_nerdbox_api_services_vmevents_v1_events_proto_rawDesc = []byte{ - 0x0a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, - 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x6e, 0x65, 0x72, 0x64, 0x62, 0x6f, 0x78, 0x2f, - 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x76, 0x6d, 0x65, - 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1c, 0x6e, 0x65, 0x72, 0x64, 0x62, 0x6f, 0x78, 0x2e, 0x73, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x76, 0x6d, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, - 0x2e, 0x76, 0x31, 0x1a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, - 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, - 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, - 0x65, 0x76, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, - 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, - 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x48, 0x0a, 0x06, 0x45, 0x76, 0x65, 0x6e, - 0x74, 0x73, 0x12, 0x3e, 0x0a, 0x06, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x16, 0x2e, 0x67, - 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, - 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1a, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, - 0x64, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, - 0x30, 0x01, 0x42, 0x41, 0x5a, 0x3f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, - 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x6e, 0x65, 0x72, 0x64, - 0x62, 0x6f, 0x78, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, - 0x2f, 0x76, 0x6d, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x6d, 0x65, - 0x76, 0x65, 0x6e, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var file_proto_nerdbox_services_vmevents_v1_events_proto_rawDesc = []byte{ + 0x0a, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x65, 0x72, 0x64, 0x62, 0x6f, 0x78, 0x2f, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x76, 0x6d, 0x65, 0x76, 0x65, 0x6e, 0x74, + 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x12, 0x1c, 0x6e, 0x65, 0x72, 0x64, 0x62, 0x6f, 0x78, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x73, 0x2e, 0x76, 0x6d, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x76, 0x31, 0x1a, + 0x1c, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x74, 0x79, 0x70, 0x65, + 0x73, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, + 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, + 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x48, 0x0a, 0x06, 0x45, 0x76, + 0x65, 0x6e, 0x74, 0x73, 0x12, 0x3e, 0x0a, 0x06, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x16, + 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, + 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1a, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, + 0x65, 0x72, 0x64, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, + 0x70, 0x65, 0x30, 0x01, 0x42, 0x41, 0x5a, 0x3f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x6e, 0x65, + 0x72, 0x64, 0x62, 0x6f, 0x78, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x73, 0x2f, 0x76, 0x6d, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x76, + 0x6d, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } -var file_github_com_containerd_nerdbox_api_services_vmevents_v1_events_proto_goTypes = []interface{}{ +var file_proto_nerdbox_services_vmevents_v1_events_proto_goTypes = []interface{}{ (*emptypb.Empty)(nil), // 0: google.protobuf.Empty (*types.Envelope)(nil), // 1: containerd.types.Envelope } -var file_github_com_containerd_nerdbox_api_services_vmevents_v1_events_proto_depIdxs = []int32{ +var file_proto_nerdbox_services_vmevents_v1_events_proto_depIdxs = []int32{ 0, // 0: nerdbox.services.vmevents.v1.Events.Stream:input_type -> google.protobuf.Empty 1, // 1: nerdbox.services.vmevents.v1.Events.Stream:output_type -> containerd.types.Envelope 1, // [1:2] is the sub-list for method output_type @@ -76,26 +73,26 @@ var file_github_com_containerd_nerdbox_api_services_vmevents_v1_events_proto_dep 0, // [0:0] is the sub-list for field type_name } -func init() { file_github_com_containerd_nerdbox_api_services_vmevents_v1_events_proto_init() } -func file_github_com_containerd_nerdbox_api_services_vmevents_v1_events_proto_init() { - if File_github_com_containerd_nerdbox_api_services_vmevents_v1_events_proto != nil { +func init() { file_proto_nerdbox_services_vmevents_v1_events_proto_init() } +func file_proto_nerdbox_services_vmevents_v1_events_proto_init() { + if File_proto_nerdbox_services_vmevents_v1_events_proto != nil { return } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_github_com_containerd_nerdbox_api_services_vmevents_v1_events_proto_rawDesc, + RawDescriptor: file_proto_nerdbox_services_vmevents_v1_events_proto_rawDesc, NumEnums: 0, NumMessages: 0, NumExtensions: 0, NumServices: 1, }, - GoTypes: file_github_com_containerd_nerdbox_api_services_vmevents_v1_events_proto_goTypes, - DependencyIndexes: file_github_com_containerd_nerdbox_api_services_vmevents_v1_events_proto_depIdxs, + GoTypes: file_proto_nerdbox_services_vmevents_v1_events_proto_goTypes, + DependencyIndexes: file_proto_nerdbox_services_vmevents_v1_events_proto_depIdxs, }.Build() - File_github_com_containerd_nerdbox_api_services_vmevents_v1_events_proto = out.File - file_github_com_containerd_nerdbox_api_services_vmevents_v1_events_proto_rawDesc = nil - file_github_com_containerd_nerdbox_api_services_vmevents_v1_events_proto_goTypes = nil - file_github_com_containerd_nerdbox_api_services_vmevents_v1_events_proto_depIdxs = nil + File_proto_nerdbox_services_vmevents_v1_events_proto = out.File + file_proto_nerdbox_services_vmevents_v1_events_proto_rawDesc = nil + file_proto_nerdbox_services_vmevents_v1_events_proto_goTypes = nil + file_proto_nerdbox_services_vmevents_v1_events_proto_depIdxs = nil } diff --git a/api/services/vmevents/v1/events_ttrpc.pb.go b/api/services/vmevents/v1/events_ttrpc.pb.go index 6190276..3ff1d0c 100644 --- a/api/services/vmevents/v1/events_ttrpc.pb.go +++ b/api/services/vmevents/v1/events_ttrpc.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go-ttrpc. DO NOT EDIT. -// source: github.com/containerd/nerdbox/api/services/vmevents/v1/events.proto +// source: proto/nerdbox/services/vmevents/v1/events.proto package vmevents import ( diff --git a/script/install-proto-tools b/script/install-proto-tools index b65ab12..7e2b0f9 100755 --- a/script/install-proto-tools +++ b/script/install-proto-tools @@ -20,7 +20,5 @@ set -eu -o pipefail # install `protobuild` and other commands -go install github.com/containerd/protobuild@v0.3.0 go install github.com/containerd/protobuild/cmd/go-fix-acronym@v0.3.0 -go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28.1 go install github.com/containerd/ttrpc/cmd/protoc-gen-go-ttrpc@v1.2.5 diff --git a/script/install-protobuf b/script/install-protobuf deleted file mode 100755 index 3c98e38..0000000 --- a/script/install-protobuf +++ /dev/null @@ -1,71 +0,0 @@ -#!/usr/bin/env bash - -# Copyright The containerd Authors. - -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - -# -# Downloads and installs protobuf -# -set -eu -o pipefail - -PROTOBUF_VERSION=3.20.1 -PROTOBUF_DIR=$(mktemp -d) - -# Use `go tool dist list` for the full list of targets -TARGET="$(go env GOOS)-$(go env GOARCH)" -TARGET_ORIG=$TARGET - -# Fix up OS/ARCH to get proper download link for https://github.com/protocolbuffers/protobuf/releases - -# Darwin -TARGET=${TARGET/darwin-amd64/osx-x86_64} -TARGET=${TARGET/darwin-arm64/osx-aarch_64} - -# Windows -TARGET=${TARGET/windows-amd64/win64} -TARGET=${TARGET/windows-386/win32} - -# Linux -TARGET=${TARGET/linux-386/linux-x86_32} -TARGET=${TARGET/linux-amd64/linux-x86_64} -TARGET=${TARGET/linux-arm64/linux-aarch_64} -TARGET=${TARGET/linux-ppc64le/linux-ppcle_64} - -if [[ $TARGET != $TARGET_ORIG ]] -then - wget -O "$PROTOBUF_DIR/protobuf" "https://github.com/protocolbuffers/protobuf/releases/download/v$PROTOBUF_VERSION/protoc-$PROTOBUF_VERSION-$TARGET.zip" - unzip "$PROTOBUF_DIR/protobuf" -d /usr/local -else - # Build from source - wget -O "$PROTOBUF_DIR/protobuf" "https://github.com/protocolbuffers/protobuf/releases/download/v$PROTOBUF_VERSION/protobuf-cpp-$PROTOBUF_VERSION.zip" - unzip "$PROTOBUF_DIR/protobuf" -d /usr/src/protobuf - cd "/usr/src/protobuf/protobuf-$PROTOBUF_VERSION" - ./autogen.sh - ./configure --disable-shared - make - make check - make install - ldconfig -fi - -rm -rf "$PROTOBUF_DIR" - -# Download status.proto. grpc repos' one seems copied from -# https://github.com/googleapis/googleapis/blob/master/google/rpc/status.proto, -# but we use grpc's since the repos has tags/releases. -mkdir -p /usr/local/include/google/rpc -curl \ - -L https://raw.githubusercontent.com/grpc/grpc/v1.45.2/src/proto/grpc/status/status.proto \ - -o /usr/local/include/google/rpc/status.proto From 041e4d5784e5f8b9654c8c85ee1ab46f5b7e55a3 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Sat, 24 Jan 2026 00:56:08 -0800 Subject: [PATCH 2/2] Use npm to install buf in gha Signed-off-by: Derek McGowan --- .github/workflows/ci.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b26e33a..2b22d81 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,15 +81,8 @@ jobs: echo "GOPATH=${{ github.workspace }}" >> $GITHUB_ENV echo "${{ github.workspace }}/bin" >> $GITHUB_PATH - - name: Install buf - run: | - BIN="/usr/local/bin" && \ - VERSION="1.64.0" && \ - curl -sSL \ - "https://github.com/bufbuild/buf/releases/download/v${VERSION}/buf-$(uname -s)-$(uname -m)" \ - -o "${BIN}/buf" && \ - chmod +x "${BIN}/buf" - + - uses: actions/setup-node@v6 + - run: npm install -g @bufbuild/buf - run: script/install-proto-tools - run: make proto-fmt - run: make check-protos check-api-descriptors