Skip to content

Commit 9195179

Browse files
committed
Merge branch 'develop'
2 parents 57754e4 + ed79254 commit 9195179

File tree

232 files changed

+5395
-2672
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

232 files changed

+5395
-2672
lines changed

.env.dependencies

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

.env.docker

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,87 @@
11
TZ=UTC
2+
SPARK_EXTERNAL_IP=onetl
23

34
# Greenplum
45
ONETL_GP_HOST=greenplum
56
ONETL_GP_PORT=5432
6-
ONETL_GP_DATABASE=postgres
7-
ONETL_GP_USER=gpadmin
8-
ONETL_GP_PASSWORD=
7+
ONETL_GP_DATABASE=onetl
8+
ONETL_GP_USER=onetl
9+
ONETL_GP_PASSWORD=123UsedForTestOnly@!
910

1011
# ClickHouse
1112
ONETL_CH_HOST=clickhouse
1213
ONETL_CH_PORT=8123
1314
ONETL_CH_PORT_CLIENT=9000
1415
ONETL_CH_DATABASE=default
1516
ONETL_CH_USER=default
16-
ONETL_CH_PASSWORD=
17+
ONETL_CH_PASSWORD=123UsedForTestOnly@!
1718

1819
# Kafka
1920
ONETL_KAFKA_HOST=kafka
2021
ONETL_KAFKA_PLAINTEXT_ANONYMOUS_PORT=9092
2122
ONETL_KAFKA_PLAINTEXT_SASL_PORT=9094
2223
ONETL_KAFKA_USER=onetl
23-
ONETL_KAFKA_PASSWORD=uufoFae9sahSoidoo0eagaidaoreif6z
24+
ONETL_KAFKA_PASSWORD=123UsedForTestOnly@!
2425

2526
# Mongo
2627
ONETL_MONGO_HOST=mongodb
2728
ONETL_MONGO_PORT=27017
28-
ONETL_MONGO_DB=admin
29+
ONETL_MONGO_DB=onetl
2930
ONETL_MONGO_USER=onetl
30-
ONETL_MONGO_PASSWORD=E4j7h!9A
31+
ONETL_MONGO_PASSWORD=123UsedForTestOnly@!
32+
ONETL_MONGO_ROOT_DB=admin
33+
ONETL_MONGO_ROOT_USER=admin
34+
ONETL_MONGO_ROOT_PASSWORD=123AdminUserForTests@!
3135

3236
# MSSQL
3337
ONETL_MSSQL_HOST=mssql
3438
ONETL_MSSQL_PORT=1433
3539
ONETL_MSSQL_DATABASE=onetl
3640
ONETL_MSSQL_USER=onetl
37-
ONETL_MSSQL_PASSWORD=7ellowEl7akey
41+
ONETL_MSSQL_PASSWORD=123UsedForTestOnly@!
3842

3943
# MySQL
4044
ONETL_MYSQL_HOST=mysql
4145
ONETL_MYSQL_PORT=3306
4246
ONETL_MYSQL_DATABASE=onetl
4347
ONETL_MYSQL_USER=onetl
44-
ONETL_MYSQL_PASSWORD=ohbuz9Eochaj9saibooK3thooGa5aesh
48+
ONETL_MYSQL_PASSWORD=123UsedForTestOnly@!
49+
ONETL_MYSQL_ROOT_USER=root
50+
ONETL_MYSQL_ROOT_PASSWORD=123RootUserForTestsOnly@!
4551

4652
# Postgres
4753
ONETL_PG_HOST=postgres
4854
ONETL_PG_PORT=5432
4955
ONETL_PG_DATABASE=onetl
5056
ONETL_PG_USER=onetl
51-
ONETL_PG_PASSWORD=ohtae0luxeshi1uraeluMoh9IShah7ai
57+
ONETL_PG_PASSWORD=123UsedForTestOnly@!
5258

5359
# Oracle
5460
ONETL_ORA_HOST=oracle
5561
ONETL_ORA_PORT=1521
5662
ONETL_ORA_SERVICE_NAME=FREEPDB1
5763
ONETL_ORA_USER=onetl
58-
ONETL_ORA_PASSWORD=Yoequ2Hoeceit4ch
64+
ONETL_ORA_PASSWORD=123UsedForTestOnly@!
65+
ONETL_ORA_ROOT_USER=SYSTEM
66+
ONETL_ORA_ROOT_PASSWORD=123AdminUserForTests@!
5967

6068
# FTP
6169
ONETL_FTP_HOST=ftp
6270
ONETL_FTP_PORT=21
6371
ONETL_FTP_USER=onetl
64-
ONETL_FTP_PASSWORD=awd123fd1
72+
ONETL_FTP_PASSWORD=123UsedForTestOnly@!
6573

6674
# FTPS
6775
ONETL_FTPS_HOST=ftps
6876
ONETL_FTPS_PORT=21
6977
ONETL_FTPS_USER=onetl
70-
ONETL_FTPS_PASSWORD=awd123fd1
78+
ONETL_FTPS_PASSWORD=123UsedForTestOnly@!
7179

7280
# S3
7381
ONETL_S3_HOST=s3
7482
ONETL_S3_PORT=9000
7583
ONETL_S3_ACCESS_KEY=onetl
76-
ONETL_S3_SECRET_KEY=woh3fogh3Biereu3quee1aidu9theiro
84+
ONETL_S3_SECRET_KEY=123UsedForTestOnly@!
7785
ONETL_S3_BUCKET=onetl
7886

7987
# HDFS
@@ -85,7 +93,7 @@ ONETL_HDFS_IPC_PORT=9820
8593
ONETL_SFTP_HOST=sftp
8694
ONETL_SFTP_PORT=2222
8795
ONETL_SFTP_USER=onetl
88-
ONETL_SFTP_PASSWORD=AesujeifohgoaCu0Boosiet5aimeitho
96+
ONETL_SFTP_PASSWORD=123UsedForTestOnly@!
8997

9098
# Samba
9199
ONETL_SAMBA_HOST=samba
@@ -95,10 +103,10 @@ ONETL_SAMBA_GID=1000
95103
ONETL_SAMBA_PORT=445
96104
ONETL_SAMBA_SHARE=SmbShare
97105
ONETL_SAMBA_USER=onetl
98-
ONETL_SAMBA_PASSWORD=awd123fd1
106+
ONETL_SAMBA_PASSWORD=123UsedForTestOnly@!
99107

100108
# Webdav
101109
ONETL_WEBDAV_HOST=webdav
102110
ONETL_WEBDAV_PORT=80
103111
ONETL_WEBDAV_USER=onetl
104-
ONETL_WEBDAV_PASSWORD=awd123fd1
112+
ONETL_WEBDAV_PASSWORD=123UsedForTestOnly@!

.env.local

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,87 @@
11
export TZ=UTC
2+
export SPARK_EXTERNAL_IP=$(docker network inspect onetl_onetl --format '{{ (index .IPAM.Config 0).Gateway }}')
23

34
# Greenplum
45
export ONETL_GP_HOST=localhost
56
export ONETL_GP_PORT=5433
6-
export ONETL_GP_DATABASE=postgres
7-
export ONETL_GP_USER=gpadmin
8-
export ONETL_GP_PASSWORD=
7+
export ONETL_GP_DATABASE=onetl
8+
export ONETL_GP_USER=onetl
9+
export ONETL_GP_PASSWORD=123UsedForTestOnly@!
910

1011
# ClickHouse
1112
export ONETL_CH_HOST=localhost
1213
export ONETL_CH_PORT=8123
1314
export ONETL_CH_PORT_CLIENT=9001
1415
export ONETL_CH_DATABASE=default
1516
export ONETL_CH_USER=default
16-
export ONETL_CH_PASSWORD=
17+
export ONETL_CH_PASSWORD=123UsedForTestOnly@!
1718

1819
# Kafka
1920
export ONETL_KAFKA_HOST=localhost
2021
export ONETL_KAFKA_PLAINTEXT_ANONYMOUS_PORT=9093
2122
export ONETL_KAFKA_PLAINTEXT_SASL_PORT=9095
2223
export ONETL_KAFKA_USER=onetl
23-
export ONETL_KAFKA_PASSWORD=uufoFae9sahSoidoo0eagaidaoreif6z
24+
export ONETL_KAFKA_PASSWORD=123UsedForTestOnly@!
2425

2526
# Mongo
2627
export ONETL_MONGO_HOST=localhost
2728
export ONETL_MONGO_PORT=27017
28-
export ONETL_MONGO_DB=admin
29+
export ONETL_MONGO_DB=onetl
2930
export ONETL_MONGO_USER=onetl
30-
export ONETL_MONGO_PASSWORD=E4j7h!9A
31+
export ONETL_MONGO_PASSWORD=123UsedForTestOnly@!
32+
export ONETL_MONGO_ROOT_DB=admin
33+
export ONETL_MONGO_ROOT_USER=admin
34+
export ONETL_MONGO_ROOT_PASSWORD=123AdminUserForTests@!
3135

3236
# MSSQL
3337
export ONETL_MSSQL_HOST=localhost
3438
export ONETL_MSSQL_PORT=1433
3539
export ONETL_MSSQL_DATABASE=onetl
3640
export ONETL_MSSQL_USER=onetl
37-
export ONETL_MSSQL_PASSWORD=7ellowEl7akey
41+
export ONETL_MSSQL_PASSWORD=123UsedForTestOnly@!
3842

3943
# MySQL
4044
export ONETL_MYSQL_HOST=localhost
4145
export ONETL_MYSQL_PORT=3306
4246
export ONETL_MYSQL_DATABASE=onetl
4347
export ONETL_MYSQL_USER=onetl
44-
export ONETL_MYSQL_PASSWORD=ohbuz9Eochaj9saibooK3thooGa5aesh
48+
export ONETL_MYSQL_PASSWORD=123UsedForTestOnly@!
49+
export ONETL_MYSQL_ROOT_USER=root
50+
export ONETL_MYSQL_ROOT_PASSWORD=123RootUserForTestsOnly@!
4551

4652
# Postgres
4753
export ONETL_PG_HOST=localhost
4854
export ONETL_PG_PORT=5432
4955
export ONETL_PG_DATABASE=onetl
5056
export ONETL_PG_USER=onetl
51-
export ONETL_PG_PASSWORD=ohtae0luxeshi1uraeluMoh9IShah7ai
57+
export ONETL_PG_PASSWORD=123UsedForTestOnly@!
5258

5359
# Oracle
5460
export ONETL_ORA_HOST=localhost
5561
export ONETL_ORA_PORT=1522
5662
export ONETL_ORA_SERVICE_NAME=FREEPDB1
5763
export ONETL_ORA_USER=onetl
58-
export ONETL_ORA_PASSWORD=Yoequ2Hoeceit4ch
64+
export ONETL_ORA_PASSWORD=123UsedForTestOnly@!
65+
export ONETL_ORA_ROOT_USER=SYSTEM
66+
export ONETL_ORA_ROOT_PASSWORD=123AdminUserForTests@!
5967

6068
# FTP
6169
export ONETL_FTP_HOST=localhost
6270
export ONETL_FTP_PORT=2121
6371
export ONETL_FTP_USER=onetl
64-
export ONETL_FTP_PASSWORD=awd123fd1
72+
export ONETL_FTP_PASSWORD=123UsedForTestOnly@!
6573

6674
# FTPS
6775
export ONETL_FTPS_HOST=localhost
6876
export ONETL_FTPS_PORT=2122
6977
export ONETL_FTPS_USER=onetl
70-
export ONETL_FTPS_PASSWORD=awd123fd1
78+
export ONETL_FTPS_PASSWORD=123UsedForTestOnly@!
7179

7280
# S3
7381
export ONETL_S3_HOST=localhost
7482
export ONETL_S3_PORT=9010
7583
export ONETL_S3_ACCESS_KEY=onetl
76-
export ONETL_S3_SECRET_KEY=woh3fogh3Biereu3quee1aidu9theiro
84+
export ONETL_S3_SECRET_KEY=123UsedForTestOnly@!
7785
export ONETL_S3_BUCKET=onetl
7886

7987
# HDFS
@@ -85,7 +93,7 @@ export ONETL_HDFS_IPC_PORT=9820
8593
export ONETL_SFTP_HOST=localhost
8694
export ONETL_SFTP_PORT=2222
8795
export ONETL_SFTP_USER=onetl
88-
export ONETL_SFTP_PASSWORD=AesujeifohgoaCu0Boosiet5aimeitho
96+
export ONETL_SFTP_PASSWORD=123UsedForTestOnly@!
8997

9098
# Samba
9199
export ONETL_SAMBA_HOST=localhost
@@ -95,10 +103,10 @@ export ONETL_SAMBA_GID=1000
95103
export ONETL_SAMBA_PORT=445
96104
export ONETL_SAMBA_SHARE=SmbShare
97105
export ONETL_SAMBA_USER=onetl
98-
export ONETL_SAMBA_PASSWORD=awd123fd1
106+
export ONETL_SAMBA_PASSWORD=123UsedForTestOnly@!
99107

100108
# Webdav
101109
export ONETL_WEBDAV_HOST=localhost
102110
export ONETL_WEBDAV_PORT=8000
103111
export ONETL_WEBDAV_USER=onetl
104-
export ONETL_WEBDAV_PASSWORD=awd123fd1
112+
export ONETL_WEBDAV_PASSWORD=123UsedForTestOnly@!

.github/workflows/changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- master
88

99
env:
10-
DEFAULT_PYTHON: '3.12'
10+
DEFAULT_PYTHON: '3.13'
1111

1212
permissions:
1313
contents: read

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ concurrency:
1414
cancel-in-progress: true
1515

1616
env:
17-
# flake8-commas is failing on Python 3.12
18-
# as well as bandit https://github.com/PyCQA/bandit/issues/1077
19-
DEFAULT_PYTHON: '3.11'
17+
DEFAULT_PYTHON: '3.13'
2018

2119
jobs:
2220
linters:
@@ -66,6 +64,8 @@ jobs:
6664
-r requirements/spark.txt \
6765
-r requirements/webdav.txt
6866
67+
pip install -U flake8-commas
68+
6969
# Set the `CODEQL-PYTHON` environment variable to the Python executable
7070
# that includes the dependencies
7171
echo "CODEQL_PYTHON=$(which python)" >> $GITHUB_ENV

.github/workflows/data/clickhouse/matrix.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
min: &min
22
# Clickhouse version with proper DateTime > DateTime64 comparison
33
clickhouse-image: yandex/clickhouse-server
4-
clickhouse-version: '21.1'
4+
clickhouse-version: '21.1-alpine'
55
spark-version: 2.3.1
66
pydantic-version: 1
77
python-version: '3.7'
88
java-version: 8
9-
os: ubuntu-latest
9+
os: ubuntu-22.04
1010

1111
max: &max
1212
clickhouse-image: clickhouse/clickhouse-server
13-
clickhouse-version: 24.8.2.3-alpine
14-
spark-version: 3.5.3
13+
clickhouse-version: 25.1-alpine
14+
spark-version: 3.5.4
1515
pydantic-version: 2
16-
python-version: '3.12'
16+
python-version: '3.13'
1717
java-version: 20
1818
os: ubuntu-latest
1919

@@ -22,7 +22,7 @@ latest: &latest
2222
clickhouse-version: latest-alpine
2323
spark-version: latest
2424
pydantic-version: latest
25-
python-version: '3.12'
25+
python-version: '3.13'
2626
java-version: 20
2727
os: ubuntu-latest
2828

0 commit comments

Comments
 (0)