RSDK-12498: Fix building against local protos (#537)

Author: lia-viam

buf.lock

@@ -0,0 +1,15 @@
+# Generated by buf. DO NOT EDIT.
+version: v2
+deps:
+  - name: buf.build/googleapis/googleapis
+    commit: 004180b77378443887d3b55cabc00384
+    digest: b5:e8f475fe3330f31f5fd86ac689093bcd274e19611a09db91f41d637cb9197881ce89882b94d13a58738e53c91c6e4bae7dc1feba85f590164c975a89e25115dc
+  - name: buf.build/opentelemetry/opentelemetry
+    commit: 648a3e2f02e14fe187656ea4ac3befa1
+    digest: b5:a0514be587ab2e8598f7102dfdaba5e985138b8c041c707e470a9c8b877410ada6e60cf2359352302f08c0504de685379f7f7a085d4699d69a2e6ed7035e78d9
+  - name: buf.build/viamrobotics/api
+    commit: 9e59e291a4574eebbf5241b3e004a6bd
+    digest: b5:8bd880cf71605a19b2a098cf39756cfcb7365328a088e25c38e4c74d26c63b6a16b2b7c71601158a4cc535b937b641e201adef32904795808a5a8f56c11d1a21
+  - name: buf.build/viamrobotics/goutils
+    commit: 5fff320e3fab4611aea8180e09bcb5e5
+    digest: b5:e524fd761245da57e4651fd26e16d1a1ea9f45b5fe43ac63e35070f814e9665e5e06741e30e3c803b4d6c6f5d685a62f705e916089d92f34be7e42ba721e6f7d

src/viam/api/buf.yaml buf.yamlsrc/viam/api/buf.yaml renamed to buf.yaml

@@ -1,12 +1,19 @@
-version: v1
-breaking:
-  use:
-    - FILE
-lint:
-  use:
-    - DEFAULT
+version: v2
 deps:
   - buf.build/googleapis/googleapis
+  - buf.build/opentelemetry/opentelemetry
   - buf.build/viamrobotics/api
   - buf.build/viamrobotics/goutils
-  - buf.build/opentelemetry/opentelemetry
+lint:
+  use:
+    - DEFAULT
+  except:
+    - FIELD_NOT_REQUIRED
+    - PACKAGE_NO_IMPORT_CYCLE
+  disallow_comment_ignores: true
+breaking:
+  use:
+    - FILE
+  except:
+    - EXTENSION_NO_DELETE
+    - FIELD_SAME_DEFAULT

src/viam/api/CMakeLists.txt

@@ -3,10 +3,10 @@ set(PROTO_GEN_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
 if (VIAMCPPSDK_USE_DYNAMIC_PROTOS)
   # reads in buf.lock and grabs the commit hashes supported by this version of C++ SDK
-  if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/buf.lock)
+  if (NOT EXISTS ${PROJECT_SOURCE_DIR}/buf.lock)
     message(FATAL_ERROR "No `buf.lock` file was found in the src/viam/api directory")
   endif()
-  file(READ ${CMAKE_CURRENT_SOURCE_DIR}/buf.lock lockfile)
+  file(READ ${PROJECT_SOURCE_DIR}/buf.lock lockfile)
 
   string(REGEX MATCH "googleapis[ \t\r\n]*commit: ([A-Za-z0-9_]*)" _ ${lockfile})
   set(BUF_GOOGLE_API_SOURCE buf.build/googleapis/googleapis:${CMAKE_MATCH_1})
@@ -42,17 +42,15 @@ if (VIAMCPPSDK_USE_LOCAL_PROTOS)
     message(FATAL_ERROR "The VIAMCPPSDK_USE_LOCAL_PROTOS option requires VIAMCPPSDK_USE_DYNAMIC_PROTOS=ON")
   endif()
 
-  if (NOT EXISTS ${PROJECT_SOURCE_DIR}/../buf.work.yaml)
-    message(FATAL_ERROR "No `buf.work.yaml` file was found in the parent directory")
-  endif()
-
+  # TODO: I believe it is no longer necessary for the Viam API repo to be a sibling repo of the Viam C++ SDK repo.
+  # Maybe try to detect the sibling configuration as before, but also allow the option to pass the directory as a CMake arg.
   if (NOT EXISTS ${PROJECT_SOURCE_DIR}/../api/proto/viam)
     message(FATAL_ERROR "No Viam api repository was found in the parent directory")
   endif()
 
-  file(RELATIVE_PATH BUF_LOCAL_PROTO_PATH ${CMAKE_CURRENT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/..)
+  file(RELATIVE_PATH BUF_LOCAL_PROTO_PATH ${CMAKE_CURRENT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/../api)
   set(BUF_VIAM_API_SOURCE ${BUF_LOCAL_PROTO_PATH})
-  list(TRANSFORM BUF_PROTO_COMPONENTS PREPEND ${BUF_LOCAL_PROTO_PATH}/api/proto/viam/)
+  list(TRANSFORM BUF_PROTO_COMPONENTS PREPEND ${BUF_LOCAL_PROTO_PATH}/proto/viam/)
 endif()
 
 list(JOIN BUF_PROTO_COMPONENTS , BUF_PROTO_COMPONENTS_JOINED)

src/viam/api/buf.lock

@@ -1,4 +1,4 @@
-# Copyright 2023 Viam Inc.
+# Copyright 2026 Viam Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,10 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version: v1
+version: v2
 plugins:
-  - name: cpp
+  - protoc_builtin: cpp
     out: gen/viam/api
-  - name: cpp-grpc
+  - local: ${VIAMCPPSDK_GRPC_CPP_PLUGIN}
     out: gen/viam/api
-    path: ${VIAMCPPSDK_GRPC_CPP_PLUGIN}

src/viam/api/config/buf.gen.local.yaml.in

@@ -1,4 +1,4 @@
-# Copyright 2023 Viam Inc.
+# Copyright 2026 Viam Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,11 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version: v1
+version: v2
 managed:
   enabled: true
 plugins:
-  - plugin: buf.build/grpc/cpp:v@VIAMCPPSDK_GRPCXX_VERSION@
+  - remote: buf.build/grpc/cpp:v@VIAMCPPSDK_GRPCXX_VERSION@
     out: gen/viam/api
-  - plugin: buf.build/protocolbuffers/cpp:v@VIAMCPPSDK_PROTOC_VERSION@
+  - remote: buf.build/protocolbuffers/cpp:v@VIAMCPPSDK_PROTOC_VERSION@
     out: gen/viam/api

src/viam/api/config/buf.gen.remote.plugin.yaml.in

@@ -0,0 +1,6 @@
+# Generated by buf. DO NOT EDIT.
+version: v2
+deps:
+  - name: buf.build/googleapis/googleapis
+    commit: 004180b77378443887d3b55cabc00384
+    digest: b5:e8f475fe3330f31f5fd86ac689093bcd274e19611a09db91f41d637cb9197881ce89882b94d13a58738e53c91c6e4bae7dc1feba85f590164c975a89e25115dc

src/viam/examples/modules/complex/buf.lock

@@ -1,4 +1,4 @@
-# Copyright 2023 Viam Inc.
+# Copyright 2026 Viam Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,13 +12,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-version: v1
+version: v2
+modules:
+  - path: proto
 deps:
   - buf.build/googleapis/googleapis
-breaking:
-  use:
-    - FILE
 lint:
   use:
     - DEFAULT
+  except:
+    - FIELD_NOT_REQUIRED
+    - PACKAGE_NO_IMPORT_CYCLE
+  disallow_comment_ignores: true
+breaking:
+  use:
+    - FILE
+  except:
+    - EXTENSION_NO_DELETE
+    - FIELD_SAME_DEFAULT