Skip to content

Commit c93782b

Browse files
matthewmturnermatthewmturner
authored
Update text area (#368)
Closes #367
1 parent cddb4d8 commit c93782b

12 files changed

Lines changed: 769 additions & 215 deletions

File tree

‎.claude/settings.local.json‎

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

‎.github/workflows/test.yml‎

Lines changed: 72 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,14 @@ jobs:
8585
test-cli:
8686
name: App / CLI
8787
runs-on: ubuntu-latest
88+
services:
89+
rustfs:
90+
image: rustfs/rustfs:latest
91+
ports:
92+
- 9000:9000
93+
env:
94+
RUSTFS_ACCESS_KEY: LSIAQAAAAAAVNCBMPNSG
95+
RUSTFS_SECRET_KEY: "5555555555555555555555555555555555555555"
8896
strategy:
8997
matrix:
9098
arch: [amd64]
@@ -107,24 +115,32 @@ jobs:
107115
target-${{ runner.os }}-
108116
- name: Setup Rust Toolchain
109117
uses: ./.github/actions/setup-rust
110-
- name: Start LocalStack
111-
uses: LocalStack/setup-localstack@v0.2.3
112-
with:
113-
image-tag: 'latest'
114-
install-awslocal: 'true'
115-
configuration: DEBUG=1
116-
- name: Run Tests against LocalStack
118+
- name: Wait for RustFS
119+
run: timeout 60 bash -c 'until nc -z localhost 9000; do sleep 2; done'
120+
- name: Setup S3 buckets
121+
env:
122+
AWS_ACCESS_KEY_ID: LSIAQAAAAAAVNCBMPNSG
123+
AWS_SECRET_ACCESS_KEY: "5555555555555555555555555555555555555555"
124+
AWS_DEFAULT_REGION: us-east-1
117125
run: |
118-
awslocal s3 mb s3://test
119-
awslocal s3 mv data/aggregate_test_100.csv s3://test/
120-
awslocal s3 mb s3://tpch-db
126+
aws --endpoint-url http://localhost:9000 s3 mb s3://test
127+
aws --endpoint-url http://localhost:9000 s3 cp data/aggregate_test_100.csv s3://test/
128+
aws --endpoint-url http://localhost:9000 s3 mb s3://tpch-db
121129
echo "Test Execution complete!"
122130
- name: Run CLI tests
123131
run: |
124132
cargo test cli_cases
125133
test-tui:
126134
name: App / TUI
127135
runs-on: ubuntu-latest
136+
services:
137+
rustfs:
138+
image: rustfs/rustfs:latest
139+
ports:
140+
- 9000:9000
141+
env:
142+
RUSTFS_ACCESS_KEY: LSIAQAAAAAAVNCBMPNSG
143+
RUSTFS_SECRET_KEY: "5555555555555555555555555555555555555555"
128144
strategy:
129145
matrix:
130146
arch: [amd64]
@@ -147,17 +163,17 @@ jobs:
147163
target-${{ runner.os }}-
148164
- name: Setup Rust Toolchain
149165
uses: ./.github/actions/setup-rust
150-
- name: Start LocalStack
151-
uses: LocalStack/setup-localstack@v0.2.3
152-
with:
153-
image-tag: 'latest'
154-
install-awslocal: 'true'
155-
configuration: DEBUG=1
156-
- name: Run Tests against LocalStack
166+
- name: Wait for RustFS
167+
run: timeout 60 bash -c 'until nc -z localhost 9000; do sleep 2; done'
168+
- name: Setup S3 buckets
169+
env:
170+
AWS_ACCESS_KEY_ID: LSIAQAAAAAAVNCBMPNSG
171+
AWS_SECRET_ACCESS_KEY: "5555555555555555555555555555555555555555"
172+
AWS_DEFAULT_REGION: us-east-1
157173
run: |
158-
awslocal s3 mb s3://test
159-
awslocal s3 mv data/aggregate_test_100.csv s3://test/
160-
awslocal s3 mb s3://tpch-db
174+
aws --endpoint-url http://localhost:9000 s3 mb s3://test
175+
aws --endpoint-url http://localhost:9000 s3 cp data/aggregate_test_100.csv s3://test/
176+
aws --endpoint-url http://localhost:9000 s3 mb s3://tpch-db
161177
echo "Test Execution complete!"
162178
- name: Run TUI tests
163179
run: |
@@ -166,6 +182,14 @@ jobs:
166182
test-s3:
167183
name: Extension / S3
168184
runs-on: ubuntu-latest
185+
services:
186+
rustfs:
187+
image: rustfs/rustfs:latest
188+
ports:
189+
- 9000:9000
190+
env:
191+
RUSTFS_ACCESS_KEY: LSIAQAAAAAAVNCBMPNSG
192+
RUSTFS_SECRET_KEY: "5555555555555555555555555555555555555555"
169193
strategy:
170194
matrix:
171195
arch: [amd64]
@@ -188,20 +212,20 @@ jobs:
188212
target-${{ runner.os }}-
189213
- name: Setup Rust Toolchain
190214
uses: ./.github/actions/setup-rust
191-
- name: Start LocalStack
192-
uses: LocalStack/setup-localstack@v0.2.3
193-
with:
194-
image-tag: 'latest'
195-
install-awslocal: 'true'
196-
configuration: DEBUG=1
197-
- name: Run Tests against LocalStack
215+
- name: Wait for RustFS
216+
run: timeout 60 bash -c 'until nc -z localhost 9000; do sleep 2; done'
217+
- name: Setup S3 buckets
218+
env:
219+
AWS_ACCESS_KEY_ID: LSIAQAAAAAAVNCBMPNSG
220+
AWS_SECRET_ACCESS_KEY: "5555555555555555555555555555555555555555"
221+
AWS_DEFAULT_REGION: us-east-1
198222
run: |
199-
awslocal s3 mb s3://test
200-
awslocal s3 mv data/aggregate_test_100.csv s3://test/
223+
aws --endpoint-url http://localhost:9000 s3 mb s3://test
224+
aws --endpoint-url http://localhost:9000 s3 cp data/aggregate_test_100.csv s3://test/
201225
echo "Test Execution complete!"
202226
- name: Run S3 tests
203227
run: |
204-
cargo test --features=s3 extension_cases::s3
228+
cargo test --features=s3 extension_cases::s3 -- --test-threads=1
205229
test-functions-json:
206230
name: Extension / Functions-JSON
207231
runs-on: ubuntu-latest
@@ -235,6 +259,14 @@ jobs:
235259
test-deltalake:
236260
name: Extension / Deltalake
237261
runs-on: ubuntu-latest
262+
services:
263+
rustfs:
264+
image: rustfs/rustfs:latest
265+
ports:
266+
- 9000:9000
267+
env:
268+
RUSTFS_ACCESS_KEY: LSIAQAAAAAAVNCBMPNSG
269+
RUSTFS_SECRET_KEY: "5555555555555555555555555555555555555555"
238270
strategy:
239271
matrix:
240272
arch: [amd64]
@@ -257,26 +289,20 @@ jobs:
257289
target-${{ runner.os }}-
258290
- name: Setup Rust Toolchain
259291
uses: ./.github/actions/setup-rust
260-
- name: Start LocalStack
261-
uses: LocalStack/setup-localstack@v0.2.3
262-
with:
263-
image-tag: 'latest'
264-
install-awslocal: 'true'
265-
configuration: DEBUG=1
266-
- name: Upload Delta Lake data to LocalStack
292+
- name: Wait for RustFS
293+
run: timeout 60 bash -c 'until nc -z localhost 9000; do sleep 2; done'
294+
- name: Upload Delta Lake data to RustFS
295+
env:
296+
AWS_ACCESS_KEY_ID: LSIAQAAAAAAVNCBMPNSG
297+
AWS_SECRET_ACCESS_KEY: "5555555555555555555555555555555555555555"
298+
AWS_DEFAULT_REGION: us-east-1
267299
run: |
268-
awslocal s3 mb s3://test
269-
awslocal s3 sync data/deltalake/simple_table s3://test/deltalake/simple_table
270-
echo "Delta Lake data uploaded to LocalStack"
300+
aws --endpoint-url http://localhost:9000 s3 mb s3://test
301+
aws --endpoint-url http://localhost:9000 s3 sync data/deltalake/simple_table s3://test/deltalake/simple_table
302+
echo "Delta Lake data uploaded to RustFS"
271303
- name: Run Deltalake tests
272304
run: |
273305
cargo test --features="deltalake s3" extension_cases::deltalake
274-
env:
275-
AWS_ACCESS_KEY_ID: LSIAQAAAAAAVNCBMPNSG
276-
AWS_SECRET_ACCESS_KEY: 5555555555555555555555555555555555555555
277-
AWS_ENDPOINT_URL: http://localhost:4566
278-
AWS_REGION: us-east-1
279-
AWS_ALLOW_HTTP: true
280306
test-udfs-wasm:
281307
name: Extension / UDFs-WASM
282308
runs-on: ubuntu-latest

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,3 +104,5 @@ bench/url_files/*
104104

105105
# Tags
106106
tags
107+
108+
.claude/settings.local.json

0 commit comments

Comments
 (0)
⚡