diff --git a/.editorconfig b/.editorconfig index 73b614047e4f6..ca4c327686160 100644 --- a/.editorconfig +++ b/.editorconfig @@ -137,13 +137,3 @@ ij_yaml_sequence_on_new_line = false ij_yaml_space_before_colon = false ij_yaml_spaces_within_braces = true ij_yaml_spaces_within_brackets = true - -# don't interfere with prettier default formatting for webapp -# see https://prettier.io/docs/en/api.html#prettierresolveconfigfilepath--options -# for options that we're disabling -[/airbyte-webapp/**] -end_of_line = unset -indent_style = unset -indent_size = unset -tab_width = unset -max_line_length = unset diff --git a/.github/labeler.yml b/.github/labeler.yml index a07359ab3ce1d..59b4bc471427d 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -13,12 +13,6 @@ area/platform: - charts/* - charts/**/* -area/frontend: - - airbyte-webapp/* - - airbyte-webapp/**/* - - airbyte-webapp-e2e-tests/* - - airbyte-webapp-e2e-tests/**/* - area/api: - airbyte-api/* - airbyte-api/**/* diff --git a/.gitignore b/.gitignore index 58def422ecfd0..8aeac41005f9c 100644 --- a/.gitignore +++ b/.gitignore @@ -63,9 +63,6 @@ crash.log resources/examples/airflow/logs/* !resources/examples/airflow/logs/.gitkeep -# Cloud Demo -!airbyte-webapp/src/packages/cloud/data - # Summary.md keeps getting added and we just don't like it docs/SUMMARY.md diff --git a/.vscode/frontend.code-workspace b/.vscode/frontend.code-workspace deleted file mode 100644 index c55ade0551d94..0000000000000 --- a/.vscode/frontend.code-workspace +++ /dev/null @@ -1,71 +0,0 @@ -{ - "folders": [ - { - "path": "../airbyte-webapp" - }, - { - "path": "../airbyte-webapp-e2e-tests" - }, - { - "name": "docs/integrations/destinations", - "path": "../docs/integrations/destinations" - }, - { - "name": "docs/integrations/sources", - "path": "../docs/integrations/sources" - } - ], - "extensions": { - "recommendations": [ - "dbaeumer.vscode-eslint", - "stylelint.vscode-stylelint", - "esbenp.prettier-vscode", - "eamodio.gitlens", - ] - }, - "settings": { - "javascript.preferences.quoteStyle": "double", - "typescript.preferences.quoteStyle": "double", - "javascript.preferences.importModuleSpecifier": "shortest", - "typescript.preferences.importModuleSpecifier": "shortest", - "javascript.updateImportsOnFileMove.enabled": "always", - "typescript.updateImportsOnFileMove.enabled": "always", - "editor.detectIndentation": true, - "eslint.format.enable": true, - "eslint.run": "onType", - "stylelint.enable": true, - "stylelint.validate": ["css", "scss"], - "[javascript]": { - "editor.formatOnSave": true, - "editor.defaultFormatter": "dbaeumer.vscode-eslint", - "editor.codeActionsOnSave": { - "source.organizeImports": false - } - }, - "[typescript]": { - "editor.formatOnSave": true, - "editor.defaultFormatter": "dbaeumer.vscode-eslint", - "editor.codeActionsOnSave": { - "source.organizeImports": false - } - }, - "[typescriptreact]": { - "editor.formatOnSave": true, - "editor.defaultFormatter": "dbaeumer.vscode-eslint", - "editor.codeActionsOnSave": { - "source.organizeImports": false - } - }, - "[json]": { - "editor.formatOnSave": true, - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[scss]": { - "editor.formatOnSave": true, - "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.codeActionsOnSave": { - "source.fixAll.stylelint": true - } - } - } -} diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index b9d43a333b925..0000000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "javascript.preferences.quoteStyle": "double", - "typescript.preferences.quoteStyle": "double", - "javascript.preferences.importModuleSpecifier": "shortest", - "typescript.preferences.importModuleSpecifier": "shortest", - "javascript.updateImportsOnFileMove.enabled": "always", - "typescript.updateImportsOnFileMove.enabled": "always", - "editor.detectIndentation": true, - "eslint.format.enable": true, - "eslint.run": "onType", - "stylelint.enable": true, - "stylelint.validate": ["css", "scss"], - "[javascript]": { - "editor.formatOnSave": true, - "editor.defaultFormatter": "dbaeumer.vscode-eslint", - "editor.codeActionsOnSave": { - "source.organizeImports": false - } - }, - "[typescript]": { - "editor.formatOnSave": true, - "editor.defaultFormatter": "dbaeumer.vscode-eslint", - "editor.codeActionsOnSave": { - "source.organizeImports": false - } - }, - "[typescriptreact]": { - "editor.formatOnSave": true, - "editor.defaultFormatter": "dbaeumer.vscode-eslint", - "editor.codeActionsOnSave": { - "source.organizeImports": false - } - }, - "[json]": { - "editor.formatOnSave": true, - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[scss]": { - "editor.formatOnSave": true, - "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.codeActionsOnSave": { - "source.fixAll.stylelint": true - } - }, - "typescript.tsdk": "./airbyte-webapp/node_modules/typescript/lib" -} diff --git a/docs/connector-development/connector-specification-reference.md b/docs/connector-development/connector-specification-reference.md index cdc3b5c889b66..186874e0c9adf 100644 --- a/docs/connector-development/connector-specification-reference.md +++ b/docs/connector-development/connector-specification-reference.md @@ -4,7 +4,7 @@ The [connector specification](../understanding-airbyte/airbyte-protocol.md#spec) ## Demoing your specification -While iterating on your specification, you can preview what it will look like in the UI in realtime by following the instructions [here](https://github.com/airbytehq/airbyte/blob/master/airbyte-webapp/docs/HowTo-ConnectionSpecification.md). +While iterating on your specification, you can preview what it will look like in the UI in realtime by following the instructions [here](https://github.com/airbytehq/airbyte-platform/blob/master/airbyte-webapp/docs/HowTo-ConnectionSpecification.md). ### Secret obfuscation diff --git a/tools/bin/e2e_test.sh b/tools/bin/e2e_test.sh deleted file mode 100755 index 037b54a4b3590..0000000000000 --- a/tools/bin/e2e_test.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env bash - -set -e - -. tools/lib/lib.sh - -assert_root - -echo "Starting app..." - -# todo (cgardens) - docker-compose 1.27.3 contained a bug that causes a failure if the volume path -# does not exist when the volume is created. It was fixed in 1.27.4. Github actions virtual envs, -# however, new ubuntu release upgraded to 1.27.3 on 09/24/20. Once github actions virtual envs -# upgrades to 1.27.4, we can stop manually making the directory. -mkdir -p /tmp/airbyte_local - -# Detach so we can run subsequent commands -VERSION=dev BASIC_AUTH_USERNAME="" BASIC_AUTH_PASSWORD="" TRACKING_STRATEGY=logging docker compose up -d -# Uncomment for debugging. Warning, this is verbose. -# trap 'echo "docker compose logs:" && docker compose logs -t --tail 1000 && docker compose down && docker stop airbyte_ci_pg' EXIT - -docker run --rm -d -p 5433:5432 -e POSTGRES_PASSWORD=secret_password -e POSTGRES_DB=airbyte_ci_source --name airbyte_ci_pg_source postgres -docker run --rm -d -p 5434:5432 -e POSTGRES_PASSWORD=secret_password -e POSTGRES_DB=airbyte_ci_destination --name airbyte_ci_pg_destination postgres -docker run --rm -d -p 6767:6767 --network=airbyte_airbyte_internal --mount type=bind,source="$(pwd)"/airbyte-webapp-e2e-tests/dummy_api.js,target=/index.js --name=dummy_api node:16-alpine "index.js" - -echo "Waiting for health API to be available..." -# Retry loading the health API of the server to check that the server is fully available -until $(curl --output /dev/null --fail --silent --max-time 5 --head localhost:8001/api/v1/health); do - echo "Health API not available yet. Retrying in 10 seconds..." - sleep 10 -done - -echo "Running e2e tests via gradle" -SUB_BUILD=PLATFORM ./gradlew --no-daemon :airbyte-webapp-e2e-tests:e2etest -PcypressWebappKey=$CYPRESS_WEBAPP_KEY