From 1ddc601c3ba03b5ca162921f4c10780bbd4f6026 Mon Sep 17 00:00:00 2001 From: catherine meng Date: Mon, 18 Jul 2022 12:19:48 -0700 Subject: [PATCH] feat/pipeline: update project abbreviation name; temporary disabled oracle connection in backend --- .github/openshift/deploy.backend.yml | 4 ++-- .github/openshift/deploy.database.yml | 4 ++-- .github/openshift/deploy.frontend.yml | 4 ++-- .github/openshift/networkPolicies.yml | 2 +- .github/workflows/merge-dev.yml | 2 +- .github/workflows/merge-main.yml | 2 +- .github/workflows/pr-close.yml | 2 +- .github/workflows/pr-open.yml | 2 +- backend/src/app.module.ts | 24 ++++++++++++------------ 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/openshift/deploy.backend.yml b/.github/openshift/deploy.backend.yml index 40b5d40308..aa53c5dc4f 100644 --- a/.github/openshift/deploy.backend.yml +++ b/.github/openshift/deploy.backend.yml @@ -4,7 +4,7 @@ metadata: name: ${NAME} annotations: description: "Nr-Old-Growth" - tags: "nrfl" + tags: "nrfc" iconClass: icon-js labels: app: ${NAME}-${ZONE} @@ -12,7 +12,7 @@ labels: parameters: - name: NAME description: Module name - value: nrfl + value: nrfc - name: COMPONENT description: Component name value: backend diff --git a/.github/openshift/deploy.database.yml b/.github/openshift/deploy.database.yml index 5f8ac8c2c5..9813745ae4 100644 --- a/.github/openshift/deploy.database.yml +++ b/.github/openshift/deploy.database.yml @@ -4,7 +4,7 @@ metadata: name: ${NAME} annotations: description: "Nr-Old-Growth" - tags: "nrfl" + tags: "nrfc" iconClass: icon-js labels: app: ${NAME}-${ZONE} @@ -12,7 +12,7 @@ labels: parameters: - name: NAME description: Product name - value: nrfl + value: nrfc - name: COMPONENT description: Component name value: database diff --git a/.github/openshift/deploy.frontend.yml b/.github/openshift/deploy.frontend.yml index ac9ab63258..83250e764a 100644 --- a/.github/openshift/deploy.frontend.yml +++ b/.github/openshift/deploy.frontend.yml @@ -4,7 +4,7 @@ metadata: name: ${NAME} annotations: description: "Nr-Old-Growth" - tags: "nrfl" + tags: "nrfc" iconClass: icon-js labels: app: ${NAME}-${ZONE} @@ -12,7 +12,7 @@ labels: parameters: - name: NAME description: Module name - value: nrfl + value: nrfc - name: COMPONENT description: Component name value: frontend diff --git a/.github/openshift/networkPolicies.yml b/.github/openshift/networkPolicies.yml index 77e6455cdd..05be17c737 100644 --- a/.github/openshift/networkPolicies.yml +++ b/.github/openshift/networkPolicies.yml @@ -4,7 +4,7 @@ metadata: name: ${NAME} annotations: description: "NR-Forest-Client" - tags: "nrfl" + tags: "nrfc" iconClass: icon-js objects: - apiVersion: networking.k8s.io/v1 diff --git a/.github/workflows/merge-dev.yml b/.github/workflows/merge-dev.yml index 5a1ef43072..cd69c3257e 100644 --- a/.github/workflows/merge-dev.yml +++ b/.github/workflows/merge-dev.yml @@ -7,7 +7,7 @@ on: env: REGISTRY: ghcr.io - NAME: nrfl + NAME: nrfc jobs: codeql: diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml index e0cf1fe0f4..de9127853f 100644 --- a/.github/workflows/merge-main.yml +++ b/.github/workflows/merge-main.yml @@ -7,7 +7,7 @@ on: env: REGISTRY: ghcr.io - NAME: nrfl + NAME: nrfc jobs: codeql: diff --git a/.github/workflows/pr-close.yml b/.github/workflows/pr-close.yml index dcf819483c..d1e09f71a9 100644 --- a/.github/workflows/pr-close.yml +++ b/.github/workflows/pr-close.yml @@ -9,7 +9,7 @@ on: - dev env: - NAME: nrfl + NAME: nrfc jobs: cleanup-openshift: diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml index 472142fa7e..a7390a56e5 100644 --- a/.github/workflows/pr-open.yml +++ b/.github/workflows/pr-open.yml @@ -8,7 +8,7 @@ on: env: REGISTRY: ghcr.io - NAME: nrfl + NAME: nrfc jobs: check-backend: diff --git a/backend/src/app.module.ts b/backend/src/app.module.ts index fb8322bae7..d8bddd5f54 100644 --- a/backend/src/app.module.ts +++ b/backend/src/app.module.ts @@ -8,18 +8,18 @@ import { ClientPublicModule } from './clientpublic/clientPublic.module'; @Module({ imports: [ ConfigModule.forRoot(), - TypeOrmModule.forRoot({ - type: 'oracle', - host: process.env.ORACLEDB_HOST || 'localhost', - port: 1521, - serviceName: process.env.ORACLEDB_SERVICENAME, - database: process.env.ORACLEDB_DATABASE || 'postgres', - username: process.env.ORACLEDB_USER || 'postgres', - password: process.env.ORACLEDB_PASSWORD, - autoLoadEntities: true, // Auto load all entities regiestered by typeorm forFeature method. - synchronize: false, // This changes the DB schema to match changes to entities, which we might not want. - }), - ClientPublicModule, + // TypeOrmModule.forRoot({ + // type: 'oracle', + // host: process.env.ORACLEDB_HOST || 'localhost', + // port: 1521, + // serviceName: process.env.ORACLEDB_SERVICENAME, + // database: process.env.ORACLEDB_DATABASE || 'postgres', + // username: process.env.ORACLEDB_USER || 'postgres', + // password: process.env.ORACLEDB_PASSWORD, + // autoLoadEntities: true, // Auto load all entities regiestered by typeorm forFeature method. + // synchronize: false, // This changes the DB schema to match changes to entities, which we might not want. + // }), + // ClientPublicModule, ], controllers: [AppController], providers: [AppService],