Skip to content

Commit 37937b3

Browse files
shubham1172shubham1172
authored
[release-3.3] chore(release): Prepare for v3.3.1 release (#583)
* fix(proto): update gRPC requests to use the correct request parameters (#581) * See if actions break Signed-off-by: Shubham Sharma <[email protected]> * Update getMetadata and shutdown usage Signed-off-by: Shubham Sharma <[email protected]> * Fix lint Signed-off-by: Shubham Sharma <[email protected]> * Lint Signed-off-by: Shubham Sharma <[email protected]> * Revert temp change Signed-off-by: Shubham Sharma <[email protected]> * Remove a test Signed-off-by: Shubham Sharma <[email protected]> * Lint Signed-off-by: Shubham Sharma <[email protected]> --------- Signed-off-by: Shubham Sharma <[email protected]> * chore(release): Prepare for v3.3.1 release (#582) Bump package version; Signed-off-by: Shubham Sharma <[email protected]> --------- Signed-off-by: Shubham Sharma <[email protected]>
1 parent 690b053 commit 37937b3

File tree

8 files changed

+29
-26
lines changed

8 files changed

+29
-26
lines changed

‎package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "@dapr/dapr",
3-
"version": "3.3.0",
3+
"version": "3.3.1",
44
"description": "The official Dapr (https://dapr.io) SDK for Node.js",
55
"types": "./build/index.d.ts",
66
"scripts": {
77
"test": "npm run test:unit:all && npm run test:e2e:all",
88
"test:load": "jest --runInBand --detectOpenHandles",
99
"test:load:http": "TEST_SECRET_1=secret_val_1 TEST_SECRET_2=secret_val_2 dapr run --app-id test-suite --app-protocol http --app-port 50001 --dapr-http-port 50000 --components-path ./test/components -- npm run test:load 'test/load'",
1010
"test:e2e": "jest --runInBand --detectOpenHandles",
11-
"test:e2e:all": "npm run test:e2e:http; npm run test:e2e:grpc; npm run test:e2e:common; npm run test:e2e:workflow",
11+
"test:e2e:all": "npm run test:e2e:http && npm run test:e2e:grpc && npm run test:e2e:common && npm run test:e2e:workflow",
1212
"test:e2e:grpc": "npm run test:e2e:grpc:client && npm run test:e2e:grpc:server && npm run test:e2e:grpc:clientWithApiToken",
1313
"test:e2e:grpc:client": "npm run prebuild && TEST_SECRET_1=secret_val_1 TEST_SECRET_2=secret_val_2 dapr run --app-id test-suite --app-protocol grpc --app-port 50001 --dapr-grpc-port 50000 --components-path ./test/components -- jest --runInBand --detectOpenHandles --testMatch [ '**/test/e2e/grpc/*client.test.ts' ]",
1414
"test:e2e:grpc:clientWithApiToken": "npm run prebuild && TEST_SECRET_1=secret_val_1 TEST_SECRET_2=secret_val_2 DAPR_API_TOKEN=test dapr run --app-id test-suite --app-protocol grpc --app-port 50001 --dapr-grpc-port 50000 --components-path ./test/components -- jest --runInBand --detectOpenHandles --testMatch [ '**/test/e2e/grpc/clientWithApiToken.test.ts' ]",

‎src/actors/client/ActorClient/ActorClientGRPC.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ See the License for the specific language governing permissions and
1111
limitations under the License.
1212
*/
1313

14-
import { Empty } from "google-protobuf/google/protobuf/empty_pb";
1514
import { Any } from "google-protobuf/google/protobuf/any_pb";
1615
import {
1716
ExecuteActorStateTransactionRequest,
1817
GetActorStateRequest,
1918
GetActorStateResponse,
19+
GetMetadataRequest,
2020
GetMetadataResponse,
2121
InvokeActorRequest,
2222
InvokeActorResponse,
@@ -279,7 +279,7 @@ export default class ActorClientGRPC implements IClientActor {
279279
const client = await this.client.getClient();
280280

281281
return new Promise((resolve, reject) => {
282-
client.getMetadata(new Empty(), (err, res: GetMetadataResponse) => {
282+
client.getMetadata(new GetMetadataRequest(), (err, res: GetMetadataResponse) => {
283283
if (err) {
284284
return reject(err);
285285
}

‎src/implementation/Client/GRPCClient/health.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ limitations under the License.
1313

1414
import GRPCClient from "./GRPCClient";
1515
import IClientHealth from "../../../interfaces/Client/IClientHealth";
16-
import { GetMetadataResponse } from "../../../proto/dapr/proto/runtime/v1/dapr_pb";
17-
import { Empty } from "google-protobuf/google/protobuf/empty_pb";
16+
import { GetMetadataRequest, GetMetadataResponse } from "../../../proto/dapr/proto/runtime/v1/dapr_pb";
1817

1918
// https://docs.dapr.io/reference/api/health_api/
2019
export default class GRPCClientHealth implements IClientHealth {
@@ -30,7 +29,7 @@ export default class GRPCClientHealth implements IClientHealth {
3029

3130
return new Promise((resolve, _reject) => {
3231
try {
33-
client.getMetadata(new Empty(), (err, _res: GetMetadataResponse) => {
32+
client.getMetadata(new GetMetadataRequest(), (err, _res: GetMetadataResponse) => {
3433
if (err) {
3534
return resolve(false);
3635
}

‎src/implementation/Client/GRPCClient/metadata.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ limitations under the License.
1212
*/
1313

1414
import GRPCClient from "./GRPCClient";
15-
import { GetMetadataResponse, SetMetadataRequest } from "../../../proto/dapr/proto/runtime/v1/dapr_pb";
15+
import {
16+
GetMetadataRequest,
17+
GetMetadataResponse,
18+
SetMetadataRequest,
19+
} from "../../../proto/dapr/proto/runtime/v1/dapr_pb";
1620
import { Empty } from "google-protobuf/google/protobuf/empty_pb";
1721
import IClientMetadata from "../../../interfaces/Client/IClientMetadata";
1822
import { GetMetadataResponse as GetMetadataResponseResult } from "../../../types/metadata/GetMetadataResponse";
@@ -30,7 +34,7 @@ export default class GRPCClientMetadata implements IClientMetadata {
3034
const client = await this.client.getClient();
3135

3236
return new Promise((resolve, reject) => {
33-
client.getMetadata(new Empty(), (err, res: GetMetadataResponse) => {
37+
client.getMetadata(new GetMetadataRequest(), (err, res: GetMetadataResponse) => {
3438
if (err) {
3539
return reject(err);
3640
}

‎src/implementation/Client/GRPCClient/sidecar.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ limitations under the License.
1313

1414
import GRPCClient from "./GRPCClient";
1515
import IClientSidecar from "../../../interfaces/Client/IClientSidecar";
16-
import { GetMetadataResponse } from "../../../proto/dapr/proto/runtime/v1/dapr_pb";
16+
import { GetMetadataRequest, GetMetadataResponse, ShutdownRequest } from "../../../proto/dapr/proto/runtime/v1/dapr_pb";
1717
import { Empty } from "google-protobuf/google/protobuf/empty_pb";
1818

1919
// https://docs.dapr.io/reference/api/secrets_api/
@@ -28,7 +28,7 @@ export default class GRPCClientSidecar implements IClientSidecar {
2828
const client = await this.client.getClient();
2929

3030
return new Promise((resolve, reject) => {
31-
client.shutdown(new Empty(), (err, _res: Empty) => {
31+
client.shutdown(new ShutdownRequest(), (err, _res: Empty) => {
3232
if (err) {
3333
return reject(err);
3434
}
@@ -43,7 +43,7 @@ export default class GRPCClientSidecar implements IClientSidecar {
4343

4444
return new Promise((resolve, _reject) => {
4545
try {
46-
callClient.getMetadata(new Empty(), (err, _res: GetMetadataResponse) => {
46+
callClient.getMetadata(new GetMetadataRequest(), (err, _res: GetMetadataResponse) => {
4747
if (err) {
4848
return resolve(false);
4949
}

‎test/e2e/grpc/client.test.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import { CommunicationProtocolEnum, DaprClient, LogLevel } from "../../../src";
2020
import { SubscribeConfigurationResponse } from "../../../src/types/configuration/SubscribeConfigurationResponse";
2121
import * as DockerUtils from "../../utils/DockerUtil";
2222
import { DaprClient as DaprClientGrpc } from "../../../src/proto/dapr/proto/runtime/v1/dapr_grpc_pb";
23-
import { Empty } from "google-protobuf/google/protobuf/empty_pb";
2423
import { NextCall } from "@grpc/grpc-js/build/src/client-interceptors";
24+
import { GetMetadataRequest } from "../../../src/proto/dapr/proto/runtime/v1/dapr_pb";
2525

2626
const daprHost = "localhost";
2727
const daprPort = "50000"; // Dapr Sidecar Port of this Example Server
@@ -76,7 +76,7 @@ describe("grpc/client", () => {
7676
interceptors: [mockInterceptor],
7777
});
7878

79-
await new Promise((resolve) => clientProxy.getMetadata(new Empty(), resolve));
79+
await new Promise((resolve) => clientProxy.getMetadata(new GetMetadataRequest(), resolve));
8080

8181
expect(mockInterceptor.mock.calls.length).toBe(1);
8282
expect(mockMetadataRes.get("dapr-app-id")[0]).toBe("test-suite");
@@ -104,7 +104,7 @@ describe("grpc/client", () => {
104104
interceptors: [mockInterceptor],
105105
});
106106

107-
await new Promise((resolve) => clientProxy.getMetadata(new Empty(), resolve));
107+
await new Promise((resolve) => clientProxy.getMetadata(new GetMetadataRequest(), resolve));
108108

109109
expect(mockInterceptor.mock.calls.length).toBe(1);
110110
expect(mockMetadataRes.get("dapr-app-id")[0]).toBe(process.env.APP_ID);
@@ -362,13 +362,13 @@ describe("grpc/client", () => {
362362
expect(config.items["myconfigkey3"].value == "key3_initialvalue");
363363
});
364364

365-
it("should be able to get the configuration items with metadata", async () => {
366-
const conf = await client.configuration.get("config-redis", ["myconfigkey1"], {
367-
hello: "world",
368-
});
369-
370-
expect(conf.items["myconfigkey1"].metadata).toHaveProperty("hello");
371-
});
365+
// todo: enable this once we have a component to test this with.
366+
// Redis does not support metadata, PG and Azure App Config do.
367+
// it("should be able to get the configuration items with metadata", async () => {
368+
// const conf = await client.configuration.get("config-redis", ["myconfigkey1"], {
369+
// hello: "world",
370+
// });
371+
// });
372372

373373
it("should be able to subscribe to configuration item changes on all keys", async () => {
374374
const m = jest.fn(async (_res: SubscribeConfigurationResponse) => {

‎test/e2e/grpc/clientWithApiToken.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ limitations under the License.
1414
import * as grpc from "@grpc/grpc-js";
1515
import { CommunicationProtocolEnum, DaprClient, LogLevel } from "../../../src";
1616
import { DaprClient as DaprClientGrpc } from "../../../src/proto/dapr/proto/runtime/v1/dapr_grpc_pb";
17-
import { Empty } from "google-protobuf/google/protobuf/empty_pb";
1817
import { NextCall } from "@grpc/grpc-js/build/src/client-interceptors";
18+
import { GetMetadataRequest } from "../../../src/proto/dapr/proto/runtime/v1/dapr_pb";
1919

2020
const daprHost = "localhost";
2121
const daprPort = "50000"; // Dapr Sidecar Port of this Example Server
@@ -50,7 +50,7 @@ describe("grpc/client with api token", () => {
5050
interceptors: [mockInterceptor],
5151
});
5252

53-
await new Promise((resolve) => clientProxy.getMetadata(new Empty(), resolve));
53+
await new Promise((resolve) => clientProxy.getMetadata(new GetMetadataRequest(), resolve));
5454
expect(mockMetadataRes.get("dapr-api-token")[0]).toBe("test");
5555
});
5656
});

0 commit comments

Comments
 (0)