Skip to content

Commit

Permalink
Bump to 3.4.0-rc.2 for final release test (#618)
Browse files Browse the repository at this point in the history
* fix: typo (#607)

Update AbstractActor.ts

Signed-off-by: Bond <[email protected]>

* fix: Remove broken image links (#610)

Update README.md

Signed-off-by: Joe Bowbeer <[email protected]>

* Fix README.md for distributedlock example (#613)

Update README.md

Signed-off-by: greenie-msft <[email protected]>

* [chore] Bump to 3.4.0-rc.1 - use dapr 1.14.0-rc.x (#611)

* use dapr 1.14.0-rc.6

Signed-off-by: Deepanshu Agarwal <[email protected]>

* Version correction

Signed-off-by: Deepanshu Agarwal <[email protected]>

* Update .github/workflows/test-e2e.yml

Co-authored-by: Mike Nguyen <[email protected]>
Signed-off-by: Paul Yuknewicz <[email protected]>

* update

Signed-off-by: Deepanshu Agarwal <[email protected]>

* update

Signed-off-by: Deepanshu Agarwal <[email protected]>

---------

Signed-off-by: Deepanshu Agarwal <[email protected]>
Signed-off-by: Paul Yuknewicz <[email protected]>
Co-authored-by: Paul Yuknewicz <[email protected]>
Co-authored-by: Mike Nguyen <[email protected]>

* Updating package json with final release version 3.4.0

Signed-off-by: Paul Yuknewicz <[email protected]>

* Regenerated protos by updating and running ./scripts/fetch-proto.sh

Signed-off-by: Paul Yuknewicz <[email protected]>

* Updating test workflow with correct Dapr Runtime and CLI versions

Signed-off-by: Paul Yuknewicz <[email protected]>

---------

Signed-off-by: Bond <[email protected]>
Signed-off-by: Joe Bowbeer <[email protected]>
Signed-off-by: greenie-msft <[email protected]>
Signed-off-by: Deepanshu Agarwal <[email protected]>
Signed-off-by: Paul Yuknewicz <[email protected]>
Co-authored-by: Bond <[email protected]>
Co-authored-by: Joe Bowbeer <[email protected]>
Co-authored-by: greenie-msft <[email protected]>
Co-authored-by: Deepanshu Agarwal <[email protected]>
Co-authored-by: Mike Nguyen <[email protected]>
  • Loading branch information
6 people authored Aug 17, 2024
1 parent 253aa0e commit 3a3a1a8
Show file tree
Hide file tree
Showing 19 changed files with 2,616 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ jobs:
runs-on: ubuntu-latest
env:
GOVER: 1.22
DAPR_CLI_VER: 1.14.0-rc.8
DAPR_RUNTIME_VER: 1.14.0-rc.7
DAPR_CLI_VER: 1.14.0
DAPR_RUNTIME_VER: 1.14.0
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/master/install/install.sh
DAPR_CLI_REF: ""
DAPR_REF: ""
Expand Down
17 changes: 0 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,23 +35,6 @@ npm install --save @dapr/dapr-dev

Visit [https://docs.dapr.io/developing-applications/sdks/js/](https://docs.dapr.io/developing-applications/sdks/js/) to view the full documentation.

## Who is using Dapr?

Dapr is used by the world's leading companies.

<div align="center">
<img src="https://dapr.io/images/bosch.png" width="100px">
<img src="https://dapr.io/images/zeiss.png" width="100px">
<img src="https://dapr.io/images/alibaba.png" width="100px">
<img src="https://dapr.io/images/ignition-group.png" width="100px">
<img src="https://dapr.io/images/roadwork.png" width="100px">
<img src="https://dapr.io/images/autonavi.png" width="100px">
<img src="https://dapr.io/images/legentic.png" width="100px">
<img src="https://dapr.io/images/man-group.png" width="100px">
</div>

View the main site [https://dapr.io/](https://dapr.io/) to learn more.

## Community

There are multiple ways to get involved with the SDK community, please see [wiki/Community-engagement](https://github.com/dapr/js-sdk/wiki/Community-engagement) for more information.
Expand Down
2 changes: 1 addition & 1 deletion examples/distributedLock/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const unlockResponse = await client.lock.unlock(storeName, resourceId, lockOwner
Execute the example under the folder `examples/distributedLock/LockApplication`

```bash
cd examples/distributedLock/LockApplication
cd examples/distributedLock/TryLockApplication
npm install
```

Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dapr/dapr",
"version": "3.4.0-rc.1",
"version": "3.4.0-rc.2",
"description": "The official Dapr (https://dapr.io) SDK for Node.js",
"types": "./build/index.d.ts",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion scripts/fetch-proto.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ OS=$(echo `uname`|tr '[:upper:]' '[:lower:]')
ARCH=$(uname -m)
ORG_NAME="dapr"
REPO_NAME="dapr"
BRANCH_NAME="v1.14.0-rc.7"
BRANCH_NAME="v1.14.0"

# Path to store output
PATH_ROOT=$(pwd)
Expand Down
160 changes: 160 additions & 0 deletions scripts/src/proto/dapr/proto/common/v1/common.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
/*
Copyright 2021 The Dapr Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

syntax = "proto3";

package dapr.proto.common.v1;

import "google/protobuf/any.proto";

option csharp_namespace = "Dapr.Client.Autogen.Grpc.v1";
option java_outer_classname = "CommonProtos";
option java_package = "io.dapr.v1";
option go_package = "github.com/dapr/dapr/pkg/proto/common/v1;common";

// HTTPExtension includes HTTP verb and querystring
// when Dapr runtime delivers HTTP content.
//
// For example, when callers calls http invoke api
// POST http://localhost:3500/v1.0/invoke/<app_id>/method/<method>?query1=value1&query2=value2
//
// Dapr runtime will parse POST as a verb and extract querystring to quersytring map.
message HTTPExtension {
// Type of HTTP 1.1 Methods
// RFC 7231: https://tools.ietf.org/html/rfc7231#page-24
// RFC 5789: https://datatracker.ietf.org/doc/html/rfc5789
enum Verb {
NONE = 0;
GET = 1;
HEAD = 2;
POST = 3;
PUT = 4;
DELETE = 5;
CONNECT = 6;
OPTIONS = 7;
TRACE = 8;
PATCH = 9;
}

// Required. HTTP verb.
Verb verb = 1;

// Optional. querystring represents an encoded HTTP url query string in the following format: name=value&name2=value2
string querystring = 2;
}

// InvokeRequest is the message to invoke a method with the data.
// This message is used in InvokeService of Dapr gRPC Service and OnInvoke
// of AppCallback gRPC service.
message InvokeRequest {
// Required. method is a method name which will be invoked by caller.
string method = 1;

// Required in unary RPCs. Bytes value or Protobuf message which caller sent.
// Dapr treats Any.value as bytes type if Any.type_url is unset.
google.protobuf.Any data = 2;

// The type of data content.
//
// This field is required if data delivers http request body
// Otherwise, this is optional.
string content_type = 3;

// HTTP specific fields if request conveys http-compatible request.
//
// This field is required for http-compatible request. Otherwise,
// this field is optional.
HTTPExtension http_extension = 4;
}

// InvokeResponse is the response message including data and its content type
// from app callback.
// This message is used in InvokeService of Dapr gRPC Service and OnInvoke
// of AppCallback gRPC service.
message InvokeResponse {
// Required in unary RPCs. The content body of InvokeService response.
google.protobuf.Any data = 1;

// Required. The type of data content.
string content_type = 2;
}

// Chunk of data sent in a streaming request or response.
// This is used in requests including InternalInvokeRequestStream.
message StreamPayload {
// Data sent in the chunk.
// The amount of data included in each chunk is up to the discretion of the sender, and can be empty.
// Additionally, the amount of data doesn't need to be fixed and subsequent messages can send more, or less, data.
// Receivers must not make assumptions about the number of bytes they'll receive in each chunk.
bytes data = 1;

// Sequence number. This is a counter that starts from 0 and increments by 1 on each chunk sent.
uint64 seq = 2;
}

// StateItem represents state key, value, and additional options to save state.
message StateItem {
// Required. The state key
string key = 1;

// Required. The state data for key
bytes value = 2;

// The entity tag which represents the specific version of data.
// The exact ETag format is defined by the corresponding data store.
Etag etag = 3;

// The metadata which will be passed to state store component.
map<string,string> metadata = 4;

// Options for concurrency and consistency to save the state.
StateOptions options = 5;
}

// Etag represents a state item version
message Etag {
// value sets the etag value
string value = 1;
}

// StateOptions configures concurrency and consistency for state operations
message StateOptions {
// Enum describing the supported concurrency for state.
enum StateConcurrency {
CONCURRENCY_UNSPECIFIED = 0;
CONCURRENCY_FIRST_WRITE = 1;
CONCURRENCY_LAST_WRITE = 2;
}

// Enum describing the supported consistency for state.
enum StateConsistency {
CONSISTENCY_UNSPECIFIED = 0;
CONSISTENCY_EVENTUAL = 1;
CONSISTENCY_STRONG = 2;
}

StateConcurrency concurrency = 1;
StateConsistency consistency = 2;
}

// ConfigurationItem represents all the configuration with its name(key).
message ConfigurationItem {
// Required. The value of configuration item.
string value = 1;

// Version is response only and cannot be fetched. Store is not expected to keep all versions available
string version = 2;

// the metadata which will be passed to/from configuration store component.
map<string,string> metadata = 3;
}
27 changes: 27 additions & 0 deletions scripts/src/proto/dapr/proto/internals/v1/apiversion.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
Copyright 2021 The Dapr Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

syntax = "proto3";

package dapr.proto.internals.v1;

option go_package = "github.com/dapr/dapr/pkg/proto/internals/v1;internals";

// APIVersion represents the version of Dapr Runtime API.
enum APIVersion {
// unspecified apiversion
APIVERSION_UNSPECIFIED = 0;

// Dapr API v1
V1 = 1;
}
125 changes: 125 additions & 0 deletions scripts/src/proto/dapr/proto/internals/v1/service_invocation.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
/*
Copyright 2021 The Dapr Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

syntax = "proto3";

package dapr.proto.internals.v1;

import "dapr/proto/common/v1/common.proto";
import "dapr/proto/internals/v1/reminders.proto";
import "dapr/proto/internals/v1/apiversion.proto";
import "dapr/proto/internals/v1/status.proto";
import "google/protobuf/empty.proto";

option go_package = "github.com/dapr/dapr/pkg/proto/internals/v1;internals";

// ServiceInvocation service is used to exchange the data between
// caller dapr runtime and callee dapr runtime.
//
// The request message includes caller's HTTP/gRPC request
// and deliver callee's response including status code.
// The response status of rpc methods represents of internal gRPC
// connection status, not callee's response status.
//
// Thus, ServiceInvocation gRPC response returns OK in most cases
// regardless of callee's response.
service ServiceInvocation {
// Invokes a method of the specific actor.
rpc CallActor (InternalInvokeRequest) returns (InternalInvokeResponse) {}

// Invokes a method of the specific service.
rpc CallLocal (InternalInvokeRequest) returns (InternalInvokeResponse) {}

// Invoke a remote internal actor reminder
rpc CallActorReminder(Reminder) returns (google.protobuf.Empty) {}

// Invokes a method of the specific service using a stream of data.
// Although this uses a bi-directional stream, it behaves as a "simple RPC" in which the caller sends the full request (chunked in multiple messages in the stream), then reads the full response (chunked in the stream).
// Each message in the stream contains a `InternalInvokeRequestStream` (for caller) or `InternalInvokeResponseStream` (for callee):
// - The first message in the stream MUST contain a `request` (caller) or `response` (callee) message with all required properties present.
// - The first message in the stream MAY contain a `payload`, which is not required and may be empty.
// - Subsequent messages (any message except the first one in the stream) MUST contain a `payload` and MUST NOT contain any other property (like `request` or `response`).
// - Each message with a `payload` MUST contain a sequence number in `seq`, which is a counter that starts from 0 and MUST be incremented by 1 in each chunk. The `seq` counter MUST NOT be included if the message does not have a `payload`.
// - When the sender has completed sending the data, it MUST call `CloseSend` on the stream.
// The caller and callee must send at least one message in the stream. If only 1 message is sent in each direction, that message must contain both a `request`/`response` (the `payload` may be empty).
rpc CallLocalStream (stream InternalInvokeRequestStream) returns (stream InternalInvokeResponseStream) {}
}

// Actor represents actor using actor_type and actor_id
message Actor {
// Required. The type of actor.
string actor_type = 1;

// Required. The ID of actor type (actor_type)
string actor_id = 2;
}

// InternalInvokeRequest is the message to transfer caller's data to callee
// for service invocation. This includes callee's app id and caller's request data.
message InternalInvokeRequest {
// Required. The version of Dapr runtime API.
APIVersion ver = 1;

// Required. metadata holds caller's HTTP headers or gRPC metadata.
map<string, ListStringValue> metadata = 2;

// Required. message including caller's invocation request.
common.v1.InvokeRequest message = 3;

// Actor type and id. This field is used only for
// actor service invocation.
Actor actor = 4;
}

// InternalInvokeResponse is the message to transfer callee's response to caller
// for service invocation.
message InternalInvokeResponse {
// Required. HTTP/gRPC status.
Status status = 1;

// Required. The app callback response headers.
map<string, ListStringValue> headers = 2;

// App callback response trailers.
// This will be used only for gRPC app callback
map<string, ListStringValue> trailers = 3;

// Callee's invocation response message.
common.v1.InvokeResponse message = 4;
}

// InternalInvokeRequestStream is a variant of InternalInvokeRequest used in streaming RPCs.
message InternalInvokeRequestStream {
// Request details.
// This does not contain any data in message.data.
InternalInvokeRequest request = 1;

// Chunk of data.
common.v1.StreamPayload payload = 2;
}

// InternalInvokeResponseStream is a variant of InternalInvokeResponse used in streaming RPCs.
message InternalInvokeResponseStream {
// Response details.
// This does not contain any data in message.data.
InternalInvokeResponse response = 1;

// Chunk of data.
common.v1.StreamPayload payload = 2;
}

// ListStringValue represents string value array
message ListStringValue {
// The array of string.
repeated string values = 1;
}
Loading

0 comments on commit 3a3a1a8

Please sign in to comment.