Skip to content

Commit

Permalink
Updating protos for Dapr 1.12 (#53)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>

* Update docs with instructions to building the image independently from VSCode

Signed-off-by: Elena Kolevska <[email protected]>

---------

Signed-off-by: Elena Kolevska <[email protected]>
  • Loading branch information
elena-kolevska authored Sep 11, 2023
1 parent 49dce52 commit b6f3ac8
Show file tree
Hide file tree
Showing 5 changed files with 3,056 additions and 491 deletions.
7 changes: 5 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,11 @@ RUN apt-get update \
&& apt-get -y install libgrpc++-dev libgrpc-dev protobuf-compiler-grpc libprotobuf-dev protobuf-compiler \
# Install Docker CE CLI
&& apt-get install -y apt-transport-https ca-certificates curl gnupg-agent software-properties-common lsb-release \
&& curl -fsSL https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/gpg | (OUT=$(apt-key add - 2>&1) || echo $OUT) \
&& add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]') $(lsb_release -cs) stable" \
&& install -m 0755 -d /etc/apt/keyrings \
&& curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg \
&& chmod a+r /etc/apt/keyrings/docker.gpg \
&& 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" | \
tee /etc/apt/sources.list.d/docker.list > /dev/null \
&& apt-get update \
&& apt-get install -y docker-ce-cli python3 python3-pip \
&& pip3 install mechanical-markdown \
Expand Down
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@ Alpha quality.
2. Install [VSCode](https://code.visualstudio.com/download)
3. Install [VSCode Remote - Container extension](https://code.visualstudio.com/docs/remote/containers)

Alternatively, you can build the image yourself, based on the Dockerfile in the repository:
```bash
docker build -t cppsdk .
```

Then you can access the container's shell and execute commands in it:
```bash
docker run -it -v $(pwd):/sdk cppsdk /bin/bash
```

### To refresh .proto files from upstream dapr

1. Rebuild and commit generated API
Expand Down
41 changes: 32 additions & 9 deletions dapr/proto/runtime/v1/dapr.proto
Original file line number Diff line number Diff line change
Expand Up @@ -580,10 +580,14 @@ message InvokeActorResponse {
// GetMetadataResponse is a message that is returned on GetMetadata rpc call
message GetMetadataResponse {
string id = 1;
repeated ActiveActorsCount active_actors_count = 2;
repeated RegisteredComponents registered_components = 3;
map<string, string> extended_metadata = 4;
repeated PubsubSubscription subscriptions = 5;
repeated ActiveActorsCount active_actors_count = 2 [json_name = "actors"];
repeated RegisteredComponents registered_components = 3 [json_name = "components"];
map<string, string> extended_metadata = 4 [json_name = "extended"];
repeated PubsubSubscription subscriptions = 5 [json_name = "subscriptions"];
repeated MetadataHTTPEndpoint http_endpoints = 6 [json_name = "httpEndpoints"];
AppConnectionProperties app_connection_properties = 7 [json_name = "appConnectionProperties"];
string runtime_version = 8 [json_name = "runtimeVersion"];
repeated string enabled_features = 9 [json_name = "enabledFeatures"];
}

message ActiveActorsCount {
Expand All @@ -598,12 +602,31 @@ message RegisteredComponents {
repeated string capabilities = 4;
}

message MetadataHTTPEndpoint {
string name = 1 [json_name = "name"];
}

message AppConnectionProperties {
int32 port = 1;
string protocol = 2;
string channel_address = 3 [json_name = "channelAddress"];
int32 max_concurrency = 4 [json_name = "maxConcurrency"];
AppConnectionHealthProperties health = 5;
}

message AppConnectionHealthProperties {
string health_check_path = 1 [json_name = "healthCheckPath"];
string health_probe_interval = 2 [json_name = "healthProbeInterval"];
string health_probe_timeout = 3 [json_name = "healthProbeTimeout"];
int32 health_threshold = 4 [json_name = "healthThreshold"];
}

message PubsubSubscription {
string pubsub_name = 1;
string topic = 2;
map<string,string> metadata = 3;
PubsubSubscriptionRules rules = 4;
string dead_letter_topic = 5;
string pubsub_name = 1 [json_name = "pubsubname"];
string topic = 2 [json_name = "topic"];
map<string,string> metadata = 3 [json_name = "metadata"];
PubsubSubscriptionRules rules = 4 [json_name = "rules"];
string dead_letter_topic = 5 [json_name = "deadLetterTopic"];
}

message PubsubSubscriptionRules {
Expand Down
Loading

0 comments on commit b6f3ac8

Please sign in to comment.