Skip to content
This repository has been archived by the owner on Aug 19, 2022. It is now read-only.

Commit

Permalink
Fixed commands.
Browse files Browse the repository at this point in the history
  • Loading branch information
Shogun committed Apr 5, 2018
1 parent b9c3704 commit 6fce4db
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 47 deletions.
2 changes: 1 addition & 1 deletion docs/swagger/swagger-json.js
View file

Large diffs are not rendered by default.

18 changes: 8 additions & 10 deletions package.json
View file
Expand Up @@ -36,27 +36,25 @@
"node": ">=6.0.0"
},
"scripts": {
"bench": "cd packages/udaru-hapi-server && node ./bench/util/runner.js",
"bench:volume": "cd packages/udaru-hapi-server && node ./bench/util/volumeRunner.js",
"bench:load-volume": "cd packages/udaru-hapi-server && npm run pg:init-volume-db && node ./bench/util/volumeRunner.js",
"bench": "cd packages/udaru-hapi-server && npm run bench",
"bench:volume": "cd packages/udaru-hapi-server && npm run bench:volume",
"bench:load-volume": "cd packages/udaru-hapi-server && npm run bench:load-volume",
"coverage": "lerna run coverage",
"coveralls": "lerna run coveralls",
"depcheck": "lerna run depcheck",
"outdated:all": "npm outdated || echo 'Outdated packages found.'; lerna exec \"npm outdated || echo 'Outdated packages found.'\"",
"update:all": "npm update && lerna exec npm update",
"lint": "standard",
"pg:init": "cd packages/udaru-core && node ./database/init.js && npm run pg:migrate",
"pg:init-test-db": "cd packages/udaru-core && npm run pg:init && npm run pg:load-test-data",
"pg:init-volume-db": "cd packages/udaru-hapi-server && npm run pg:init-test-db && ./bench/util/loadVolumeData.js",
"pg:load-test-data": "cd packages/udaru-core && node ./database/loadTestData.js",
"pg:migrate": "cd packages/udaru-core && node ./database/migrate.js --version=max",
"pg:init": "cd packages/udaru-core && npm run pg:init",
"pg:init-test-db": "cd packages/udaru-core && npm run pg:init-test-db",
"pg:init-volume-db": "cd packages/udaru-hapi-server && npm run pg:init-volume-db",
"pg:migrate": "cd packages/udaru-core && npm run pg:migrate",
"postinstall": "lerna bootstrap",
"doc:lint": "remark .",
"start": "node packages/udaru-hapi-server/index.js",
"test": "lerna run test",
"test:commit-check": "npm run doc:lint && npm run lint && npm run depcheck && npm run test",
"pretest:security": "cd packages/udaru-hapi-server && napa sqlmapproject/sqlmap",
"test:security": "cd packages/udaru-hapi-server && node ./security/runner.js",
"test:security": "cd packages/udaru-hapi-server && npm run test:security",
"swagger-gen": "node scripts/getSwaggerJson.js | swagger-gen -d docs/swagger && node scripts/injectUdaruSwaggerCss.js"
},
"remarkConfig": {
Expand Down
3 changes: 1 addition & 2 deletions packages/udaru-core/package.json
View file
Expand Up @@ -43,8 +43,7 @@
"coveralls": "npm run pg:init-test-db && UDARU_SERVICE_logger_pino_level=silent lab -c -t 90 -r lcov | coveralls",
"depcheck": "npx depcheck",
"pg:init": "node ./database/init.js && npm run pg:migrate",
"pg:init-test-db": "npm run pg:init && npm run pg:load-test-data",
"pg:load-test-data": "node ./database/loadTestData.js",
"pg:init-test-db": "npm run pg:init && node ./database/loadTestData.js",
"pg:migrate": "node ./database/migrate.js --version=max",
"test": "npm run pg:init-test-db && UDARU_SERVICE_logger_pino_level=silent lab -c -t 90"
},
Expand Down
5 changes: 2 additions & 3 deletions packages/udaru-hapi-16-plugin/package.json
View file
Expand Up @@ -37,9 +37,8 @@
"coverage": "UDARU_SERVICE_logger_pino_level=silent lab -c -t 96 -r html -o coverage/coverage.html",
"coveralls": "UDARU_SERVICE_logger_pino_level=silent lab -c -t 96 -r lcov | COVERALLS_REPO_TOKEN='?' coveralls",
"depcheck": "npx depcheck",
"pg:init": "UDARU_SERVICE_local=true npx --no-install udaru-init && npm run pg:migrate",
"pg:init-test-db": "npm run pg:init && npm run pg:load-test-data",
"pg:load-test-data": "UDARU_SERVICE_local=true npx --no-install udaru-loadTestData",
"pg:init": "npx --no-install udaru-init && npm run pg:migrate",
"pg:init-test-db": "npm run pg:init && npx --no-install udaru-loadTestData",
"pg:migrate": "npx --no-install udaru-migrate --version=max",
"test": "npm run pg:init-test-db && UDARU_SERVICE_logger_pino_level=silent lab -c -t 96"
},
Expand Down
13 changes: 3 additions & 10 deletions packages/udaru-hapi-plugin/package.json
View file
Expand Up @@ -34,22 +34,15 @@
"node": ">=8.9.0"
},
"scripts": {
"bench": "node ./bench/util/runner.js",
"bench:volume": "node ./bench/util/volumeRunner.js",
"bench:load-volume": "npm run pg:init-volume-db && node ./bench/util/volumeRunner.js",
"coverage": "UDARU_SERVICE_logger_pino_level=silent lab -c -t 96 -r html -o coverage/coverage.html",
"coveralls": "UDARU_SERVICE_logger_pino_level=silent lab -c -t 96 -r lcov | COVERALLS_REPO_TOKEN='?' coveralls",
"depcheck": "npx depcheck",
"pg:init": "UDARU_SERVICE_local=true npx --no-install udaru-init && npm run pg:migrate",
"pg:init-test-db": "npm run pg:init && npm run pg:load-test-data",
"pg:init-volume-db": "npm run pg:init-test-db && ./bench/util/loadVolumeData.js",
"pg:load-test-data": "UDARU_SERVICE_local=true npx --no-install udaru-loadTestData",
"pg:init": "npx --no-install udaru-init && npm run pg:migrate",
"pg:init-test-db": "npm run pg:init && npx --no-install udaru-loadTestData",
"pg:migrate": "npx --no-install udaru-migrate --version=max",
"test-6": "echo '\\033[33mudaru-hapi-plugin requires Node.js greater than 8.9.0. Exiting without errors.\\033[0m'",
"test-current": "npm run pg:init-test-db && UDARU_SERVICE_logger_pino_level=silent lab -c -t 96",
"test": "npm run test-$(node -v | grep '^v6' >> /dev/null && echo '6' || echo 'current')",
"test:security": "node ./security/runner.js",
"pretest:security": "napa sqlmapproject/sqlmap"
"test": "npm run test-$(node -v | grep '^v6' >> /dev/null && echo '6' || echo 'current')"
},
"dependencies": {
"@nearform/udaru-core": "^5.0.0",
Expand Down
5 changes: 4 additions & 1 deletion packages/udaru-hapi-server/index.js
View file
Expand Up @@ -55,7 +55,10 @@ server.register(

server.start((err) => {
if (err) {
return logMessage(`Failed to start server: ${err.message}`)
logMessage(`Failed to start server: ${err.message}`)
process.exit(1)
}
logMessage('Server started on: ' + server.info.uri.toLowerCase())
})

module.exports = server
5 changes: 2 additions & 3 deletions packages/udaru-hapi-server/package.json
View file
Expand Up @@ -42,10 +42,9 @@
"bench:load-volume": "npm run pg:init-volume-db && node ./bench/util/volumeRunner.js",
"coverage": "echo ️",
"depcheck": "npx depcheck",
"pg:init": "UDARU_SERVICE_local=true npx --no-install udaru-init && npm run pg:migrate",
"pg:init-test-db": "npm run pg:init && npm run pg:load-test-data",
"pg:init": "npx --no-install udaru-init && npm run pg:migrate",
"pg:init-test-db": "npm run pg:init && npx --no-install udaru-loadTestData",
"pg:init-volume-db": "npm run pg:init-test-db && ./bench/util/loadVolumeData.js",
"pg:load-test-data": "UDARU_SERVICE_local=true npx --no-install udaru-loadTestData",
"pg:migrate": "npx --no-install udaru-migrate --version=max",
"start": "node ./index.js",
"test": "echo ️",
Expand Down
26 changes: 9 additions & 17 deletions scripts/getSwaggerJson.js
View file
@@ -1,4 +1,3 @@
const start = require('../packages/udaru-hapi-plugin/lib/standalone/server')
const Joi = require('joi')

const swaggerSchema = Joi.object({
Expand All @@ -12,20 +11,13 @@ const swaggerSchema = Joi.object({
definitions: Joi.object()
})

start()
.then(async server => {
const response = await server.inject({method: 'GET', url: '/swagger.json'})

Joi.validate(response.result, swaggerSchema, {allowUnknown: true}, (err) => {
if (err) {
console.error('Error validating swagger definition', err)
process.exit(1)
}
console.log(JSON.stringify(response.result))
process.exit(0)
})
})
.catch(err => {
console.error(err)
process.exit(1)
require('../packages/udaru-hapi-server').inject({method: 'GET', url: '/swagger.json'}, (response) => {
Joi.validate(response.result, swaggerSchema, {allowUnknown: true}, (err) => {
if (err) {
console.error('Error validating swagger definition', err)
process.exit(1)
}
console.log(JSON.stringify(response.result))
process.exit(0)
})
})

0 comments on commit 6fce4db

Please sign in to comment.