Fixes tests

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

Author: elena-kolevska

src/implementation/Client/DaprClient.ts

@@ -103,6 +103,8 @@ export default class DaprClient {
     switch (options.communicationProtocol) {
       case CommunicationProtocolEnum.GRPC: {
         const client = new GRPCClient(this.options);
+        this.options.daprHost = client.options.daprHost;
+        this.options.daprPort = client.options.daprPort;
         this.daprClient = client;
 
         this.state = new GRPCClientState(client);
@@ -124,6 +126,8 @@ export default class DaprClient {
       case CommunicationProtocolEnum.HTTP:
       default: {
         const client = new HTTPClient(this.options);
+        this.options.daprHost = client.options.daprHost;
+        this.options.daprPort = client.options.daprPort;
         this.daprClient = client;
 
         this.actor = new HTTPClientActor(client); // we use an abstractor here since we interface through a builder with the Actor Runtime

src/implementation/Client/HTTPClient/HTTPClient.ts

@@ -83,8 +83,8 @@ export default class HTTPClient implements IClient {
       host = options?.daprHost ?? Settings.getDefaultHost();
       port = options?.daprPort ?? Settings.getDefaultPort(communicationProtocolEnum.HTTP);
       uri = `${host}:${port}`;
-    } else if (Settings.getDefaultGrpcEndpoint() != "") {
-      uri = Settings.getDefaultGrpcEndpoint();
+    } else if (Settings.getDefaultHttpEndpoint() != "") {
+      uri = Settings.getDefaultHttpEndpoint();
     }
 
     return new HttpEndpoint(uri);

src/implementation/Server/DaprServer.ts

@@ -48,31 +48,38 @@ export default class DaprServer {
   constructor(serverOptions: Partial<DaprServerOptions> = {}) {
     const communicationProtocol = serverOptions.communicationProtocol ?? Settings.getDefaultCommunicationProtocol();
     const clientOptions = getClientOptions(serverOptions.clientOptions, communicationProtocol, serverOptions?.logger);
+
+    // Legacy validation on port
+    // URI validation is done later, when we instantiate the HttpEndpoint or GrpcEndpoint
+    // object in the HttpClient or GrpcClient constructor, but we need to
+    // keep this additional check for backward compatibility
+    // TODO: Remove this validation in the next major version
+    if (clientOptions?.daprPort && !/^[0-9]+$/.test(clientOptions?.daprPort)) {
+      throw new Error("DAPR_INCORRECT_SIDECAR_PORT");
+    }
+
+    this.client = new DaprClient(clientOptions);
+
     this.serverOptions = {
       serverHost: serverOptions.serverHost ?? Settings.getDefaultHost(),
       serverPort: serverOptions.serverPort ?? Settings.getDefaultAppPort(communicationProtocol),
       communicationProtocol: communicationProtocol,
       maxBodySizeMb: serverOptions.maxBodySizeMb,
       serverHttp: serverOptions.serverHttp,
-      clientOptions: clientOptions,
+      clientOptions: this.client.options,
       logger: serverOptions.logger,
     };
     // Create a client to interface with the sidecar from the server side
-    this.client = new DaprClient(clientOptions);
 
     // If DAPR_SERVER_PORT was not set, we set it
     process.env.DAPR_SERVER_PORT = this.serverOptions.serverPort;
-    process.env.DAPR_CLIENT_PORT = clientOptions.daprPort;
+    process.env.DAPR_CLIENT_PORT = this.client.options.daprPort;
 
     // Validation on port
     if (!/^[0-9]+$/.test(this.serverOptions.serverPort)) {
       throw new Error("DAPR_INCORRECT_SERVER_PORT");
     }
 
-    if (clientOptions?.daprPort && !/^[0-9]+$/.test(clientOptions?.daprPort)) {
-      throw new Error("DAPR_INCORRECT_SIDECAR_PORT");
-    }
-
     // Builder
     switch (serverOptions.communicationProtocol) {
       case CommunicationProtocolEnum.GRPC: {

test/e2e/common/client.test.ts

@@ -21,7 +21,6 @@ import {
 } from "../../../src";
 import { sleep } from "../../../src/utils/NodeJS.util";
 import { LockStatus } from "../../../src/types/lock/UnlockResponse";
-import { Settings } from "../../../src/utils/Settings.util";
 
 const daprHost = "127.0.0.1";
 const daprGrpcPort = "50000";
@@ -558,128 +557,3 @@ describe("common/client", () => {
     });
   });
 });
-
-describe("http/client with environment variables", () => {
-  let client: DaprClient;
-
-  // We need to start listening on some endpoints already
-  // this because Dapr is not dynamic and registers endpoints on boot
-  // we put a timeout of 10s since it takes around 4s for Dapr to boot up
-
-  afterAll(async () => {
-    await client.stop();
-  });
-
-  it("should give preference to host and port in constructor arguments over endpoint environment variables ", async () => {
-    process.env.DAPR_HTTP_ENDPOINT = "https://httpdomain.com";
-    process.env.DAPR_GRPC_ENDPOINT = "https://grpcdomain.com";
-
-    client = new DaprClient({
-      daprHost,
-      daprPort: daprHttpPort,
-      communicationProtocol: CommunicationProtocolEnum.HTTP,
-      isKeepAlive: false,
-    });
-
-    expect(client.options.daprHost).toEqual(daprHost);
-    expect(client.options.daprPort).toEqual(daprHttpPort);
-
-    client = new DaprClient({
-      daprHost,
-      daprPort: daprGrpcPort,
-      communicationProtocol: CommunicationProtocolEnum.GRPC,
-      isKeepAlive: false,
-    });
-
-    expect(client.options.daprHost).toEqual(daprHost);
-    expect(client.options.daprPort).toEqual(daprGrpcPort);
-  });
-
-  it("should give preference to port with no host in constructor arguments over environment variables ", async () => {
-    process.env.DAPR_HTTP_ENDPOINT = "https://httpdomain.com";
-    process.env.DAPR_GRPC_ENDPOINT = "https://grpcdomain.com";
-
-    client = new DaprClient({
-      daprPort: daprHttpPort,
-      communicationProtocol: CommunicationProtocolEnum.HTTP,
-      isKeepAlive: false,
-    });
-
-    expect(client.options.daprHost).toEqual(Settings.getDefaultHost());
-    expect(client.options.daprPort).toEqual(daprHttpPort);
-
-    client = new DaprClient({
-      daprPort: daprGrpcPort,
-      communicationProtocol: CommunicationProtocolEnum.GRPC,
-      isKeepAlive: false,
-    });
-
-    expect(client.options.daprHost).toEqual(Settings.getDefaultHost());
-    expect(client.options.daprPort).toEqual(daprGrpcPort);
-  });
-
-  it("should give preference to host with no port in constructor arguments over environment variables ", async () => {
-    process.env.DAPR_HTTP_ENDPOINT = "https://httpdomain.com";
-    process.env.DAPR_GRPC_ENDPOINT = "https://grpcdomain.com";
-
-    client = new DaprClient({
-      daprHost: daprHost,
-      communicationProtocol: CommunicationProtocolEnum.HTTP,
-      isKeepAlive: false,
-    });
-
-    expect(client.options.daprHost).toEqual(daprHost);
-    expect(client.options.daprPort).toEqual(Settings.getDefaultPort(CommunicationProtocolEnum.HTTP));
-
-    client = new DaprClient({
-      daprHost: daprHost,
-      communicationProtocol: CommunicationProtocolEnum.GRPC,
-      isKeepAlive: false,
-    });
-
-    expect(client.options.daprHost).toEqual(daprHost);
-    expect(client.options.daprPort).toEqual(Settings.getDefaultPort(CommunicationProtocolEnum.GRPC));
-  });
-
-  it("should use environment variable endpoint for HTTP", async () => {
-    process.env.DAPR_HTTP_ENDPOINT = "https://httpdomain.com";
-    client = new DaprClient({
-      communicationProtocol: CommunicationProtocolEnum.HTTP,
-      isKeepAlive: false,
-    });
-
-    expect(client.options.daprHost).toEqual("https://httpdomain.com");
-    expect(client.options.daprPort).toEqual("443");
-  });
-
-  it("should use environment variable endpoint for GRPC", async () => {
-    process.env.DAPR_GRPC_ENDPOINT = "https://grpcdomain.com";
-    client = new DaprClient({
-      communicationProtocol: CommunicationProtocolEnum.GRPC,
-      isKeepAlive: false,
-    });
-
-    expect(client.options.daprHost).toEqual("https://grpcdomain.com");
-    expect(client.options.daprPort).toEqual("443");
-  });
-
-  it("should use default host and port when no other parameters provided", async () => {
-    process.env.DAPR_HTTP_ENDPOINT = "";
-    process.env.DAPR_GRPC_ENDPOINT = "";
-    client = new DaprClient({
-      communicationProtocol: CommunicationProtocolEnum.HTTP,
-      isKeepAlive: false,
-    });
-
-    expect(client.options.daprHost).toEqual(Settings.getDefaultHost());
-    expect(client.options.daprPort).toEqual(Settings.getDefaultPort(CommunicationProtocolEnum.HTTP));
-
-    client = new DaprClient({
-      communicationProtocol: CommunicationProtocolEnum.GRPC,
-      isKeepAlive: false,
-    });
-
-    expect(client.options.daprHost).toEqual(Settings.getDefaultHost());
-    expect(client.options.daprPort).toEqual(Settings.getDefaultPort(CommunicationProtocolEnum.GRPC));
-  });
-});