Skip to content

Commit db4c8de

Browse files
committed
refactor: address feedback on removing deprecated fields from first public proto
Review Comment from @DeepeshDamodaran: "we don't want to show this deprecated field in the first version of the public api. this may be more work on backend side, but i feel we should do that." This change cleans up all deprecated fields and messages from the proto: - Removes deprecated fields from StreamSqlDataRequest (location_id, message_type) and StreamSqlDataResponse (type). - Deletes unused deprecated messages ConnectionSettings, InstanceId, ClientPayload, and ServerPayload. - Regenerates Go protobuf bindings. - Fixes build.sh in jj-go-connector to support cross-platform architecture variables and sed in-place edit syntax during local protoc setup.
1 parent b5ac309 commit db4c8de

5 files changed

Lines changed: 79 additions & 843 deletions

File tree

‎build.sh‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,15 @@ function generate() {
7777
dest_file="$SCRIPT_DIR/internal/sqldatagrpc/sql_data_service_grpc.pb.go"
7878
mkdir -p "$SCRIPT_DIR/internal/sqldatagrpc"
7979
mv "$SCRIPT_DIR/internal/sqldata/sql_data_service_grpc.pb.go" "$dest_file"
80-
sed -i '' 's|^package sqldata$|package sqldatagrpc\nimport sqldatapb "cloud.google.com/go/cloudsqlconn/internal/sqldata"|' "$dest_file"
81-
sed -i '' 's/StreamSqlDataRequest/sqldatapb.StreamSqlDataRequest/' "$dest_file"
82-
sed -i '' 's/StreamSqlDataResponse/sqldatapb.StreamSqlDataResponse/' "$dest_file"
80+
if [[ $(uname) == "Darwin" ]] ; then
81+
sed -i '' 's|^package sqldata$|package sqldatagrpc\nimport sqldatapb "cloud.google.com/go/cloudsqlconn/internal/sqldata"|' "$dest_file"
82+
sed -i '' 's/StreamSqlDataRequest/sqldatapb.StreamSqlDataRequest/' "$dest_file"
83+
sed -i '' 's/StreamSqlDataResponse/sqldatapb.StreamSqlDataResponse/' "$dest_file"
84+
else
85+
sed -i 's|^package sqldata$|package sqldatagrpc\nimport sqldatapb "cloud.google.com/go/cloudsqlconn/internal/sqldata"|' "$dest_file"
86+
sed -i 's/StreamSqlDataRequest/sqldatapb.StreamSqlDataRequest/' "$dest_file"
87+
sed -i 's/StreamSqlDataResponse/sqldatapb.StreamSqlDataResponse/' "$dest_file"
88+
fi
8389

8490
# Add the copyright header to the generated protobuf file
8591
for pbFile in "${generated_pb_go[@]}" ; do
@@ -126,12 +132,12 @@ function get_protoc() {
126132
fi
127133
if [[ "$os" == "darwin" && "$arch" == "arm64" ]] ; then
128134
protoc_url="https://github.com/protocolbuffers/protobuf/releases/download/v${protoc_version}/protoc-${protoc_version}-osx-aarch_64.zip"
129-
protoc_go_url="https://github.com/protocolbuffers/protobuf-go/releases/download/v${proto_go_version}/protoc-gen-go.v${proto_go_version}.${os}.${arch}.tar.gz"
130-
protoc_go_grpc_url="https://github.com/grpc/grpc-go/releases/download/cmd%2Fprotoc-gen-go-grpc%2Fv${proto_grpc_go_version}/protoc-gen-go-grpc.v${proto_grpc_go_version}.${os}.${arch}.tar.gz"
135+
protoc_go_url="https://github.com/protocolbuffers/protobuf-go/releases/download/v${proto_go_version}/protoc-gen-go.v${proto_go_version}.${os}.${protoc_go_arch}.tar.gz"
136+
protoc_go_grpc_url="https://github.com/grpc/grpc-go/releases/download/cmd%2Fprotoc-gen-go-grpc%2Fv${proto_grpc_go_version}/protoc-gen-go-grpc.v${proto_grpc_go_version}.${os}.${protoc_go_arch}.tar.gz"
131137
elif [[ "$os" == "linux" ]] ; then
132138
protoc_url="https://github.com/protocolbuffers/protobuf/releases/download/v${protoc_version}/protoc-${protoc_version}-${os}-${arch}.zip"
133-
protoc_go_url="https://github.com/protocolbuffers/protobuf-go/releases/download/v${proto_go_version}/protoc-gen-go.v${proto_go_version}.${os}.${arch}.tar.gz"
134-
protoc_go_grpc_url="https://github.com/grpc/grpc-go/releases/download/cmd%2Fprotoc-gen-go-grpc%2Fv${proto_grpc_go_version}/protoc-gen-go-grpc.v${proto_grpc_go_version}.${os}.${arch}.tar.gz"
139+
protoc_go_url="https://github.com/protocolbuffers/protobuf-go/releases/download/v${proto_go_version}/protoc-gen-go.v${proto_go_version}.${os}.${protoc_go_arch}.tar.gz"
140+
protoc_go_grpc_url="https://github.com/grpc/grpc-go/releases/download/cmd%2Fprotoc-gen-go-grpc%2Fv${proto_grpc_go_version}/protoc-gen-go-grpc.v${proto_grpc_go_version}.${os}.${protoc_go_arch}.tar.gz"
135141
else
136142
echo "Unsupported protoc platform : $os $arch"
137143
exit 1

‎internal/mdx/metadata_exchange.pb.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)