Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: move all fixtures from core/src/services/{service} to top-level fixtures/{service} #3088

Merged
merged 9 commits into from
Sep 15, 2023
Merged

refactor: move all fixtures from core/src/services/{service} to top-level fixtures/{service} #3088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bc8e60e
refactor(services/etcd): migration fixtures files
G-XD Sep 15, 2023
9af623c
refactor(services/tikv): migration fixtures files
G-XD Sep 15, 2023
4c77376
refactor(services/s3): migration fixtures files
G-XD Sep 15, 2023
c05a9d8
refactor(services/postgresql): migration fixtures files
G-XD Sep 15, 2023
3e517fe
refactor(services/redis): migration fixtures files
G-XD Sep 15, 2023
d0f8797
refactor(services/http): migration fixtures files
G-XD Sep 15, 2023
5fb8743
refactor(services/webdav): migration fixtures files
G-XD Sep 15, 2023
c3f5d07
ci: add fixtures path on github action
G-XD Sep 15, 2023
908cc4a
ci(services/http): fix err
G-XD Sep 15, 2023
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
5 changes: 3 additions & 2 deletions .github/workflows/service_test_etcd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ on:
- "!core/src/services/**"
- "core/src/services/etcd/**"
- ".github/workflows/service_test_etcd.yml"
- "fixtures/etcd/**"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
Expand Down Expand Up @@ -145,10 +146,10 @@ jobs:

- name: Copy Etcd Certificate Files
shell: bash
working-directory: core
working-directory: fixtures
run: |
mkdir -p /tmp/etcd
cp -r `pwd`/src/services/etcd/fixtures/* /tmp/etcd
cp -r `pwd`/etcd/* /tmp/etcd

- name: Configure Etcd Service With TLS
# ETCD will use ports: 23790,23791,23792,23800,23801,23802
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/service_test_http.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ on:
- "!core/src/services/**"
- "core/src/services/http/**"
- ".github/workflows/service_test_http.yml"
- "fixtures/http/**"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
Expand All @@ -48,7 +49,8 @@ jobs:
run: |
mkdir /tmp/static
cp -r tests/data/* /tmp/static
nginx -c `pwd`/src/services/http/fixtures/nginx.conf
cd ..
nginx -c `pwd`/fixtures/http/nginx.conf

- name: Setup Rust toolchain
uses: ./.github/actions/setup
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/service_test_postgresql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ on:
- "!core/src/services/**"
- "core/src/services/postgresql/**"
- ".github/workflows/service_test_postgresql.yml"
- "fixtures/postgresql/**"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
Expand All @@ -44,8 +45,8 @@ jobs:
- uses: actions/checkout@v3
- name: Setup Postgresql Server
shell: bash
working-directory: core
run: docker-compose -f `pwd`/src/services/postgresql/fixtures/docker-compose.yml up -d
working-directory: fixtures/postgresql
run: docker-compose -f docker-compose.yml up -d

- name: Setup Rust toolchain
uses: ./.github/actions/setup
Expand Down
21 changes: 11 additions & 10 deletions .github/workflows/service_test_redis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ on:
- "!core/src/services/**"
- "core/src/services/redis/**"
- ".github/workflows/service_test_redis.yml"
- "fixtures/redis/**"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
Expand All @@ -43,8 +44,8 @@ jobs:
- uses: actions/checkout@v3
- name: Setup Redis Server
shell: bash
working-directory: core
run: docker-compose -f `pwd`/src/services/redis/fixtures/docker-compose-redis.yml up -d
working-directory: fixtures/redis
run: docker-compose -f docker-compose-redis.yml up -d
- name: Setup Rust toolchain
uses: ./.github/actions/setup
with:
Expand All @@ -66,14 +67,14 @@ jobs:

- name: Setup Redis with TLS
shell: bash
working-directory: core
working-directory: fixtures/redis
run: |

# Install the CA in the system
sudo cp `pwd`/src/services/redis/fixtures/ssl/ca.crt /usr/local/share/ca-certificates
sudo cp ssl/ca.crt /usr/local/share/ca-certificates
sudo update-ca-certificates

docker-compose -f `pwd`/src/services/redis/fixtures/docker-compose-redis-tls.yml up -d
docker-compose -f docker-compose-redis-tls.yml up -d

- name: Setup Rust toolchain
uses: ./.github/actions/setup
Expand All @@ -100,8 +101,8 @@ jobs:
need-nextest: true
- name: Setup Redis Cluster
shell: bash
working-directory: core
run: docker-compose -f `pwd`/src/services/redis/fixtures/docker-compose-redis-cluster.yml up -d
working-directory: fixtures/redis
run: docker-compose -f docker-compose-redis-cluster.yml up -d
- name: Test
shell: bash
working-directory: core
Expand All @@ -120,15 +121,15 @@ jobs:

- name: Setup Redis Cluster with TLS
shell: bash
working-directory: core
working-directory: fixtures/redis
run: |

# Install the CA in the system

sudo cp `pwd`/src/services/redis/fixtures/ssl/ca.crt /usr/local/share/ca-certificates
sudo cp ssl/ca.crt /usr/local/share/ca-certificates
sudo update-ca-certificates

docker-compose -f `pwd`/src/services/redis/fixtures/docker-compose-redis-cluster-tls.yml up -d
docker-compose -f docker-compose-redis-cluster-tls.yml up -d

- name: Setup Rust toolchain
uses: ./.github/actions/setup
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/service_test_s3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ on:
- "!core/src/services/**"
- "core/src/services/s3/**"
- ".github/workflows/service_test_s3.yml"
- "fixtures/s3/**"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
Expand Down Expand Up @@ -113,7 +114,7 @@ jobs:
- uses: actions/checkout@v3
- name: Setup MinIO Server
shell: bash
working-directory: core/src/services/s3/fixtures
working-directory: fixtures/s3
run: docker-compose -f docker-compose-minio.yml up -d
- name: Setup test bucket
env:
Expand Down Expand Up @@ -143,7 +144,7 @@ jobs:
- uses: actions/checkout@v3
- name: Setup MinIO Server
shell: bash
working-directory: core/src/services/s3/fixtures
working-directory: fixtures/s3
run: |
docker-compose -f docker-compose-minio.yml up -d
- name: Setup test bucket
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/service_test_tikv.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ on:
- "!core/src/services/**"
- "core/src/services/tikv/**"
- ".github/workflows/service_test_tikv.yml"
- "fixtures/tikv/**"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
Expand All @@ -54,7 +55,7 @@ jobs:
[[ "$(curl -I http://127.0.0.1:2379/pd/api/v1/regions 2>/dev/null | head -n 1 | cut -d$' ' -f2)" -ne "405" ]] || break
sleep 1
done
working-directory: core/src/services/tikv/fixtures/
working-directory: fixtures/tikv

- name: Setup Rust toolchain
uses: ./.github/actions/setup
Expand All @@ -80,7 +81,7 @@ jobs:

- name: Copy Tikv Certificate Files
shell: bash
working-directory: core/src/services/tikv/fixtures/
working-directory: fixtures/tikv
run: |
mkdir -p /tmp/tikv/ssl
cp -r `pwd`/ssl/* /tmp/tikv/ssl
Expand Down Expand Up @@ -117,7 +118,7 @@ jobs:
[[ "$(curl -I --cacert /tmp/tikv/ssl/ca.pem --cert /tmp/tikv/ssl/client.pem --key /tmp/tikv/ssl/client-key.pem https://127.0.0.1:2379/pd/api/v1/regions 2>/dev/null | head -n 1 | cut -d$' ' -f2)" -ne "405" ]] || break
sleep 1
done
working-directory: core/src/services/tikv/fixtures/
working-directory: fixtures/tikv

- name: Setup Rust toolchain
uses: ./.github/actions/setup
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/service_test_webdav.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ on:
- "!core/src/services/**"
- "core/src/services/webdav/**"
- ".github/workflows/service_test_webdav.yml"
- "fixtures/webdav/**"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
Expand All @@ -48,7 +49,7 @@ jobs:

- name: Start nginx
shell: bash
working-directory: core/src/services/webdav/fixtures
working-directory: fixtures/webdav
run: docker compose -f docker-compose-webdav.yml up -d

- name: Test
Expand All @@ -70,7 +71,7 @@ jobs:

- name: Start nginx
shell: bash
working-directory: core/src/services/webdav/fixtures
working-directory: fixtures/webdav
run: docker compose -f docker-compose-webdav-with-auth.yml up -d

- name: Test with password
Expand All @@ -94,7 +95,7 @@ jobs:

- name: Start nginx
shell: bash
working-directory: core/src/services/webdav/fixtures
working-directory: fixtures/webdav
run: docker compose -f docker-compose-webdav-with-empty-passwd.yml up -d

- name: Test empty password
Expand All @@ -117,7 +118,7 @@ jobs:

- name: Start nginx
shell: bash
working-directory: core/src/services/webdav/fixtures
working-directory: fixtures/webdav
run: docker compose -f docker-compose-webdav.yml up -d

- name: Test with redirect
Expand Down
0 core/src/services/etcd/fixtures/ca-key.pem → fixtures/etcd/ca-key.pem
View file
Open in desktop
File renamed without changes.
0 core/src/services/etcd/fixtures/ca.pem → fixtures/etcd/ca.pem
View file
Open in desktop
File renamed without changes.
0 ...src/services/etcd/fixtures/client-key.pem → fixtures/etcd/client-key.pem
View file
Open in desktop
File renamed without changes.
0 core/src/services/etcd/fixtures/client.pem → fixtures/etcd/client.pem
View file
Open in desktop
File renamed without changes.
0 ...services/etcd/fixtures/etcd1/etcd-key.pem → fixtures/etcd/etcd1/etcd-key.pem
View file
Open in desktop
File renamed without changes.
0 ...src/services/etcd/fixtures/etcd1/etcd.pem → fixtures/etcd/etcd1/etcd.pem
View file
Open in desktop
File renamed without changes.
0 ...services/etcd/fixtures/etcd2/etcd-key.pem → fixtures/etcd/etcd2/etcd-key.pem
View file
Open in desktop
File renamed without changes.
0 ...src/services/etcd/fixtures/etcd2/etcd.pem → fixtures/etcd/etcd2/etcd.pem
View file
Open in desktop
File renamed without changes.
0 ...services/etcd/fixtures/etcd3/etcd-key.pem → fixtures/etcd/etcd3/etcd-key.pem
View file
Open in desktop
File renamed without changes.
0 ...src/services/etcd/fixtures/etcd3/etcd.pem → fixtures/etcd/etcd3/etcd.pem
View file
Open in desktop
File renamed without changes.
0 ...src/services/etcd/fixtures/server-key.pem → fixtures/etcd/server-key.pem
View file
Open in desktop
File renamed without changes.
0 core/src/services/etcd/fixtures/server.pem → fixtures/etcd/server.pem
View file
Open in desktop
File renamed without changes.
0 core/src/services/http/fixtures/nginx.conf → fixtures/http/nginx.conf
View file
Open in desktop
File renamed without changes.
0 ...es/postgresql/fixtures/docker-compose.yml → fixtures/postgresql/docker-compose.yml
View file
Open in desktop
File renamed without changes.
0 ...src/services/postgresql/fixtures/init.sql → fixtures/postgresql/init.sql
View file
Open in desktop
File renamed without changes.
0 ...ures/docker-compose-redis-cluster-tls.yml → ...edis/docker-compose-redis-cluster-tls.yml
View file
Open in desktop
File renamed without changes.
0 ...fixtures/docker-compose-redis-cluster.yml → ...es/redis/docker-compose-redis-cluster.yml
View file
Open in desktop
File renamed without changes.
0 ...dis/fixtures/docker-compose-redis-tls.yml → fixtures/redis/docker-compose-redis-tls.yml
View file
Open in desktop
File renamed without changes.
0 ...s/redis/fixtures/docker-compose-redis.yml → fixtures/redis/docker-compose-redis.yml
View file
Open in desktop
File renamed without changes.
0 core/src/services/redis/fixtures/ssl/ca.crt → fixtures/redis/ssl/ca.crt
View file
Open in desktop
File renamed without changes.
0 core/src/services/redis/fixtures/ssl/ca.key → fixtures/redis/ssl/ca.key
View file
Open in desktop
File renamed without changes.
0 core/src/services/redis/fixtures/ssl/ca.srl → fixtures/redis/ssl/ca.srl
View file
Open in desktop
File renamed without changes.
0 ...src/services/redis/fixtures/ssl/redis.crt → fixtures/redis/ssl/redis.crt
View file
Open in desktop
File renamed without changes.
0 ...src/services/redis/fixtures/ssl/redis.key → fixtures/redis/ssl/redis.key
View file
Open in desktop
File renamed without changes.
0 .../services/redis/fixtures/ssl/redis.v3.ext → fixtures/redis/ssl/redis.v3.ext
View file
Open in desktop
File renamed without changes.
0 ...ices/s3/fixtures/docker-compose-minio.yml → fixtures/s3/docker-compose-minio.yml
View file
Open in desktop
File renamed without changes.
0 core/src/services/tikv/fixtures/gen_cert.sh → fixtures/tikv/gen_cert.sh
View file
Open in desktop
File renamed without changes.
0 core/src/services/tikv/fixtures/pd-tls.toml → fixtures/tikv/pd-tls.toml
View file
Open in desktop
File renamed without changes.
0 core/src/services/tikv/fixtures/pd.toml → fixtures/tikv/pd.toml
View file
Open in desktop
File renamed without changes.
0 ...src/services/tikv/fixtures/ssl/ca-key.pem → fixtures/tikv/ssl/ca-key.pem
View file
Open in desktop
File renamed without changes.
0 core/src/services/tikv/fixtures/ssl/ca.pem → fixtures/tikv/ssl/ca.pem
View file
Open in desktop
File renamed without changes.
0 ...services/tikv/fixtures/ssl/client-key.pem → fixtures/tikv/ssl/client-key.pem
View file
Open in desktop
File renamed without changes.
0 ...src/services/tikv/fixtures/ssl/client.pem → fixtures/tikv/ssl/client.pem
View file
Open in desktop
File renamed without changes.
0 ...vices/tikv/fixtures/ssl/pd-server-key.pem → fixtures/tikv/ssl/pd-server-key.pem
View file
Open in desktop
File renamed without changes.
0 .../services/tikv/fixtures/ssl/pd-server.pem → fixtures/tikv/ssl/pd-server.pem
View file
Open in desktop
File renamed without changes.
0 ...ces/tikv/fixtures/ssl/tikv-server-key.pem → fixtures/tikv/ssl/tikv-server-key.pem
View file
Open in desktop
File renamed without changes.
0 ...ervices/tikv/fixtures/ssl/tikv-server.pem → fixtures/tikv/ssl/tikv-server.pem
View file
Open in desktop
File renamed without changes.
0 .../src/services/tikv/fixtures/tikv-tls.toml → fixtures/tikv/tikv-tls.toml
View file
Open in desktop
File renamed without changes.
0 core/src/services/tikv/fixtures/tikv.toml → fixtures/tikv/tikv.toml
View file
Open in desktop
File renamed without changes.
0 ...es/webdav/fixtures/config/nginx/http.conf → fixtures/webdav/config/nginx/http.conf
View file
Open in desktop
File renamed without changes.
0 ...tures/docker-compose-webdav-with-auth.yml → ...ebdav/docker-compose-webdav-with-auth.yml
View file
Open in desktop
File renamed without changes.
0 ...cker-compose-webdav-with-empty-passwd.yml → ...cker-compose-webdav-with-empty-passwd.yml
View file
Open in desktop
File renamed without changes.
0 ...webdav/fixtures/docker-compose-webdav.yml → fixtures/webdav/docker-compose-webdav.yml
View file
Open in desktop
File renamed without changes.