Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
a32aab1
Deleted old Java adapter code/files
f3l1x98 Jan 13, 2022
36e5ed8
Added empty Typescript NodeJS project with same versions (including l…
f3l1x98 Jan 13, 2022
1640b0b
Adjusted docker-compose for new envs (no SPRING_ envs anymore)
f3l1x98 Jan 13, 2022
e85d613
Removed provider test run command
f3l1x98 Jan 13, 2022
6c7bd63
Adjusted README to contain build and test commands for NodeJS instead…
f3l1x98 Jan 13, 2022
de23a00
removed pact + axios due to them being (most likely) unnecessary
f3l1x98 Jan 13, 2022
a08ecdc
Added dummy test, in order to allow building of adapter
f3l1x98 Jan 19, 2022
fe84810
Adapter nodejs refactoring - test pull request (#404)
MarcoDoell May 25, 2022
ecd03db
Merge remote-tracking branch 'origin/main' into adapter-nodejs-refact…
f3l1x98 Jun 16, 2022
b111a72
Rewrote database layer (repositories, entities, ...)
f3l1x98 Jul 6, 2022
dac1188
- Rwfactored init of DBLayer etc
f3l1x98 Jul 6, 2022
fc08bf6
Fixed jest version issue
f3l1x98 Jul 6, 2022
24f3fb3
Fixed some linter errors
f3l1x98 Jul 6, 2022
1824291
- Fixed interpreter impl + tests
f3l1x98 Jul 10, 2022
4551a9a
Fixed impl for datasource and dataImport tests:
f3l1x98 Jul 10, 2022
a4bbac1
Fixed adapter-stateless test
f3l1x98 Jul 11, 2022
b8977b9
- Readded linting in Dockerfile
f3l1x98 Jul 11, 2022
afe5e51
Small improvments:
f3l1x98 Jul 12, 2022
c34bd5a
Remove gradle from adapter
georg-schwarz Jul 12, 2022
49c0076
- Readded scheduler tests
f3l1x98 Jul 19, 2022
ead9e64
- Added http params assertion
f3l1x98 Jul 19, 2022
a42c290
- Fixed JsonInterpreter tests
f3l1x98 Jul 19, 2022
967528c
Moved Format and Protocol into /adapter
f3l1x98 Jul 19, 2022
142a58d
Removed setEnv script (now using env file)
f3l1x98 Jul 19, 2022
32f28d5
Fixed linter issue
f3l1x98 Jul 19, 2022
33e4fc6
Merge branch 'adapter-nodejs-refactoring' of github.com:jvalue/ods in…
f3l1x98 Jul 19, 2022
95a2bb7
Undid changes in vm2SandboxExecutor tests
f3l1x98 Jul 19, 2022
8a26d51
Applied .dto.ts naming schema to existing dto files
f3l1x98 Jul 19, 2022
3656cc2
Renamed knexHelper to datasourceUtils + removed old code
f3l1x98 Jul 19, 2022
eb36b17
Little bit cleanup of outcommented code
f3l1x98 Jul 25, 2022
4fe866f
Moved dtos into api folders
f3l1x98 Jul 25, 2022
d2156be
Cleanup unnecessary files
georg-schwarz Aug 19, 2022
10cfa23
Adapter: Cleanup index.ts
georg-schwarz Aug 19, 2022
8c68aa8
Adapter: refactor protocols and importers
georg-schwarz Aug 19, 2022
0eb16ce
Adapter: refactor format and interpreters
georg-schwarz Aug 19, 2022
f8630fd
Adapter: refactor API models
georg-schwarz Aug 19, 2022
e914390
Adapter: Refactor file naming
georg-schwarz Aug 19, 2022
4e27cbf
Adapter: refactor datasource module (renaming, moving)
georg-schwarz Aug 19, 2022
e2b806f
Remove unnecessary TODOs
georg-schwarz Aug 19, 2022
b99f60c
Adapter: Remove singleton from AdapterService
georg-schwarz Aug 19, 2022
2f81c71
Adapter: Refactor integration tests to run in VSCode with setup and t…
georg-schwarz Aug 22, 2022
8284cb5
Adapter: fix adapter-stateless integration test
georg-schwarz Aug 22, 2022
026c98a
Adapter: fix remaining integration tests
georg-schwarz Aug 22, 2022
9e326cf
Adapter: move integration compose file into adapter/integration-test
georg-schwarz Aug 22, 2022
2deeccc
Adapter: update CI script to changes
georg-schwarz Aug 22, 2022
d3833fc
CI: upgrade base image as GitHub canceled support for ubuntu 18.04
georg-schwarz Aug 22, 2022
b47b5fe
Switched back to old impl where HTTPImporter blindly executes runtime…
f3l1x98 Aug 23, 2022
34a218a
Removed test logging
f3l1x98 Aug 23, 2022
d6c6b2e
Switched to arraybuffer response + manuel decoding using TextDecoder
f3l1x98 Aug 23, 2022
1d95544
Added flag to killall to ignore if no processes were found
f3l1x98 Aug 25, 2022
fd0ae65
Removed posttest
f3l1x98 Aug 25, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 30 additions & 21 deletions .github/workflows/ods.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

adapter-build:
name: Adapter Build & Test
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
Expand All @@ -24,16 +24,25 @@ jobs:
run: |
docker-compose -f docker-compose.yml build adapter

- name: Build Integration-test
- name: Integration-test - build mock server
run: |
docker-compose -f docker-compose.yml -f adapter/integration-test/docker-compose.it.yml build mock-server

- name: Integration-test - Use Node.js 14.x
uses: actions/setup-node@v2
with:
node-version: 14.x
cache: 'npm'

- name: Integration-test - install dependencies
working-directory: ./adapter/integration-test
run: |
docker-compose -f docker-compose.yml -f docker-compose.it.yml build adapter-it
npm i

- name: Run Integration-test
# Only the logs from the services listed in the `docker-compose up` command are going to be printed to stdout
# To get logs from other services too, just add them to the `docker-compose up` command
working-directory: ./adapter/integration-test
run: |
docker-compose -f docker-compose.yml -f docker-compose.it.yml up --exit-code-from adapter-it adapter adapter-it
docker-compose -f docker-compose.yml -f docker-compose.it.yml down
npm run test

- name: Save Docker image as artifact
run: |
Expand All @@ -52,7 +61,7 @@ jobs:

scheduler-build:
name: Scheduler Build & Test
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -89,7 +98,7 @@ jobs:

storage-build:
name: Storage Build & Test
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -163,7 +172,7 @@ jobs:

pipeline-build:
name: Pipeline Build & Test
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -200,7 +209,7 @@ jobs:

notification-build:
name: Notification Build & Test
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -250,7 +259,7 @@ jobs:

ui-build:
name: UI Build & Test
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -287,7 +296,7 @@ jobs:
# ----------------- Pipeline Provider-side CDC-Test -----------------
pipeline-provider:
name: Pipeline Provider-side CDC-Test
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
needs: [pipeline-build, ui-build, notification-build, storage-build]
steps:
- uses: actions/checkout@v2
Expand All @@ -306,7 +315,7 @@ jobs:
# ----------------- Storage Provider-side CDC-Test -----------------
storage-provider:
name: Storage Provider-side CDC-Test
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
needs: [storage-build, ui-build]
steps:
- uses: actions/checkout@v2
Expand All @@ -324,7 +333,7 @@ jobs:
# ----------------- SYSTEMTEST --------------------
systemtest:
name: Systemtest
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
needs: [adapter-build, notification-build, scheduler-build, storage-build, pipeline-build, ui-build]
steps:
- name: Checkout
Expand Down Expand Up @@ -390,7 +399,7 @@ jobs:

adapter_upload:
name: Adapter Publish
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04

needs: [systemtest]

Expand Down Expand Up @@ -428,7 +437,7 @@ jobs:

scheduler_upload:
name: Scheduler Publish
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04

needs: [systemtest]

Expand Down Expand Up @@ -465,7 +474,7 @@ jobs:

storage_upload:
name: Storage Publish
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04

needs: [systemtest, storage-provider]

Expand Down Expand Up @@ -527,7 +536,7 @@ jobs:

pipeline_upload:
name: Pipeline Publish
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04

needs: [systemtest, pipeline-provider]

Expand Down Expand Up @@ -564,7 +573,7 @@ jobs:

notifcation_upload:
name: Notifcation Publish
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04

needs: [systemtest]

Expand Down Expand Up @@ -601,7 +610,7 @@ jobs:

ui_upload:
name: UI Publish
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04

needs: [systemtest]

Expand Down
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"./scheduler/integration-test",
"./storage/integration-test",
"./pipeline/integration-test",
"./notification"
"./notification",
"./adapter"
],
"eslint.validate": ["typescript"],
"typescript.preferences.importModuleSpecifier": "relative",
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,3 +155,4 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
You should have received a copy of the GNU Affero General Public License along with this program. If not, see http://www.gnu.org/licenses/.

SPDX-License-Identifier: AGPL-3.0-only

134 changes: 69 additions & 65 deletions adapter/.dockerignore
Original file line number Diff line number Diff line change
@@ -1,89 +1,93 @@
bin/
.settings/*
.project
.classpath
# Created by https://www.gitignore.io/api/node
# Edit at https://www.gitignore.io/?templates=node

# Created by https://www.gitignore.io/api/java,gradle,intellij
# Edit at https://www.gitignore.io/?templates=java,gradle,intellij
### Node ###
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

### Intellij ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
# Runtime data
pids
*.pid
*.seed
*.pid.lock

# CMake
cmake-build-*/
# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# File-based project format
*.iws
# Coverage directory used by tools like istanbul
coverage

# IntelliJ
.idea/
out/
# nyc test coverage
.nyc_output

# mpeltonen/sbt-idea plugin
.idea_modules/
# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# JIRA plugin
atlassian-ide-plugin.xml
# Bower dependency directory (https://bower.io/)
bower_components

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties
# node-waf configuration
.lock-wscript

# JetBrains templates
**___jb_tmp___
# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

### Intellij Patch ###
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
# Dependency directories
node_modules/
jspm_packages/

# *.iml
# modules.xml
# *.ipr
# TypeScript v1 declaration files
typings/

### Java ###
# Compiled class file
*.class
# Optional npm cache directory
.npm

# Log file
*.log
# Optional eslint cache
.eslintcache

# BlueJ files
*.ctxt
# Optional REPL history
.node_repl_history

# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Output of 'npm pack'
*.tgz

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar
# Yarn Integrity file
.yarn-integrity

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
# dotenv environment variables file
.env
.env.test

### Gradle ###
.gradle
build/
# parcel-bundler cache (https://parceljs.org/)
.cache

# next.js build output
.next

# Ignore Gradle GUI config
gradle-app.setting
# nuxt.js build output
.nuxt

# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar
# vuepress build output
.vuepress/dist

# Cache of project
.gradletasknamecache
# Serverless directories
.serverless/

# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
# gradle/wrapper/gradle-wrapper.properties
# FuseBox cache
.fusebox/

### Gradle Patch ###
**/build/
# DynamoDB Local files
.dynamodb/

# End of https://www.gitignore.io/api/java,gradle,intellij
# End of https://www.gitignore.io/api/node

# JS Files created by tsc
dist/

# Idea files
.idea/
build/
3 changes: 3 additions & 0 deletions adapter/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
extends: "@jvalue/eslint-config-jvalue",
};
Loading