Skip to content

Commit cf57edf

Browse files
committed
revert tool change
Signed-off-by: Filinto Duran <[email protected]>
1 parent f6aa076 commit cf57edf

File tree

2 files changed

+35
-23
lines changed

2 files changed

+35
-23
lines changed

tools/regen_grpcclient.sh

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,42 @@
1717
PROTO_PATH="dapr/proto"
1818
SRC=.
1919

20-
# Local Dapr repository path
21-
LOCAL_DAPR_PATH="../../dapr"
20+
# Http request CLI
21+
HTTP_REQUEST_CLI=curl
2222

23-
copyLocalFile() {
23+
24+
checkHttpRequestCLI() {
25+
if type "curl" > /dev/null; then
26+
HTTP_REQUEST_CLI=curl
27+
elif type "wget" > /dev/null; then
28+
HTTP_REQUEST_CLI=wget
29+
else
30+
echo "Either curl or wget is required"
31+
exit 1
32+
fi
33+
}
34+
35+
downloadFile() {
2436
PKG_NAME=$1
2537
FILE_NAME=$2
2638
FILE_PATH="${PROTO_PATH}/${PKG_NAME}/v1"
27-
28-
# Local proto file path
29-
LOCAL_PROTO_FILE="${LOCAL_DAPR_PATH}/dapr/proto/${PKG_NAME}/v1/${FILE_NAME}.proto"
39+
40+
# URL for proto file
41+
PROTO_URL="https://raw.githubusercontent.com/dapr/dapr/master/dapr/proto/${PKG_NAME}/v1/${FILE_NAME}.proto"
3042

3143
mkdir -p "${FILE_PATH}"
3244

33-
echo "Copying local file $LOCAL_PROTO_FILE ..."
34-
35-
if [ ! -e "$LOCAL_PROTO_FILE" ]; then
36-
echo "Local proto file not found: $LOCAL_PROTO_FILE"
37-
echo "Make sure the local Dapr repository is available at $LOCAL_DAPR_PATH"
38-
exit 1
45+
echo "Downloading $PROTO_URL ..."
46+
if [ "$HTTP_REQUEST_CLI" == "curl" ]; then
47+
pushd ${FILE_PATH}
48+
curl -SsL "$PROTO_URL" -o "${FILE_NAME}.proto"
49+
popd
50+
else
51+
wget -q -P "$PROTO_URL" "${FILE_PATH}/${FILE_NAME}.proto"
3952
fi
40-
41-
cp "$LOCAL_PROTO_FILE" "${FILE_PATH}/${FILE_NAME}.proto"
4253

4354
if [ ! -e "${FILE_PATH}/${FILE_NAME}.proto" ]; then
44-
echo "failed to copy $LOCAL_PROTO_FILE ..."
55+
echo "failed to download $PROTO_URL ..."
4556
ret_val=$FILE_NAME
4657
exit 1
4758
fi
@@ -59,8 +70,6 @@ generateGrpc() {
5970
ret_val=$FILE_NAME
6071
exit 1
6172
fi
62-
63-
echo "Writing mypy to ${FILE_PATH}/${FILE_NAME}_pb2.pyi"
6473
}
6574

6675
fail_trap() {
@@ -86,13 +95,13 @@ generateGrpcSuccess() {
8695
# -----------------------------------------------------------------------------
8796
trap "fail_trap" EXIT
8897

89-
copyLocalFile common common
98+
checkHttpRequestCLI
99+
downloadFile common common
90100
generateGrpc common common
91-
copyLocalFile runtime appcallback
101+
downloadFile runtime appcallback
92102
generateGrpc runtime appcallback
93-
copyLocalFile runtime dapr
103+
downloadFile runtime dapr
94104
generateGrpc runtime dapr
95105
cleanup
96106

97107
generateGrpcSuccess
98-

tools/regen_grpcclient_local.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
# ------------------------------------------------------------
4-
# Copyright 2021 The Dapr Authors
4+
# Copyright 2025 The Dapr Authors
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.
77
# You may obtain a copy of the License at
@@ -17,8 +17,11 @@
1717
PROTO_PATH="dapr/proto"
1818
SRC=.
1919

20+
SCRIPT_DIR = Path(__file__).parent
21+
REPO_ROOT = SCRIPT_DIR.parent
22+
2023
# Local dapr repository path (relative to current directory)
21-
LOCAL_DAPR_PATH="/Users/filinto/diagrid/dapr"
24+
LOCAL_DAPR_PATH = REPO_ROOT.parent / "dapr"
2225

2326
checkLocalDaprRepo() {
2427
if [ ! -d "$LOCAL_DAPR_PATH" ]; then

0 commit comments

Comments
 (0)