Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .codecov.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,6 @@ component_management:
name: adapter-doctrine
paths:
- src/adapter/etl-adapter-doctrine/**
- component_id: adapter-elasticsearch
name: adapter-elasticsearch
paths:
- src/adapter/etl-adapter-elasticsearch/**
- component_id: adapter-google-sheet
name: adapter-google-sheet
paths:
Expand Down Expand Up @@ -199,6 +195,10 @@ component_management:
name: adapter-postgresql
paths:
- src/adapter/etl-adapter-postgresql/**
- component_id: adapter-seal
name: adapter-seal
paths:
- src/adapter/etl-adapter-seal/**
- component_id: bridge-phpunit-postgresql
name: bridge-phpunit-postgresql
paths:
Expand Down
11 changes: 0 additions & 11 deletions .github/workflows/job-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,6 @@ jobs:
MYSQL_PASSWORD: mysql
MYSQL_DATABASE: mysql
MYSQL_ROOT_PASSWORD: root
elasticsearch:
image: elasticsearch:7.17.28
env:
discovery.type: single-node
options: >-
--health-cmd "curl http://localhost:9200/_cluster/health"
--health-interval 10s
--health-timeout 5s
--health-retries 10
ports:
- 9200:9200
strategy:
fail-fast: false
matrix:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/monorepo-split.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ jobs:
split_repository: 'etl-adapter-csv'
- local_path: 'src/adapter/etl-adapter-doctrine'
split_repository: 'etl-adapter-doctrine'
- local_path: 'src/adapter/etl-adapter-elasticsearch'
split_repository: 'etl-adapter-elasticsearch'
- local_path: 'src/adapter/etl-adapter-excel'
split_repository: 'etl-adapter-excel'
- local_path: 'src/adapter/etl-adapter-google-sheet'
Expand All @@ -78,6 +76,8 @@ jobs:
split_repository: 'etl-adapter-xml'
- local_path: 'src/adapter/etl-adapter-postgresql'
split_repository: 'etl-adapter-postgresql'
- local_path: 'src/adapter/etl-adapter-seal'
split_repository: 'etl-adapter-seal'

- local_path: 'src/bridge/filesystem/azure'
split_repository: 'filesystem-azure-bridge'
Expand Down
2 changes: 1 addition & 1 deletion bin/docs.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ public function execute(InputInterface $input, OutputInterface $output): int
__DIR__ . '/../src/adapter/etl-adapter-csv/src/Flow/ETL/Adapter/CSV/functions.php',
__DIR__ . '/../src/adapter/etl-adapter-doctrine/src/Flow/ETL/Adapter/Doctrine/functions.php',
__DIR__ . '/../src/adapter/etl-adapter-excel/src/Flow/ETL/Adapter/Excel/DSL/functions.php',
__DIR__ . '/../src/adapter/etl-adapter-elasticsearch/src/Flow/ETL/Adapter/Elasticsearch/functions.php',
__DIR__ . '/../src/adapter/etl-adapter-google-sheet/src/Flow/ETL/Adapter/GoogleSheet/functions.php',
__DIR__ . '/../src/adapter/etl-adapter-http/src/Flow/ETL/Adapter/Http/DSL/functions.php',
__DIR__ . '/../src/adapter/etl-adapter-json/src/Flow/ETL/Adapter/JSON/functions.php',
__DIR__ . '/../src/adapter/etl-adapter-parquet/src/Flow/ETL/Adapter/Parquet/functions.php',
__DIR__ . '/../src/adapter/etl-adapter-seal/src/Flow/ETL/Adapter/Seal/functions.php',
__DIR__ . '/../src/adapter/etl-adapter-text/src/Flow/ETL/Adapter/Text/functions.php',
__DIR__ . '/../src/adapter/etl-adapter-xml/src/Flow/ETL/Adapter/XML/functions.php',
__DIR__ . '/../src/lib/filesystem/src/Flow/Filesystem/DSL/functions.php',
Expand Down
12 changes: 0 additions & 12 deletions compose.yml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,6 @@ services:
MYSQL_ROOT_PASSWORD: root
networks:
- flow-php
elasticsearch:

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are we sure we dont wanna keep at least one real search engine in the repo? I mean I know we should be able to trust seal it works exactly same way but... Maybe keeping elasticsearch wouldnt be a bad idea and use it in integration tests keeping memory adapter for unit tests? (no strong opinion about this one yet, I never used seal so dont know how much in memory implementation is different from actual one)

image: elasticsearch:7.17.2
container_name: flow-php-elasticsearch
ports:
- 9200:9200
environment:
- node.name=es01
- discovery.type=single-node
- bootstrap.memory_lock=true
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
networks:
- flow-php
azurite:
image: mcr.microsoft.com/azure-storage/azurite
container_name: flow-php-azurite
Expand Down
11 changes: 6 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
"composer-runtime-api": "^2.2",
"async-aws/s3": "^2.6 || ^3.0",
"brick/math": "^0.12 || ^0.13 || ^0.14 || ^0.15 || ^0.16 || ^0.17",
"cmsig/seal": "^0.12",
"coduo/php-humanizer": "^5.0",
"cuyz/valinor": "^2.4",
"doctrine/dbal": "^4.4",
"elasticsearch/elasticsearch": "^7.6|^8.0",
"google/apiclient": "^2.13",
"google/protobuf": "^4.0 || ^5.0",
"halaxa/json-machine": "^1.1",
Expand All @@ -52,6 +52,7 @@
"webmozart/glob": "^3.0 || ^4.0"
},
"require-dev": {
"cmsig/seal-memory-adapter": "^0.12",
"composer/semver": "^3.4",
"fakerphp/faker": "^1.23",
"fig/log-test": "^1.1",
Expand Down Expand Up @@ -83,7 +84,6 @@
"flow-php/etl-adapter-chartjs": "self.version",
"flow-php/etl-adapter-csv": "self.version",
"flow-php/etl-adapter-doctrine": "self.version",
"flow-php/etl-adapter-elasticsearch": "self.version",
"flow-php/etl-adapter-excel": "self.version",
"flow-php/etl-adapter-filesystem": "self.version",
"flow-php/etl-adapter-google-sheet": "self.version",
Expand All @@ -92,6 +92,7 @@
"flow-php/etl-adapter-logger": "self.version",
"flow-php/etl-adapter-parquet": "self.version",
"flow-php/etl-adapter-postgresql": "self.version",
"flow-php/etl-adapter-seal": "self.version",
"flow-php/etl-adapter-text": "self.version",
"flow-php/etl-adapter-xml": "self.version",
"flow-php/filesystem": "self.version",
Expand Down Expand Up @@ -136,14 +137,14 @@
"src/adapter/etl-adapter-chartjs/src/Flow",
"src/adapter/etl-adapter-csv/src/Flow",
"src/adapter/etl-adapter-doctrine/src/Flow",
"src/adapter/etl-adapter-elasticsearch/src/Flow",
"src/adapter/etl-adapter-excel/src/Flow",
"src/adapter/etl-adapter-google-sheet/src/Flow",
"src/adapter/etl-adapter-http/src/Flow",
"src/adapter/etl-adapter-json/src/Flow",
"src/adapter/etl-adapter-logger/src/Flow",
"src/adapter/etl-adapter-parquet/src/Flow",
"src/adapter/etl-adapter-postgresql/src/Flow",
"src/adapter/etl-adapter-seal/src/Flow",
"src/adapter/etl-adapter-text/src/Flow",
"src/adapter/etl-adapter-xml/src/Flow",
"src/bridge/filesystem/async-aws/src/Flow",
Expand Down Expand Up @@ -202,13 +203,13 @@
"src/adapter/etl-adapter-chartjs/src/Flow/ETL/Adapter/ChartJS/functions.php",
"src/adapter/etl-adapter-csv/src/Flow/ETL/Adapter/CSV/functions.php",
"src/adapter/etl-adapter-doctrine/src/Flow/ETL/Adapter/Doctrine/functions.php",
"src/adapter/etl-adapter-elasticsearch/src/Flow/ETL/Adapter/Elasticsearch/functions.php",
"src/adapter/etl-adapter-excel/src/Flow/ETL/Adapter/Excel/DSL/functions.php",
"src/adapter/etl-adapter-google-sheet/src/Flow/ETL/Adapter/GoogleSheet/functions.php",
"src/adapter/etl-adapter-http/src/Flow/ETL/Adapter/Http/DSL/functions.php",
"src/adapter/etl-adapter-json/src/Flow/ETL/Adapter/JSON/functions.php",
"src/adapter/etl-adapter-parquet/src/Flow/ETL/Adapter/Parquet/functions.php",
"src/adapter/etl-adapter-postgresql/src/Flow/ETL/Adapter/PostgreSql/functions.php",
"src/adapter/etl-adapter-seal/src/Flow/ETL/Adapter/Seal/functions.php",
"src/adapter/etl-adapter-text/src/Flow/ETL/Adapter/Text/functions.php",
"src/adapter/etl-adapter-xml/src/Flow/ETL/Adapter/XML/functions.php",
"src/bridge/filesystem/async-aws/src/Flow/Filesystem/Bridge/AsyncAWS/DSL/functions.php",
Expand Down Expand Up @@ -254,14 +255,14 @@
"src/adapter/etl-adapter-chartjs/tests/Flow",
"src/adapter/etl-adapter-csv/tests/Flow",
"src/adapter/etl-adapter-doctrine/tests/Flow",
"src/adapter/etl-adapter-elasticsearch/tests/Flow",
"src/adapter/etl-adapter-excel/tests/Flow",
"src/adapter/etl-adapter-google-sheet/tests/Flow",
"src/adapter/etl-adapter-http/tests/Flow",
"src/adapter/etl-adapter-json/tests/Flow",
"src/adapter/etl-adapter-logger/tests/Flow",
"src/adapter/etl-adapter-parquet/tests/Flow",
"src/adapter/etl-adapter-postgresql/tests/Flow",
"src/adapter/etl-adapter-seal/tests/Flow",
"src/adapter/etl-adapter-text/tests/Flow",
"src/adapter/etl-adapter-xml/tests/Flow",
"src/bridge/filesystem/async-aws/tests/Flow",
Expand Down
Loading
Loading