Skip to content

Commit b27cf10

Browse files
pepamartinecpepamartinec
authored
Merge pull request #393 from keboola/pepa_PAT-329_removeBackends
[staging-provider,IM,OM]: Drop support for deprecated backends
2 parents 107892e + da7b12d commit b27cf10

26 files changed

+25
-1922
lines changed

‎.env‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,3 @@ STORAGE_API_URL=https://connection.keboola.com
22
VAULT_API_URL=https://vault.keboola.com
33
STORAGE_API_TOKEN=
44
STORAGE_API_TOKEN_MASTER=
5-
RUN_SYNAPSE_TESTS=0
6-
SYNAPSE_STORAGE_API_URL=https://connection.eu-central-1.keboola.com
7-
SYNAPSE_STORAGE_API_TOKEN=

‎README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ Create `.env.local` file from this `.env` template and fill the missing envs:
1212
cp .env .env.local
1313
```
1414

15-
To run Synapse tests, set `RUN_SYNAPSE_TESTS=1` and supply a Storage API token to a project with [Synapse backend](https://keboola.atlassian.net/browse/PS-707). Synapse tests are by default skipped (unless the above env is set).
16-
1715
Run test suite:
1816

1917
```

‎azure-pipelines.tests.yml‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ jobs:
2222
testCommand: 'composer install && composer paratest -- --testsuite=CommonPart1 -f -p 3'
2323
variables:
2424
STORAGE_API_URL: $(STORAGE_API_URL_AWS)
25-
RUN_SYNAPSE_TESTS: 0
2625
secrets:
2726
STORAGE_API_TOKEN: $(INPUT_MAPPING__STORAGE_API_TOKEN_AWS)
2827
STORAGE_API_TOKEN_MASTER: $(INPUT_MAPPING__STORAGE_API_TOKEN_MASTER_AWS)
@@ -36,7 +35,6 @@ jobs:
3635
testCommand: 'composer install && vendor/bin/phpunit --testsuite Aws'
3736
variables:
3837
STORAGE_API_URL: $(STORAGE_API_URL_AWS)
39-
RUN_SYNAPSE_TESTS: 0
4038
secrets:
4139
STORAGE_API_TOKEN: $(INPUT_MAPPING__STORAGE_API_TOKEN_AWS)
4240
STORAGE_API_TOKEN_MASTER: $(INPUT_MAPPING__STORAGE_API_TOKEN_MASTER_AWS)
@@ -50,7 +48,6 @@ jobs:
5048
testCommand: 'composer install && vendor/bin/phpunit --testsuite CommonPart2'
5149
variables:
5250
STORAGE_API_URL: $(STORAGE_API_URL_AWS)
53-
RUN_SYNAPSE_TESTS: 0
5451
secrets:
5552
STORAGE_API_TOKEN: $(INPUT_MAPPING__STORAGE_API_TOKEN_AWS)
5653
STORAGE_API_TOKEN_MASTER: $(INPUT_MAPPING__STORAGE_API_TOKEN_MASTER_AWS)
@@ -64,7 +61,6 @@ jobs:
6461
testCommand: 'composer install && composer paratest -- --testsuite=CommonFiles -f -p 3'
6562
variables:
6663
STORAGE_API_URL: $(STORAGE_API_URL_AWS)
67-
RUN_SYNAPSE_TESTS: 0
6864
secrets:
6965
STORAGE_API_TOKEN: $(INPUT_MAPPING__STORAGE_API_TOKEN_AWS)
7066
STORAGE_API_TOKEN_MASTER: $(INPUT_MAPPING__STORAGE_API_TOKEN_MASTER_AWS)
@@ -78,7 +74,6 @@ jobs:
7874
testCommand: 'composer install && composer paratest -- --testsuite=CommonPart1 -f -p 3'
7975
variables:
8076
STORAGE_API_URL: $(STORAGE_API_URL_AZURE)
81-
RUN_SYNAPSE_TESTS: 0
8277
secrets:
8378
STORAGE_API_TOKEN: $(INPUT_MAPPING__STORAGE_API_TOKEN_AZURE)
8479
STORAGE_API_TOKEN_MASTER: $(INPUT_MAPPING__STORAGE_API_TOKEN_MASTER_AZURE)
@@ -92,7 +87,6 @@ jobs:
9287
testCommand: 'composer install && vendor/bin/phpunit --testsuite Azure'
9388
variables:
9489
STORAGE_API_URL: $(STORAGE_API_URL_AZURE)
95-
RUN_SYNAPSE_TESTS: 0
9690
secrets:
9791
STORAGE_API_TOKEN: $(INPUT_MAPPING__STORAGE_API_TOKEN_AZURE)
9892
STORAGE_API_TOKEN_MASTER: $(INPUT_MAPPING__STORAGE_API_TOKEN_MASTER_AZURE)
@@ -106,7 +100,6 @@ jobs:
106100
testCommand: 'composer install && vendor/bin/phpunit --testsuite CommonPart2'
107101
variables:
108102
STORAGE_API_URL: $(STORAGE_API_URL_AZURE)
109-
RUN_SYNAPSE_TESTS: 0
110103
secrets:
111104
STORAGE_API_TOKEN: $(INPUT_MAPPING__STORAGE_API_TOKEN_AZURE)
112105
STORAGE_API_TOKEN_MASTER: $(INPUT_MAPPING__STORAGE_API_TOKEN_MASTER_AZURE)
@@ -120,26 +113,10 @@ jobs:
120113
testCommand: 'composer install && composer paratest -- --testsuite=CommonFiles -f -p 3'
121114
variables:
122115
STORAGE_API_URL: $(STORAGE_API_URL_AZURE)
123-
RUN_SYNAPSE_TESTS: 0
124116
secrets:
125117
STORAGE_API_TOKEN: $(INPUT_MAPPING__STORAGE_API_TOKEN_AZURE)
126118
STORAGE_API_TOKEN_MASTER: $(INPUT_MAPPING__STORAGE_API_TOKEN_MASTER_AZURE)
127119

128-
# - template: ../../azure-pipelines/jobs/run-tests.yml
129-
# parameters:
130-
# jobName: azure_tests_php8_synapse
131-
# dependsOn: [cs]
132-
# displayName: Run Azure Testsuite on Azure with Synapse
133-
# serviceName: dev-input-mapping
134-
# testCommand: 'composer install && vendor/bin/phpunit --testsuite AzureSynapse'
135-
# variables:
136-
# STORAGE_API_URL: $(STORAGE_API_URL_AZURE)
137-
# RUN_SYNAPSE_TESTS: 0
138-
# secrets:
139-
# STORAGE_API_TOKEN: $(INPUT_MAPPING__STORAGE_API_TOKEN_AZURE)
140-
# STORAGE_API_TOKEN_MASTER: $(INPUT_MAPPING__STORAGE_API_TOKEN_MASTER_AZURE)
141-
# SYNAPSE_STORAGE_API_TOKEN: $(SYNAPSE_STORAGE_API_TOKEN)
142-
143120
- template: ../../azure-pipelines/jobs/run-tests.yml
144121
parameters:
145122
jobName: aws_tests_php8_bigquery
@@ -149,7 +126,6 @@ jobs:
149126
testCommand: 'composer install && vendor/bin/phpunit --testsuite BigQuery'
150127
variables:
151128
STORAGE_API_URL: $(STORAGE_API_URL_AWS)
152-
RUN_SYNAPSE_TESTS: 0
153129
secrets:
154130
STORAGE_API_TOKEN: $(INPUT_MAPPING__STORAGE_API_TOKEN_AWS_BQ)
155131
STORAGE_API_TOKEN_MASTER: $(INPUT_MAPPING__STORAGE_API_TOKEN_AWS_BQ)

‎phpunit.xml.dist‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,13 @@
1313
<testsuites>
1414
<testsuite name="CommonPart1">
1515
<directory>tests</directory>
16-
<exclude>tests/Functional/DownloadFilesAbsWorkspaceTest.php</exclude>
1716
<exclude>tests/Functional/DownloadFilesTest.php</exclude>
1817
<exclude>tests/Functional/DownloadFilesAdaptiveTest.php</exclude>
1918
<exclude>tests/Functional/DownloadFilesBranchTest.php</exclude>
2019
<exclude>tests/Functional/DownloadFilesAdaptiveBranchTest.php</exclude>
21-
<exclude>tests/Functional/DownloadFilesRedshiftTest.php</exclude>
22-
<exclude>tests/Functional/DownloadTablesRedshiftTest.php</exclude>
2320
<exclude>tests/Functional/DownloadTablesDefaultTest.php</exclude>
2421
<exclude>tests/Functional/DownloadTablesS3DefaultTest.php</exclude>
2522
<exclude>tests/Functional/DownloadTablesABSDefaultTest.php</exclude>
26-
<exclude>tests/Functional/DownloadTablesWorkspaceAbsTest.php</exclude>
27-
<exclude>tests/Functional/DownloadTablesWorkspaceRedshiftTest.php</exclude>
28-
<exclude>tests/Functional/DownloadTablesSynapseTest.php</exclude>
29-
<exclude>tests/Functional/DownloadTablesWorkspaceSynapseTest.php</exclude>
3023
<exclude>tests/Functional/DownloadTablesBigQueryTest.php</exclude>
3124
<exclude>tests/Functional/DownloadTablesWorkspaceBigQueryTest.php</exclude>
3225
<exclude>tests/Table/Strategy/BigQueryTest.php</exclude>
@@ -41,20 +34,11 @@
4134
<file>tests/Functional/DownloadFilesAdaptiveBranchTest.php</file>
4235
</testsuite>
4336
<testsuite name="Aws">
44-
<file>tests/Functional/DownloadFilesRedshiftTest.php</file>
45-
<file>tests/Functional/DownloadTablesRedshiftTest.php</file>
46-
<file>tests/Functional/DownloadTablesWorkspaceRedshiftTest.php</file>
4737
<file>tests/Functional/DownloadTablesS3DefaultTest.php</file>
4838
</testsuite>
4939
<testsuite name="Azure">
5040
<file>tests/Functional/DownloadTablesABSDefaultTest.php</file>
5141
</testsuite>
52-
<testsuite name="AzureSynapse">
53-
<file>tests/Functional/DownloadTablesSynapseTest.php</file>
54-
<file>tests/Functional/DownloadTablesWorkspaceSynapseTest.php</file>
55-
<file>tests/Functional/DownloadTablesWorkspaceAbsTest.php</file>
56-
<file>tests/Functional/DownloadFilesAbsWorkspaceTest.php</file>
57-
</testsuite>
5842
<testsuite name="BigQuery">
5943
<file>tests/Table/Strategy/BigQueryTest.php</file>
6044
<file>tests/Functional/DownloadTablesBigQueryTest.php</file>

‎src/File/Strategy/ABSWorkspace.php‎

Lines changed: 0 additions & 124 deletions
This file was deleted.

‎src/Staging/AbstractStrategyFactory.php‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,12 @@ abstract class AbstractStrategyFactory
1313
public const ABS = 'abs';
1414
public const LOCAL = 'local';
1515
public const S3 = 's3';
16-
public const WORKSPACE_ABS = 'workspace-abs';
17-
public const WORKSPACE_REDSHIFT = 'workspace-redshift';
16+
1817
public const WORKSPACE_SNOWFLAKE = 'workspace-snowflake';
19-
public const WORKSPACE_SYNAPSE = 'workspace-synapse';
20-
public const WORKSPACE_EXASOL = 'workspace-exasol';
21-
public const WORKSPACE_TERADATA = 'workspace-teradata';
2218
public const WORKSPACE_BIGQUERY = 'workspace-bigquery';
2319

2420
public const WORKSPACE_TYPES = [
25-
self::WORKSPACE_ABS,
26-
self::WORKSPACE_REDSHIFT,
2721
self::WORKSPACE_SNOWFLAKE,
28-
self::WORKSPACE_SYNAPSE,
29-
self::WORKSPACE_EXASOL,
30-
self::WORKSPACE_TERADATA,
3122
self::WORKSPACE_BIGQUERY,
3223
];
3324

‎src/Staging/StrategyFactory.php‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,15 @@
66

77
use Keboola\InputMapping\Exception\InvalidInputException;
88
use Keboola\InputMapping\Exception\StagingException;
9-
use Keboola\InputMapping\File\Strategy\ABSWorkspace as FileABSWorkspace;
109
use Keboola\InputMapping\File\Strategy\Local as FileLocal;
1110
use Keboola\InputMapping\File\StrategyInterface as FileStrategyInterface;
1211
use Keboola\InputMapping\State\InputFileStateList;
1312
use Keboola\InputMapping\State\InputTableStateList;
1413
use Keboola\InputMapping\Table\Strategy\ABS as TableABS;
15-
use Keboola\InputMapping\Table\Strategy\ABSWorkspace as TableABSWorkspace;
1614
use Keboola\InputMapping\Table\Strategy\BigQuery as TableBigQuery;
17-
use Keboola\InputMapping\Table\Strategy\Exasol as TableExasol;
1815
use Keboola\InputMapping\Table\Strategy\Local as TableLocal;
19-
use Keboola\InputMapping\Table\Strategy\Redshift as TableRedshift;
2016
use Keboola\InputMapping\Table\Strategy\S3 as TableS3;
2117
use Keboola\InputMapping\Table\Strategy\Snowflake as TableSnowflake;
22-
use Keboola\InputMapping\Table\Strategy\Synapse as TableSynapse;
23-
use Keboola\InputMapping\Table\Strategy\Teradata as TableTeradata;
2418
use Keboola\InputMapping\Table\StrategyInterface as TableStrategyInterface;
2519

2620
class StrategyFactory extends AbstractStrategyFactory
@@ -50,36 +44,11 @@ public function getStrategyMap(): array
5044
FileLocal::class,
5145
TableS3::class,
5246
),
53-
self::WORKSPACE_ABS => new InputMappingStagingDefinition(
54-
self::WORKSPACE_ABS,
55-
FileABSWorkspace::class,
56-
TableABSWorkspace::class,
57-
),
58-
self::WORKSPACE_REDSHIFT => new InputMappingStagingDefinition(
59-
self::WORKSPACE_REDSHIFT,
60-
FileLocal::class,
61-
TableRedshift::class,
62-
),
6347
self::WORKSPACE_SNOWFLAKE => new InputMappingStagingDefinition(
6448
self::WORKSPACE_SNOWFLAKE,
6549
FileLocal::class,
6650
TableSnowflake::class,
6751
),
68-
self::WORKSPACE_SYNAPSE => new InputMappingStagingDefinition(
69-
self::WORKSPACE_SYNAPSE,
70-
FileLocal::class,
71-
TableSynapse::class,
72-
),
73-
self::WORKSPACE_EXASOL => new InputMappingStagingDefinition(
74-
self::WORKSPACE_EXASOL,
75-
FileLocal::class,
76-
TableExasol::class,
77-
),
78-
self::WORKSPACE_TERADATA => new InputMappingStagingDefinition(
79-
self::WORKSPACE_TERADATA,
80-
FileLocal::class,
81-
TableTeradata::class,
82-
),
8352
self::WORKSPACE_BIGQUERY => new InputMappingStagingDefinition(
8453
self::WORKSPACE_BIGQUERY,
8554
FileLocal::class,

0 commit comments

Comments
 (0)