Skip to content

Commit

Permalink
Merge pull request #123 from bcgov/development
Browse files Browse the repository at this point in the history 
Merge to master
  • Loading branch information
@sumesh-aot
sumesh-aot authored Oct 30, 2019
2 parents 45cc11f + f5529cc commit 951f63c
Show file tree
Hide file tree
Showing 63 changed files with 1,500 additions and 2,283 deletions.
36 changes: 8 additions & 28 deletions .github/PULL_REQUEST_TEMPLATE.md
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,13 @@
*Issue #:*
https://github.com/bcgov/entity/issues/<Put the github issue number here>

*Description of changes:*

*API Code Review Checklist:*
- #### Common
- [ ] Proper naming conventions followed on variables, classes, definitions etc.
- [ ] Proper logging levels are used in the code
- #### REST
- [ ] Endpoints follows agreed pattern and organized around resources
- [ ] Conform to http semantics
- [ ] Proper filtering and pagination is provided for large amounts of data
- #### Code structure
- [ ] Resources is used for request payload processing, validations, response codes, messages etc.
- [ ] Service is used for business logic, 3rd party communication management. Maintains proper folder structure.
- [ ] Model is used for database models.
- [ ] Schemas is used for json schema
- [ ] Util contains commonly used utility functions, constants
- #### Test Cases
- [ ] Unit test cases with happy and sad path for service, model (?) layers
- [ ] Endpoints test cases with happy and sad path for resources
- [ ] Mocking of services (mainly 3rd party dependencies) provided if applicable
- [ ] Postman collection tests provided for endpoints with happy path
- #### Code Quality
- [ ] Proper code coverage for all the layers (percentage 80, 90 ?)
- [ ] Linting
- #### DB Migrations
- [ ] Alembic is used to manage database migration. [Reference](https://github.com/bcgov/namex/blob/master/docs/database.md)
*Checklist:*
I confirm that below checklist items are addressed in this pull request; (check the boxes applicable)
- [ ] No lint errors
- [ ] No test case failures and proper coverage for all modules/classes
- [ ] Updated the deployment configs for new environment variable(s)
- [ ] Updated the postman collection in entity repository (https://github.com/bcgov/entity/tree/master/api-e2e/postman) for e2e tests


*UI Code Review Checklist:*

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of the namex license (Apache 2.0).
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of the sbc-pay license (Apache 2.0).
192 changes: 4 additions & 188 deletions jobs/update-stale-payment/openshift/cron-update-stale-payment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,169 +90,9 @@ objects:
configMapKeyRef:
name: '${DATABASE_NAME}-${TAG_NAME}-config'
key: DATABASE_TEST_PORT
-
name: JWT_OIDC_ALGORITHMS
valueFrom:
secretKeyRef:
name: '${KEYCLOAK_NAME}-${TAG_NAME}-secret'
key: JWT_OIDC_ALGORITHMS
-
name: JWT_OIDC_AUDIENCE
valueFrom:
secretKeyRef:
name: '${KEYCLOAK_NAME}-${TAG_NAME}-secret'
key: JWT_OIDC_AUDIENCE
-
name: JWT_OIDC_CLIENT_SECRET
valueFrom:
secretKeyRef:
name: '${KEYCLOAK_NAME}-${TAG_NAME}-secret'
key: JWT_OIDC_CLIENT_SECRET
-
name: JWT_OIDC_WELL_KNOWN_CONFIG
valueFrom:
secretKeyRef:
name: '${KEYCLOAK_NAME}-${TAG_NAME}-secret'
key: JWT_OIDC_WELL_KNOWN_CONFIG
-
name: JWT_OIDC_JWKS_CACHE_TIMEOUT
valueFrom:
secretKeyRef:
name: '${KEYCLOAK_NAME}-${TAG_NAME}-secret'
key: JWT_OIDC_JWKS_CACHE_TIMEOUT
-
name: PAYBC_BASE_URL
valueFrom:
secretKeyRef:
name: '${PAYBC_NAME}-${TAG_NAME}-secret'
key: PAYBC_BASE_URL
-
name: PAYBC_CLIENT_ID
valueFrom:
secretKeyRef:
name: '${PAYBC_NAME}-${TAG_NAME}-secret'
key: PAYBC_CLIENT_ID
-
name: PAYBC_CLIENT_SECRET
valueFrom:
secretKeyRef:
name: '${PAYBC_NAME}-${TAG_NAME}-secret'
key: PAYBC_CLIENT_SECRET
-
name: PAYBC_MEMO_LINE_NAME
valueFrom:
secretKeyRef:
name: '${PAYBC_NAME}-${TAG_NAME}-secret'
key: PAYBC_MEMO_LINE_NAME
-
name: PAYBC_PORTAL_URL
valueFrom:
secretKeyRef:
name: '${PAYBC_NAME}-${TAG_NAME}-secret'
key: PAYBC_PORTAL_URL
-
name: PAYBC_CONNECT_TIMEOUT
valueFrom:
secretKeyRef:
name: '${PAYBC_NAME}-${TAG_NAME}-secret'
key: PAYBC_CONNECT_TIMEOUT

-
name: PAYBC_GENERATE_RANDOM_INVOICE_NUMBER
valueFrom:
secretKeyRef:
name: '${PAYBC_NAME}-${TAG_NAME}-secret'
key: PAYBC_GENERATE_RANDOM_INVOICE_NUMBER
-
name: BCOL_DEBIT_ACCOUNT_VERSION
valueFrom:
secretKeyRef:
name: '${BCOL_NAME}-${TAG_NAME}-secret'
key: BCOL_DEBIT_ACCOUNT_VERSION
-
name: BCOL_LDAP_SERVER
valueFrom:
secretKeyRef:
name: '${BCOL_NAME}-${TAG_NAME}-secret'
key: BCOL_LDAP_SERVER
-
name: BCOL_LDAP_USER_DN_PATTERN
valueFrom:
secretKeyRef:
name: '${BCOL_NAME}-${TAG_NAME}-secret'
key: BCOL_LDAP_USER_DN_PATTERN
-
name: BCOL_LINK_CODE
valueFrom:
secretKeyRef:
name: '${BCOL_NAME}-${TAG_NAME}-secret'
key: BCOL_LINK_CODE
-
name: BCOL_QUERY_PROFILE_WSDL_URL
valueFrom:
secretKeyRef:
name: '${BCOL_NAME}-${TAG_NAME}-secret'
key: BCOL_QUERY_PROFILE_WSDL_URL
-
name: BCOL_VERIFY_USER_WSDL_URL
valueFrom:
secretKeyRef:
name: '${BCOL_NAME}-${TAG_NAME}-secret'
key: BCOL_VERIFY_USER_WSDL_URL
-
name: REPORT_API_BASE_URL
valueFrom:
configMapKeyRef:
name: '${NAME}-${TAG_NAME}-config'
key: REPORT_API_BASE_URL
-
name: AUTH_WEB_PAY_TRANSACTION_URL
valueFrom:
configMapKeyRef:
name: '${NAME}-${TAG_NAME}-config'
key: AUTH_WEB_PAY_TRANSACTION_URL
-
name: POD_TESTING
valueFrom:
configMapKeyRef:
name: '${NAME}-${TAG_NAME}-config'
key: POD_TESTING
-
name: NATS_SERVERS
valueFrom:
configMapKeyRef:
name: "${NATS}-${TAG_NAME}-config"
key: NATS_SERVERS
-
name: NATS_CLIENT_NAME
valueFrom:
configMapKeyRef:
name: "${NATS}-${TAG_NAME}-config"
key: NATS_CLIENT_NAME
-
name: NATS_CLUSTER_ID
valueFrom:
configMapKeyRef:
name: "${NATS}-${TAG_NAME}-config"
key: NATS_CLUSTER_ID
-
name: NATS_SUBJECT
valueFrom:
configMapKeyRef:
name: "${NATS}-${TAG_NAME}-config"
key: NATS_SUBJECT
-
name: NATS_QUEUE
valueFrom:
configMapKeyRef:
name: "${NATS}-${TAG_NAME}-config"
key: NATS_QUEUE
-
name: AUTH_API_ENDPOINT
valueFrom:
configMapKeyRef:
name: '${NAME}-${TAG_NAME}-config'
key: AUTH_API_ENDPOINT
envFrom:
- configMapRef:
name: api-${TAG_NAME}-config
restartPolicy: Never
concurrencyPolicy: Forbid
parameters:
Expand Down Expand Up @@ -292,24 +132,6 @@ parameters:
description: 'A valid database app name used by the service.'
required: true
value: postgresql
-
name: KEYCLOAK_NAME
displayName: Name
description: "The name assigned to all of the OpenShift resources associated to the\nserver instance."
required: true
value: keycloak
-
name: PAYBC_NAME
displayName: Name
description: "The name assigned to all of the OpenShift resources associated to the\nserver instance."
required: true
value: paybc
-
name: BCOL_NAME
displayName: Name
description: "The name assigned to all of the OpenShift resources associated to the\nserver instance."
required: true
value: bcol
-
name: CPU_REQUEST
displayName: 'Resources CPU Request'
Expand Down Expand Up @@ -345,11 +167,5 @@ parameters:
displayName: 'Jaeger Tracing collector address'
description: 'Jaeger Tracing collector address.'
required: true
value: '--collector.host-port=jaeger-collector.d7eovc-${TAG_NAME}.svc:14267'
-
name: NATS
displayName: NATS config
description: NATS configurations for sbc-pay.
required: true
value: nats
value: '--collector.host-port=jaeger-collector.d7eovc-dev.svc:14267'

Loading

0 comments on commit 951f63c

Please sign in to comment.