Skip to content

Commit b6f3ac8

Browse files
Updating protos for Dapr 1.12 (#53)
* Updating to dapr runtime master. The Dockerfile was failing to install `docker-ce-cli`, so this commit also updates the Dockerfile with the new way to add the docker repo. Signed-off-by: Elena Kolevska <elena@kolevska.com> * Update docs with instructions to building the image independently from VSCode Signed-off-by: Elena Kolevska <elena@kolevska.com> --------- Signed-off-by: Elena Kolevska <elena@kolevska.com>
1 parent 49dce52 commit b6f3ac8

File tree

5 files changed

+3056
-491
lines changed

5 files changed

+3056
-491
lines changed

.devcontainer/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,11 @@ RUN apt-get update \
3434
&& apt-get -y install libgrpc++-dev libgrpc-dev protobuf-compiler-grpc libprotobuf-dev protobuf-compiler \
3535
# Install Docker CE CLI
3636
&& apt-get install -y apt-transport-https ca-certificates curl gnupg-agent software-properties-common lsb-release \
37-
&& curl -fsSL https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/gpg | (OUT=$(apt-key add - 2>&1) || echo $OUT) \
38-
&& add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]') $(lsb_release -cs) stable" \
37+
&& install -m 0755 -d /etc/apt/keyrings \
38+
&& curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg \
39+
&& chmod a+r /etc/apt/keyrings/docker.gpg \
40+
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
41+
tee /etc/apt/sources.list.d/docker.list > /dev/null \
3942
&& apt-get update \
4043
&& apt-get install -y docker-ce-cli python3 python3-pip \
4144
&& pip3 install mechanical-markdown \

README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,16 @@ Alpha quality.
1010
2. Install [VSCode](https://code.visualstudio.com/download)
1111
3. Install [VSCode Remote - Container extension](https://code.visualstudio.com/docs/remote/containers)
1212

13+
Alternatively, you can build the image yourself, based on the Dockerfile in the repository:
14+
```bash
15+
docker build -t cppsdk .
16+
```
17+
18+
Then you can access the container's shell and execute commands in it:
19+
```bash
20+
docker run -it -v $(pwd):/sdk cppsdk /bin/bash
21+
```
22+
1323
### To refresh .proto files from upstream dapr
1424

1525
1. Rebuild and commit generated API

dapr/proto/runtime/v1/dapr.proto

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -580,10 +580,14 @@ message InvokeActorResponse {
580580
// GetMetadataResponse is a message that is returned on GetMetadata rpc call
581581
message GetMetadataResponse {
582582
string id = 1;
583-
repeated ActiveActorsCount active_actors_count = 2;
584-
repeated RegisteredComponents registered_components = 3;
585-
map<string, string> extended_metadata = 4;
586-
repeated PubsubSubscription subscriptions = 5;
583+
repeated ActiveActorsCount active_actors_count = 2 [json_name = "actors"];
584+
repeated RegisteredComponents registered_components = 3 [json_name = "components"];
585+
map<string, string> extended_metadata = 4 [json_name = "extended"];
586+
repeated PubsubSubscription subscriptions = 5 [json_name = "subscriptions"];
587+
repeated MetadataHTTPEndpoint http_endpoints = 6 [json_name = "httpEndpoints"];
588+
AppConnectionProperties app_connection_properties = 7 [json_name = "appConnectionProperties"];
589+
string runtime_version = 8 [json_name = "runtimeVersion"];
590+
repeated string enabled_features = 9 [json_name = "enabledFeatures"];
587591
}
588592

589593
message ActiveActorsCount {
@@ -598,12 +602,31 @@ message RegisteredComponents {
598602
repeated string capabilities = 4;
599603
}
600604

605+
message MetadataHTTPEndpoint {
606+
string name = 1 [json_name = "name"];
607+
}
608+
609+
message AppConnectionProperties {
610+
int32 port = 1;
611+
string protocol = 2;
612+
string channel_address = 3 [json_name = "channelAddress"];
613+
int32 max_concurrency = 4 [json_name = "maxConcurrency"];
614+
AppConnectionHealthProperties health = 5;
615+
}
616+
617+
message AppConnectionHealthProperties {
618+
string health_check_path = 1 [json_name = "healthCheckPath"];
619+
string health_probe_interval = 2 [json_name = "healthProbeInterval"];
620+
string health_probe_timeout = 3 [json_name = "healthProbeTimeout"];
621+
int32 health_threshold = 4 [json_name = "healthThreshold"];
622+
}
623+
601624
message PubsubSubscription {
602-
string pubsub_name = 1;
603-
string topic = 2;
604-
map<string,string> metadata = 3;
605-
PubsubSubscriptionRules rules = 4;
606-
string dead_letter_topic = 5;
625+
string pubsub_name = 1 [json_name = "pubsubname"];
626+
string topic = 2 [json_name = "topic"];
627+
map<string,string> metadata = 3 [json_name = "metadata"];
628+
PubsubSubscriptionRules rules = 4 [json_name = "rules"];
629+
string dead_letter_topic = 5 [json_name = "deadLetterTopic"];
607630
}
608631

609632
message PubsubSubscriptionRules {

0 commit comments

Comments
 (0)