Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Sunbird-RC/sunbird-rc-core
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.0.0-rc1
Choose a base ref
...
head repository: Sunbird-RC/sunbird-rc-core
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.0.0-rc2
Choose a head ref
  • 17 commits
  • 17 files changed
  • 2 contributors

Commits on Feb 28, 2024

  1. Added microsoft sql server database support

    holashchand committed Feb 28, 2024
    Copy the full SHA
    679baca View commit details

Commits on Feb 29, 2024

  1. added comments

    holashchand committed Feb 29, 2024
    Copy the full SHA
    f8cabad View commit details
  2. enabled build debug

    holashchand committed Feb 29, 2024
    Copy the full SHA
    4feedaf View commit details
  3. reduced credential services sizes by 50-70%

    holashchand committed Feb 29, 2024
    Copy the full SHA
    9eb453c View commit details
  4. disabled build debug

    holashchand committed Feb 29, 2024
    Copy the full SHA
    4e03e76 View commit details
  5. enabled build debug

    holashchand committed Feb 29, 2024
    Copy the full SHA
    d57ae20 View commit details

Commits on Mar 1, 2024

  1. added storage checks and updated checkout and java-setup version

    holashchand committed Mar 1, 2024
    Copy the full SHA
    237f63f View commit details
  2. running storage check even if build fails

    holashchand committed Mar 1, 2024
    Copy the full SHA
    ace8be3 View commit details
  3. added storage checks between tests

    holashchand committed Mar 1, 2024
    Copy the full SHA
    b3dd6b6 View commit details
  4. added more descriptive logs about storage

    holashchand committed Mar 1, 2024
    Copy the full SHA
    d0b90f0 View commit details
  5. added sudo

    holashchand committed Mar 1, 2024
    Copy the full SHA
    12ed6de View commit details
  6. added free up space and removed debug logs

    holashchand committed Mar 1, 2024
    Copy the full SHA
    200a61b View commit details
  7. enabled debug step again and disabled free up space

    holashchand committed Mar 1, 2024
    Copy the full SHA
    c63afb8 View commit details
  8. added free up space and disabled debug

    holashchand committed Mar 1, 2024
    Copy the full SHA
    83286a0 View commit details

Commits on Mar 4, 2024

  1. Merge pull request #293 from holashchand/sql-server-support

    [FEAT]: Added microsoft sql server database support
    srprasanna authored Mar 4, 2024
    Copy the full SHA
    2a25572 View commit details

Commits on Mar 12, 2024

  1. added https://www.w3.org/ns/did/v1 response to support offline

    holashchand committed Mar 12, 2024
    Copy the full SHA
    fab4d8c View commit details

Commits on Mar 13, 2024

  1. Merge pull request #296 from holashchand/offline-verify-issue

    added https://www.w3.org/ns/did/v1 response to support offline
    srprasanna authored Mar 13, 2024
    Copy the full SHA
    be7a1b8 View commit details
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ ENABLE_AUTH=false

# credential service
IDENTITY_BASE_URL=http://identity:3332
SCHEMA_BASE_URL=http://schema:3333
SCHEMA_BASE_URL=http://credential-schema:3333
CREDENTIAL_SERVICE_BASE_URL=https://example.com/credentials
JWKS_URI=
ENABLE_AUTH=false
27 changes: 19 additions & 8 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -13,23 +13,34 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'adopt'
cache: 'maven'
- name: Set up properties
run: sh configure-dependencies.sh
# # debug step
# - name: Setup upterm session
# uses: lhotari/action-upterm@v1
# with:
# ## limits ssh access and adds the ssh public key for the user which triggered the workflow ie Sreejith-K
# limit-access-to-actor: true
- name: Check space before free up the space
run: df -h
- name: Free up space
run: |
sudo rm -rf /usr/share/dotnet
sudo rm -rf /usr/local/lib/android
sudo rm -rf /usr/local/.ghcup/ghc/9.6.4
- name: Check space before tests
run: df -h
# debug step
# - name: Setup upterm session
# uses: lhotari/action-upterm@v1
# with:
# ## limits ssh access and adds the ssh public key for the user which triggered the workflow ie holashchand
# limit-access-to-actor: true
- name: Build and test
run: make test
- name: Check space after tests
run: df -h
# test:
# runs-on: ubuntu-latest
# steps:
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ java/registry/target/registry.jar: $(SOURCES)

test: build
@docker-compose -f docker-compose-v1.yml down
@rm -rf db-data* || echo "no permission to delete"
@sudo rm -rf db-data* || echo "no permission to delete"
# test with distributed definition manager and native search
@docker-compose -f docker-compose-v1.yml --env-file test_environments/test_with_distributedDefManager_nativeSearch.env up -d db keycloak registry certificate-signer certificate-api redis
@echo "Starting the test" && sh build/wait_for_port.sh 8080
@@ -37,7 +37,7 @@ test: build
@curl -v http://localhost:8081/health
@cd java/apitest && ../mvnw -Pe2e test
@docker-compose -f docker-compose-v1.yml down
@rm -rf db-data-1 || echo "no permission to delete"
@sudo rm -rf db-data-1 || echo "no permission to delete"
# test with kafka(async), events, notifications,
@docker-compose -f docker-compose-v1.yml --env-file test_environments/test_with_asyncCreate_events_notifications.env up -d db es clickhouse redis keycloak registry certificate-signer certificate-api kafka zookeeper notification-ms metrics
@echo "Starting the test" && sh build/wait_for_port.sh 8080
@@ -46,7 +46,7 @@ test: build
@curl -v http://localhost:8081/health
@cd java/apitest && MODE=async ../mvnw -Pe2e test
@docker-compose -f docker-compose-v1.yml down
@rm -rf db-data-2 || echo "no permission to delete"
@sudo rm -rf db-data-2 || echo "no permission to delete"
# make -C services/identity-service test
# make -C services/credential-schema test
# make -C services/credentials-service test
10 changes: 5 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -87,11 +87,11 @@ services:
- signature_v2_delete_url=${SIGNATURE_V2_DELETE_URL-http://credential:3000/credentials/{id}}
- signature_v2_verify_url=${SIGNATURE_V2_VERIFY_URL-http://credential:3000/credentials/{id}/verify}
- signature_v2_revocation_list_url=${SIGNATURE_V2_REVOCATION_LIST_URL-http://credential:3000/credentials/revocation-list?issuerId={issuerDid}&page={page}&limit={limit}}
- signature_v2_schema_health_check_url=${SIGNATURE_V2_SCHEMA_HEALTH_CHECK_URL-http://schema:3333/health}
- signature_v2_schema_create_url=${SIGNATURE_V2_SCHEMA_CREATE_URL-http://schema:3333/credential-schema}
- signature_v2_schema_update_url=${SIGNATURE_V2_SCHEMA_UPDATE_URL-http://schema:3333/credential-schema/{id}/{version}}
- signature_v2_schema_get_by_id_and_version_url=${SIGNATURE_V2_SCHEMA_GET_BY_ID_AND_VERSION_URL-http://schema:3333/credential-schema/{id}/{version}
- signature_v2_schema_search_by_tags_url=${SIGNATURE_V2_SCHEMA_GET_BY_TAGS_URL-http://schema:3333/credential-schema?tags={tags}}
- signature_v2_schema_health_check_url=${SIGNATURE_V2_SCHEMA_HEALTH_CHECK_URL-http://credential-schema:3333/health}
- signature_v2_schema_create_url=${SIGNATURE_V2_SCHEMA_CREATE_URL-http://credential-schema:3333/credential-schema}
- signature_v2_schema_update_url=${SIGNATURE_V2_SCHEMA_UPDATE_URL-http://credential-schema:3333/credential-schema/{id}/{version}}
- signature_v2_schema_get_by_id_and_version_url=${SIGNATURE_V2_SCHEMA_GET_BY_ID_AND_VERSION_URL-http://credential-schema:3333/credential-schema/{id}/{version}
- signature_v2_schema_search_by_tags_url=${SIGNATURE_V2_SCHEMA_GET_BY_TAGS_URL-http://credential-schema:3333/credential-schema?tags={tags}}
- sign_url=http://certificate-signer:8079/sign
- verify_url=http://certificate-signer:8079/verify
- sign_health_check_url=http://certificate-signer:8079/health
18 changes: 18 additions & 0 deletions java/registry/pom.xml
Original file line number Diff line number Diff line change
@@ -353,6 +353,24 @@
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<!-- Include this dependency for MSSQL Server support -->
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>12.6.1.jre8</version>
</dependency>
<dependency>
<groupId>org.umlg</groupId>
<artifactId>sqlg-mssqlserver</artifactId>
<version>2.0.2</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- End dependency for MSSQL Server support -->
<dependency>
<groupId>com.steelbridgelabs.oss</groupId>
<artifactId>neo4j-gremlin-bolt</artifactId>
9 changes: 6 additions & 3 deletions services/credential-schema/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
FROM node:16 AS install
FROM node:20.11.0-alpine3.18 AS install
RUN apk add openssl curl
WORKDIR /app
COPY package.json yarn.lock ./
RUN yarn

FROM node:16 as build
FROM node:20.11.0-alpine3.18 as build
RUN apk add openssl curl
WORKDIR /app
COPY prisma ./prisma/
COPY --from=install /app/node_modules ./node_modules
RUN npx prisma generate
COPY . .
RUN yarn build

FROM node:16
FROM node:20.11.0-alpine3.18
RUN apk add openssl curl
WORKDIR /app
COPY --from=build /app/dist ./dist
COPY --from=build /app/package*.json ./
6 changes: 4 additions & 2 deletions services/credential-schema/Dockerfile.test
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
FROM node:16 AS install
FROM node:20.11.0-alpine3.18 AS install
RUN apk add openssl curl
WORKDIR /app
COPY package.json yarn.lock ./
RUN yarn

FROM node:16 as test
FROM node:20.11.0-alpine3.18 as test
RUN apk add openssl curl
WORKDIR /app
COPY prisma ./prisma/
COPY --from=install /app/node_modules ./node_modules
4 changes: 2 additions & 2 deletions services/credential-schema/package.json
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@
"@nestjs/platform-fastify": "^9.2.1",
"@nestjs/swagger": "^6.1.4",
"@nestjs/terminus": "^10.0.1",
"@prisma/client": "4.7.1",
"@prisma/client": "4.8.1",
"ajv": "^8.11.2",
"axios": "^1.4.0",
"cache-manager": "^5.1.4",
@@ -46,7 +46,7 @@
"passport": "^0.6.0",
"passport-http": "^0.3.0",
"passport-jwt": "^4.0.1",
"prisma": "4.7.1",
"prisma": "4.8.1",
"reflect-metadata": "^0.1.13",
"rimraf": "^3.0.2",
"rxjs": "^7.2.0"
Loading