From 961ad38fa036584553d6ff97c8a8fddffe301349 Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Fri, 21 Apr 2023 11:09:54 +0600 Subject: [PATCH 1/4] fix: dummy commit Signed-off-by: Rakib Ansary --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2674075..69d3816 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,8 @@ "main": "index.js", "scripts": { "build:proto:client:nosql": "node bin/nosql-client", - "build:proto:client": "node bin/nosql-client", "build:proto:server": "node bin/server", + "build:proto:client": "node bin/nosql-client", "build:proto": "node bin/nosql-client && node bin/server", "build:app": "rimraf dist && tsc -b", "build": "yarn build:proto:client && yarn build:proto:server && yarn build:app", From 5d1ce8a5dcbe0fd49b81c0738d160820f2175602 Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Fri, 21 Apr 2023 11:16:11 +0600 Subject: [PATCH 2/4] ci: publish image to qa Signed-off-by: Rakib Ansary --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 47c370d..d7d6f55 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,7 @@ jobs: name: "Set ECR_ENV based on event type" command: | if [ "${CIRCLE_PULL_REQUEST}" != "" ]; then - export ECR_ENV="DEV" + export ECR_ENV="QA" else export ECR_ENV="PROD" fi From b8707a748ab8afbee4015608f3dce394ac632ca8 Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Fri, 21 Apr 2023 16:48:31 +0600 Subject: [PATCH 3/4] debug: add logs Signed-off-by: Rakib Ansary --- src/common/CoreOperations.ts | 3 --- src/dal/client/nosql.ts | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/common/CoreOperations.ts b/src/common/CoreOperations.ts index 3ce5065..33b8712 100644 --- a/src/common/CoreOperations.ts +++ b/src/common/CoreOperations.ts @@ -4,9 +4,6 @@ import { noSqlClient } from "../dal/client/nosql"; // TODO: Import from @topcoder-framework/lib-common import { LookupCriteria, ScanCriteria, ScanResult } from "../models/common/common"; -// TODO: Import from @topcoder-framework/lib-common -import { Value } from "../models/google/protobuf/struct"; - import { Metadata, StatusBuilder } from "@grpc/grpc-js"; import { Status } from "@grpc/grpc-js/build/src/constants"; import { diff --git a/src/dal/client/nosql.ts b/src/dal/client/nosql.ts index d4a4a97..216577f 100644 --- a/src/dal/client/nosql.ts +++ b/src/dal/client/nosql.ts @@ -5,15 +5,12 @@ import "source-map-support/register"; import { credentials, Metadata } from "@grpc/grpc-js"; import { promisify } from "util"; -import { - PartiQLQueryClient, - QueryRequest, - QueryResponse, -} from "../models/nosql/parti_ql"; +import { PartiQLQueryClient, QueryRequest, QueryResponse } from "../models/nosql/parti_ql"; class NoSQLClient { // https://github.com/grpc/grpc/blob/master/doc/keepalive.md // https://cloud.ibm.com/docs/blockchain-multicloud?topic=blockchain-multicloud-best-practices-app#best-practices-app-connections + private readonly client: PartiQLQueryClient = new PartiQLQueryClient( `${GRPC_NOSQL_SERVER_HOST}:${GRPC_NOSQL_SERVER_PORT}`, // 5051 credentials.createInsecure(), @@ -26,13 +23,18 @@ class NoSQLClient { } ); + constructor() { + console.log(`NoSQLClient: ${GRPC_NOSQL_SERVER_HOST}:${GRPC_NOSQL_SERVER_PORT}`); + } + public async query( param: QueryRequest, metadata: Metadata = new Metadata() ): Promise { - return promisify( - this.client.query.bind(this.client) - )(param, metadata); + return promisify(this.client.query.bind(this.client))( + param, + metadata + ); } } From eb42e8661f4817e81c11b58769090d2a7b2ddb2c Mon Sep 17 00:00:00 2001 From: Rakib Ansary Date: Fri, 21 Apr 2023 16:54:52 +0600 Subject: [PATCH 4/4] ci: publish image to dev Signed-off-by: Rakib Ansary --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d7d6f55..47c370d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,7 @@ jobs: name: "Set ECR_ENV based on event type" command: | if [ "${CIRCLE_PULL_REQUEST}" != "" ]; then - export ECR_ENV="QA" + export ECR_ENV="DEV" else export ECR_ENV="PROD" fi