From a51dbb7a0143a0b0db0e4e5fc014dfe009b668e4 Mon Sep 17 00:00:00 2001 From: Pratap2018 Date: Wed, 6 Mar 2024 13:29:27 +0530 Subject: [PATCH] update --- .github/workflows/pipeline.yaml | 10 +++++----- src/routes/auth.ts | 2 +- src/routes/edvRoutes.ts | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pipeline.yaml b/.github/workflows/pipeline.yaml index 80de35a..24f3b09 100644 --- a/.github/workflows/pipeline.yaml +++ b/.github/workflows/pipeline.yaml @@ -43,13 +43,13 @@ jobs: GOOGLE_ARTIFACT_REPO: ${{secrets.GOOGLE_ARTIFACT_REPO}} HYPERSIGN_JSON: ${{secrets.HYPERSIGN_JSON}} run: - docker build -t $GOOGLE_ARTIFACT_URL/$GOOGLE_PROJECT_ID/$GOOGLE_ARTIFACT_REPO/auth-server:v5.4.0-rc.3 . + docker build -t $GOOGLE_ARTIFACT_URL/$GOOGLE_PROJECT_ID/$GOOGLE_ARTIFACT_REPO/auth-server:v5.4.0-rc.4 . - docker push $GOOGLE_ARTIFACT_URL/$GOOGLE_PROJECT_ID/$GOOGLE_ARTIFACT_REPO/auth-server:v5.4.0-rc.3 + docker push $GOOGLE_ARTIFACT_URL/$GOOGLE_PROJECT_ID/$GOOGLE_ARTIFACT_REPO/auth-server:v5.4.0-rc.4 - docker build -t $GOOGLE_ARTIFACT_URL/$GOOGLE_PROJECT_ID/$GOOGLE_ARTIFACT_REPO/auth-server-txn:v5.4.0-rc.3 . -f Txn.Dockerfile + docker build -t $GOOGLE_ARTIFACT_URL/$GOOGLE_PROJECT_ID/$GOOGLE_ARTIFACT_REPO/auth-server-txn:v5.4.0-rc.4 . -f Txn.Dockerfile - docker push $GOOGLE_ARTIFACT_URL/$GOOGLE_PROJECT_ID/$GOOGLE_ARTIFACT_REPO/auth-server-txn:v5.4.0-rc.3 + docker push $GOOGLE_ARTIFACT_URL/$GOOGLE_PROJECT_ID/$GOOGLE_ARTIFACT_REPO/auth-server-txn:v5.4.0-rc.4 Deploy-Pipeline: needs: [Build-Pipeline] @@ -76,7 +76,7 @@ jobs: - name: "Configure kubectl" run: gcloud container clusters get-credentials hypermine-gke --region=asia-south1 - name: Replace tags - run: find .deploy/deployment.yaml -type f -exec sed -i -e "s#__LATEST_RELEASE_TAG__#v5.4.0-rc.3#" {} \; + run: find .deploy/deployment.yaml -type f -exec sed -i -e "s#__LATEST_RELEASE_TAG__#v5.4.0-rc.4#" {} \; - name: "Replace secrets" run: find .deploy/deployment.yaml -type f -exec sed -i ''s/__GOOGLE_ARTIFACT_URL__/${{ secrets.GOOGLE_ARTIFACT_URL }}/g'' {} \; diff --git a/src/routes/auth.ts b/src/routes/auth.ts index b635dad..0d8cc7a 100644 --- a/src/routes/auth.ts +++ b/src/routes/auth.ts @@ -110,7 +110,7 @@ export = (hypersign: IHypersignAuth, edvClient) => { userId: user.email, sequence: 0, docId: "", - nameSpace: user.nameSpace || "default", + nameSpace: user.nameSpace?user.nameSpace: "default", } as IUserModel; diff --git a/src/routes/edvRoutes.ts b/src/routes/edvRoutes.ts index 891e06c..cb5bcd2 100644 --- a/src/routes/edvRoutes.ts +++ b/src/routes/edvRoutes.ts @@ -73,7 +73,7 @@ export = (hypersign, edvClient) => { try { const { user, document } = req.body; const userData: IUserModel = user as IUserModel; - userData.nameSpace = user.nameSpace || "default"; + userData.nameSpace = user.nameSpace ? user.nameSpace : "default"; let response: IUserModel; let status = 201;