-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
253 changed files
with
3,336 additions
and
996 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| name: "Codeception Tests with Elasticsearch" | ||
|
|
||
| on: | ||
| # Enable Later. | ||
| #schedule: | ||
| # - cron: '0 3 * * 1,3,5' | ||
| pull_request: | ||
| branches: | ||
| - "[0-9]+.[0-9]+" | ||
| - "[0-9]+.x" | ||
| - "feature-*" | ||
| push: | ||
| branches: | ||
| - "[0-9]+.[0-9]+" | ||
| - "[0-9]+.x" | ||
|
|
||
| env: | ||
| PIMCORE_PROJECT_ROOT: ${{ github.workspace }} | ||
| APP_ENV: test | ||
| PIMCORE_TEST: 1 | ||
| PIMCORE_TEST_DB_DSN: "mysql://[email protected]:33006/pimcore_test" | ||
| PIMCORE_ELASTIC_SEARCH_HOST: "localhost:5300" | ||
| CODECEPTION_BUNDLE_PATH: "bundles/pimcore/generic-data-index-bundle/" | ||
|
|
||
| jobs: | ||
| codeception-tests: | ||
| name: "Codeception tests" | ||
| runs-on: "ubuntu-20.04" | ||
| continue-on-error: ${{ matrix.experimental }} | ||
| strategy: | ||
| matrix: | ||
| include: | ||
| - { php-version: "8.3", dependencies: "highest", pimcore_version: "11.x-dev as 11.99.9", experimental: true, search_engine: "elasticsearch"} | ||
|
|
||
| services: | ||
| mariadb: | ||
| image: "mariadb:10.11" | ||
| ports: | ||
| - 33006:3306 | ||
| env: | ||
| MYSQL_ALLOW_EMPTY_PASSWORD: yes | ||
|
|
||
| elastic: | ||
| image: elasticsearch:8.5.3 | ||
| ports: | ||
| - 5300:9200 | ||
| env: | ||
| discovery.type: "single-node" | ||
| ES_JAVA_OPTS: "-Xms1g -Xmx1g" | ||
| xpack.security.enabled: "true" | ||
| xpack.security.authc.anonymous.roles: "superuser,kibana_admin,kibana_system,kibana_user" | ||
| ELASTIC_USERNAME: "elastic" | ||
| ELASTIC_PASSWORD: "somethingsecret" | ||
|
|
||
| steps: | ||
| - name: "Checkout code" | ||
| uses: "actions/checkout@v2" | ||
| with: | ||
| path: "bundles/pimcore/generic-data-index-bundle" | ||
|
|
||
| - name: "Copy .github directory" | ||
| env: | ||
| REQUIRE_ADMIN_BUNDLE: "${{ matrix.require_admin_bundle }}" | ||
| run: | | ||
| cp -R bundles/pimcore/generic-data-index-bundle/.github .github | ||
| - name: "Install PHP" | ||
| uses: "shivammathur/setup-php@v2" | ||
| with: | ||
| coverage: xdebug | ||
| ini-values: display_errors=On, display_startup_errors=On, error_reporting=32767 | ||
| php-version: "${{ matrix.php-version }}" | ||
|
|
||
| - name: Verify MariaDB connection | ||
| run: | | ||
| cp .github/ci/files/.my.cnf ~/.my.cnf | ||
| while ! mysqladmin ping --silent; do | ||
| sleep 1 | ||
| done | ||
| - name: "Setup Pimcore environment" | ||
| env: | ||
| REQUIRE_ADMIN_BUNDLE: "${{ matrix.require_admin_bundle }}" | ||
| run: | | ||
| mysql -e "CREATE DATABASE pimcore_test CHARSET=utf8mb4;" | ||
| cp -R bundles/pimcore/generic-data-index-bundle/tests tests | ||
| mkdir src | ||
| chmod 755 .github/ci/scripts/setup-pimcore-environment-functional-tests.sh | ||
| .github/ci/scripts/setup-pimcore-environment-functional-tests.sh "${{ matrix.search_engine }}" | ||
| - name: "Wait for Elasticsearch to be up" | ||
| run: | | ||
| if [ "${{ matrix.search_engine }}" == "elasticsearch" ]; then | ||
| echo "Waiting for Elasticsearch to be ready..." | ||
| until curl -s -u elastic:somethingsecret http://localhost:5300/_cluster/health | grep -q '"status":"green"'; do | ||
| echo "Waiting... Elasticsearch is not yet available." | ||
| sleep 5 | ||
| done | ||
| echo "Elasticsearch is up and running!" | ||
| else | ||
| echo "Using OpenSearch for testing, skipping Elasticsearch wait." | ||
| fi | ||
| - name: "Update Pimcore version" | ||
| env: | ||
| PIMCORE_VERSION: "${{ matrix.pimcore_version }}" | ||
| run: | | ||
| if [ ! -z "$PIMCORE_VERSION" ]; then | ||
| composer require --no-update pimcore/pimcore:"${PIMCORE_VERSION}" | ||
| fi | ||
| - name: "Install dependencies with Composer" | ||
| uses: "ramsey/composer-install@v2" | ||
| with: | ||
| dependency-versions: "${{ matrix.dependencies }}" | ||
|
|
||
| - name: "Run Codeception" | ||
| run: | | ||
| vendor/bin/codecept run -c . -vvv --xml --coverage-xml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 33 additions & 33 deletions
66
...ces/search-index-adapter/open-search.yaml → .../search-index-adapter/default-search.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,79 +1,79 @@ | ||
| imports: | ||
| - { resource: 'services/search-index-adapter/open-search/modifiers/*' } | ||
| - { resource: 'services/search-index-adapter/open-search/pql-field-name-transformers.yaml' } | ||
| - { resource: 'services/search-index-adapter/default-search/modifiers/*' } | ||
| - { resource: 'services/search-index-adapter/default-search/pql-field-name-transformers.yaml' } | ||
|
|
||
| services: | ||
| _defaults: | ||
| autowire: true | ||
| autoconfigure: true | ||
| public: false | ||
|
|
||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\SearchIndexServiceInterface: | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\OpenSearchService | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\DefaultSearchService | ||
| arguments: | ||
| $openSearchClient: '@generic-data-index.opensearch-client' | ||
| $client: '@generic-data-index.search-client' | ||
|
|
||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\IndexAliasServiceInterface: | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\IndexAliasService | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\IndexAliasService | ||
| arguments: | ||
| $openSearchClient: '@generic-data-index.opensearch-client' | ||
| $client: '@generic-data-index.search-client' | ||
|
|
||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\Search\SearchExecutionServiceInterface: | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\Search\SearchExecutionService | ||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Search\SearchExecutionServiceInterface: | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Search\SearchExecutionService | ||
| arguments: | ||
| $openSearchClient: '@generic-data-index.opensearch-client' | ||
| $client: '@generic-data-index.search-client' | ||
|
|
||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\BulkOperationServiceInterface: | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\BulkOperationService | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\BulkOperationService | ||
| arguments: | ||
| $openSearchClient: '@generic-data-index.opensearch-client' | ||
| $client: '@generic-data-index.search-client' | ||
|
|
||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\PathServiceInterface: | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\PathService | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\PathService | ||
| arguments: | ||
| $openSearchClient: '@generic-data-index.opensearch-client' | ||
| $client: '@generic-data-index.search-client' | ||
|
|
||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\Search\Pagination\PaginationInfoServiceInterface: | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\Search\Pagination\PaginationInfoService | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Search\Pagination\PaginationInfoService | ||
|
|
||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\Search\LocateInTreeServiceInterface: | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\Search\LocateInTreeService | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Search\LocateInTreeService | ||
|
|
||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\Search\FetchIdsServiceInterface: | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\Search\FetchIdsService | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Search\FetchIdsService | ||
|
|
||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\Search\FetchIdsBySearchServiceInterface: | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\Search\FetchIdsBySearchService | ||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Search\FetchIdsBySearchServiceInterface: | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Search\FetchIdsBySearchService | ||
|
|
||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\MappingAnalyzerServiceInterface: | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\MappingAnalyzerService | ||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\MappingAnalyzerServiceInterface: | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\MappingAnalyzerService | ||
|
|
||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\IndexStatsServiceInterface: | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\IndexStatsService | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\IndexStatsService | ||
| arguments: | ||
| $openSearchClient: '@generic-data-index.opensearch-client' | ||
| $client: '@generic-data-index.search-client' | ||
|
|
||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\IndexMappingServiceInterface: | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\IndexMappingService | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\IndexMappingService | ||
|
|
||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\Workspace\QueryServiceInterface: | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\Workspace\QueryService | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Workspace\QueryService | ||
|
|
||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\Workspace\ElementWorkspacesQueryServiceInterface: | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\Workspace\ElementWorkspacesQueryService | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Workspace\ElementWorkspacesQueryService | ||
|
|
||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\QueryLanguage\PqlAdapterInterface: | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\QueryLanguage\PqlAdapter | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\QueryLanguage\PqlAdapter | ||
|
|
||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\QueryLanguage\SubQueriesProcessorInterface: | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\QueryLanguage\SubQueriesProcessor | ||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\QueryLanguage\SubQueriesProcessorInterface: | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\QueryLanguage\SubQueriesProcessor | ||
|
|
||
|
|
||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\QueryLanguage\FieldNameValidator\: | ||
| resource: '../../../src/SearchIndexAdapter/OpenSearch/QueryLanguage/FieldNameValidator' | ||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\QueryLanguage\FieldNameValidator\: | ||
| resource: '../../../src/SearchIndexAdapter/DefaultSearch/QueryLanguage/FieldNameValidator' | ||
| tags: ['pimcore.generic_data_index.pql_field_name_validator'] | ||
|
|
||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DataObject\IndexIconUpdateServiceInterface: | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\DataObject\IndexIconUpdateService | ||
| class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\DataObject\IndexIconUpdateService | ||
| arguments: | ||
| $openSearchClient: '@generic-data-index.opensearch-client' | ||
| $client: '@generic-data-index.search-client' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
config/services/search-index-adapter/default-search/modifiers/search-modifiers.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| services: | ||
| _defaults: | ||
| autowire: true | ||
| autoconfigure: true | ||
| public: false | ||
|
|
||
|
|
||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Search\Modifier\Aggregation\AssetAggregations: ~ | ||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Search\Modifier\Aggregation\TreeAggregations: ~ | ||
|
|
||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Search\Modifier\Filter\BasicFilters: ~ | ||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Search\Modifier\Filter\AssetFilters: ~ | ||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Search\Modifier\Filter\TreeFilters: ~ | ||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Search\Modifier\Filter\DependencyFilters: ~ | ||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Search\Modifier\Filter\FieldTypeFilters: ~ | ||
|
|
||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Search\Modifier\FullTextSearch\FullTextSearchHandlers: ~ | ||
|
|
||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Search\Modifier\Sort\TreeSortHandlers: ~ | ||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Search\Modifier\Sort\OrderByFieldsHandlers: ~ | ||
|
|
||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Search\Modifier\QueryLanguage\QueryLanguageHandlers: ~ | ||
|
|
||
| Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Search\Modifier\Filter\Workspace\WorkspaceQueryHandler: ~ |
Oops, something went wrong.