Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
anvabr committed Mar 22, 2022
2 parents 42521e8 + cda41b6 commit 6087433
Show file tree
Hide file tree
Showing 399 changed files with 128,159 additions and 3,545 deletions.
28 changes: 23 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,22 @@ jobs:
npm install
npm run build
popd
pushd logger-helper
npm install
npm run build
popd
pushd logger-service
npm install
npm run build
popd
pushd frontend
npm install
npm run build
popd
pushd auth-service
npm install
npm run build
popd
pushd guardian-service
npm install
npm run build
Expand All @@ -34,7 +46,7 @@ jobs:
npm install
npm run build
popd
pushd ui-service
pushd api-gateway
npm install
npm run build
popd
Expand All @@ -48,10 +60,19 @@ jobs:
pushd vc-modules
npm run lint
popd
pushd logger-helper
npm run lint
popd
pushd logger-service
npm run lint
popd
pushd auth-service
npm run lint
popd
pushd guardian-service
npm run lint
popd
pushd ui-service
pushd api-gateway
npm run lint
popd
env:
Expand All @@ -64,9 +85,6 @@ jobs:
pushd guardian-service
npm run test
popd
pushd ui-service
npm run test
popd
env:
CI: true
- name: Publish Unit Test Results
Expand Down
16 changes: 8 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ guardian-service/node_modules/
guardian-service/dist/
ipfs-client/node_modules/
ipfs-client/dist/
logger-service/node_modules/
logger-service/dist/
logger-helper/node_modules/
logger-helper/dist/
message-broker/node_modules/
ui-service/node_modules/
ui-service/dist/
Expand All @@ -12,11 +16,6 @@ message-broker/dist/
.vscode/
vc/node_modules/
vc/dist/
guardian-service/package-lock.json
message-broker/package-lock.json
mrv-sender/package-lock.json
ui-service/package-lock.json
ui-service/public/package-lock.json
vc-modules/node_modules/
vc-modules/dist/
config.keys
Expand All @@ -25,7 +24,8 @@ interfaces/node_modules/
www-data/
ui-service/.vs/
/test_results/
ipfs-client/package-lock.json
/api-tests/node_modules/
/api-tests/package-lock.json
guardian-service/config.json
/api-docs/node_modules/
/auth-service/dist/
/auth-service/node_modules/
/guardian-service/config.json
Binary file not shown.
Binary file added Demo Artifacts/Verra REDD.zip
Binary file not shown.
Binary file modified Demo Artifacts/iRec Policy.zip
Binary file not shown.
4 changes: 3 additions & 1 deletion Demo Artifacts/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

This folder contains sample files that are referenced in the Demo Usage Guide from previous versions of the Guardian. As of version 1.0.5 the following files will not be needed to follow the guide:

1. Sample Schema (`iRec_Application_Details.zip`)
1. Sample Schema for iRec Policy (`iRec_Application_Details.zip`)
2. Sample Policy Workflow configuration file (`irec-policy-config.txt`)
3. Sample of Verra REDD Policy (`Verra REDD.zip`)
4. Sample Schema design template for Verra REDD Policy (`REDD APD Schema Design Template.xlsx`)

We are keeping them in the repo as they may be relevant in future releases.

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ npm run test
([back to top](broken-reference))
For complete documentation on following points. Please refer https://github.com/hashgraph/guardian/tree/main/docs
For complete documentation on following points. Please refer https://docs.hedera.com/guardian
* Swagger API
* Postman Collection
Expand Down
4 changes: 2 additions & 2 deletions RELEASE-MANAGEMENT-PLAN.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ This document describes general approach to release management for the Guardian
The Guardian development team follows Scrum methodology with 2-week sprints. Software releases are produced on regular cadence every other sprint, i.e every 4 weeks; regardless of the status of features in development. Releases are produced on Mondays at 12:00 EST, following the go/no-go decisition taken at the end-of-sprint review on Friday previous week.

The Guardian uses semantic versioning for releases in the major.minor.build format. Each number incremented sequentially to denote the following changes:
- major: a signifcant milestone in product lifecycle has been reached
- major: a significant milestone in product lifecycle has been reached
- minor: the release contains notable new capabilities
- build: incremental release brining enchancments and bug fixes
- build: incremental release brining enhancements and bug fixes

In the future there will likely be backwards compatibility meaning assigned to these changes.

Expand Down
File renamed without changes.
19 changes: 19 additions & 0 deletions api-docs/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
FROM node:16 as builder
WORKDIR /usr/local/api-docs
COPY ./api-docs/package.json ./
COPY ./api-docs/tsconfig.json ./
COPY ./api-docs/tslint.json ./
RUN npm install
ADD ./api-docs/src ./src
RUN npm run build

FROM node:16
ENV PLATFORM="docker"
ENV NODE_ENV="production"
WORKDIR /usr/local/api-docs
COPY ./api-docs/package.json ./
RUN npm install --production
COPY ./api-docs/api ./api
COPY --from=builder /usr/local/api-docs/dist ./dist

CMD npm start
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,52 @@ components:
type: string
key:
type: string
CommonSettings:
type: object
properties:
operatorId:
type: string
operatorKey:
type: string
schemaTopicId:
type: string
nftApiKey:
type: string
LogFilters:
type: object
properties:
type:
type: string
startDate:
type: string
endDate:
type: string
attributes:
type: array
items:
type: string
message:
type: string
pageSize:
type: number
pageIndex:
type: number
sortDirection:
type: string
enum: [ASC, DESC]
Log:
type: object
properties:
type:
type: string
datetime:
type: string
message:
type: string
attributes:
type: array
items:
type: string
tags:
- name: "accounts"
description: "Operations related to Guardian users"
Expand All @@ -501,6 +547,10 @@ tags:
description: "Demo Only APIs"
- name: "ipfs"
description: "IPFS Operations"
- name: "settings"
description: "Settings operations"
- name: "logs"
description: "Logs operations"
paths:
/accounts:
get:
Expand Down Expand Up @@ -2153,3 +2203,124 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/Error'
/settings:
get:
tags:
- settings
description: Returns current settings. For users with the Root Authority role only.
security:
- bearerAuth: []
summary: Returns current settings.
responses:
200:
description: Successful operation.
content:
application/json:
schema:
$ref: '#/components/schemas/CommonSettings'
401:
description: Unauthorized.
403:
description: Forbidden.
500:
description: Internal server error.
content:
application/json:
schema:
$ref: '#/components/schemas/Error'
post:
tags:
- settings
description: Set settings. For users with the Root Authority role only.
security:
- bearerAuth: []
requestBody:
description: Settings.
required: true
content:
application/json:
schema:
$ref: '#/components/schemas/CommonSettings'
summary: Set settings.
responses:
200:
description: Successful operation.
401:
description: Unauthorized.
403:
description: Forbidden.
500:
description: Internal server error.
content:
application/json:
schema:
$ref: '#/components/schemas/Error'
/logs:
post:
tags:
- logs
description: Returns logs. For users with the Root Authority role only.
security:
- bearerAuth: []
requestBody:
description: Log filters.
content:
application/json:
schema:
$ref: '#/components/schemas/LogFilters'
summary: Returns logs.
responses:
200:
description: Successful operation.
content:
application/json:
schema:
type: object
properties:
totalCount:
type: number
logs:
$ref: '#/components/schemas/Log'
401:
description: Unauthorized.
403:
description: Forbidden.
500:
description: Internal server error.
content:
application/json:
schema:
$ref: '#/components/schemas/Error'
/logs/attributes:
get:
tags:
- logs
description: Returns logs attributes. For users with the Root Authority role only.
parameters:
- in: query
name: name
schema:
type: string
description: Part of name.
security:
- bearerAuth: []
summary: Returns logs attributes.
responses:
200:
description: Successful operation.
content:
application/json:
schema:
type: array
items:
type: string
401:
description: Unauthorized.
403:
description: Forbidden.
500:
description: Internal server error.
content:
application/json:
schema:
$ref: '#/components/schemas/Error'
Loading

0 comments on commit 6087433

Please sign in to comment.