Skip to content

1835 daps refactor proto proto3 with envelope #1841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JoshuaSBrown wants to merge 5 commits into
base: devel
Choose a base branch
from
+18 −9
Open

1835 daps refactor proto proto3 with envelope #1841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d140037
feat: add protobuf3 replacement files.
JoshuaSBrown Jan 29, 2026
04a4212
refactor: make envelope more consistent with existing implementation.
JoshuaSBrown Jan 29, 2026
d36dd1d
refactor: change sdms to SDMS in package name to be consistent with w…
JoshuaSBrown Jan 29, 2026
032f35c
Merge branch 'devel' into 1835-DAPS-refactor-proto-proto3-with-envelope
JoshuaSBrown Feb 4, 2026
8e0955a
refactor: Small change to align needed changes in error messages to b…
JoshuaSBrown Feb 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions common/proto3/common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
cmake_minimum_required(VERSION 3.17.0)

# Collect proto files from the new 1-1-1 structure
file(GLOB_RECURSE ProtoFiles
"${CMAKE_CURRENT_SOURCE_DIR}/enums/*.proto"
"${CMAKE_CURRENT_SOURCE_DIR}/messages/*.proto"
"${CMAKE_CURRENT_SOURCE_DIR}/anon/*.proto"
"${CMAKE_CURRENT_SOURCE_DIR}/auth/*.proto"
"${CMAKE_CURRENT_SOURCE_DIR}/envelope.proto"
)

# Generate C++ from protos
protobuf_generate(
LANGUAGE cpp
Expand Down
18 changes: 9 additions & 9 deletions common/proto3/common/enums/error_code.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ package SDMS;
option cc_enable_arenas = true;

enum ErrorCode {
ERROR_CODE_UNSPECIFIED = 0;
ERROR_CODE_BAD_REQUEST = 1;
ERROR_CODE_INTERNAL_ERROR = 2;
ERROR_CODE_CLIENT_ERROR = 3;
ERROR_CODE_SERVICE_ERROR = 4;
ERROR_CODE_AUTHN_REQUIRED = 5;
ERROR_CODE_AUTHN_ERROR = 6;
ERROR_CODE_DEST_PATH_ERROR = 7;
ERROR_CODE_DEST_FILE_ERROR = 8;
UNSPECIFIED = 0;
BAD_REQUEST = 1;
INTERNAL_ERROR = 2;
CLIENT_ERROR = 3;
SERVICE_ERROR = 4;
AUTHN_REQUIRED = 5;
AUTHN_ERROR = 6;
DEST_PATH_ERROR = 7;
DEST_FILE_ERROR = 8;
}