diff --git a/.github/workflows/service_test_etcd.yml b/.github/workflows/service_test_etcd.yml index f2782ff95362..e9772147d740 100644 --- a/.github/workflows/service_test_etcd.yml +++ b/.github/workflows/service_test_etcd.yml @@ -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 }} @@ -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 diff --git a/.github/workflows/service_test_http.yml b/.github/workflows/service_test_http.yml index cd67e0e5b830..35c741a3427f 100644 --- a/.github/workflows/service_test_http.yml +++ b/.github/workflows/service_test_http.yml @@ -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 }} @@ -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 diff --git a/.github/workflows/service_test_postgresql.yml b/.github/workflows/service_test_postgresql.yml index a4aeb586609f..9b22e8f145b5 100644 --- a/.github/workflows/service_test_postgresql.yml +++ b/.github/workflows/service_test_postgresql.yml @@ -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 }} @@ -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 diff --git a/.github/workflows/service_test_redis.yml b/.github/workflows/service_test_redis.yml index 68e1d7c02dcf..85e6b48ef369 100644 --- a/.github/workflows/service_test_redis.yml +++ b/.github/workflows/service_test_redis.yml @@ -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 }} @@ -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: @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/service_test_s3.yml b/.github/workflows/service_test_s3.yml index 744164603d5d..b9c44f1dc91b 100644 --- a/.github/workflows/service_test_s3.yml +++ b/.github/workflows/service_test_s3.yml @@ -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 }} @@ -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: @@ -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 diff --git a/.github/workflows/service_test_tikv.yml b/.github/workflows/service_test_tikv.yml index a70173bb791e..c48f9c8a2e65 100644 --- a/.github/workflows/service_test_tikv.yml +++ b/.github/workflows/service_test_tikv.yml @@ -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 }} @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/service_test_webdav.yml b/.github/workflows/service_test_webdav.yml index 6d44c9700189..441b507e5356 100644 --- a/.github/workflows/service_test_webdav.yml +++ b/.github/workflows/service_test_webdav.yml @@ -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 }} @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/core/src/services/etcd/fixtures/ca-key.pem b/fixtures/etcd/ca-key.pem similarity index 100% rename from core/src/services/etcd/fixtures/ca-key.pem rename to fixtures/etcd/ca-key.pem diff --git a/core/src/services/etcd/fixtures/ca.pem b/fixtures/etcd/ca.pem similarity index 100% rename from core/src/services/etcd/fixtures/ca.pem rename to fixtures/etcd/ca.pem diff --git a/core/src/services/etcd/fixtures/client-key.pem b/fixtures/etcd/client-key.pem similarity index 100% rename from core/src/services/etcd/fixtures/client-key.pem rename to fixtures/etcd/client-key.pem diff --git a/core/src/services/etcd/fixtures/client.pem b/fixtures/etcd/client.pem similarity index 100% rename from core/src/services/etcd/fixtures/client.pem rename to fixtures/etcd/client.pem diff --git a/core/src/services/etcd/fixtures/etcd1/etcd-key.pem b/fixtures/etcd/etcd1/etcd-key.pem similarity index 100% rename from core/src/services/etcd/fixtures/etcd1/etcd-key.pem rename to fixtures/etcd/etcd1/etcd-key.pem diff --git a/core/src/services/etcd/fixtures/etcd1/etcd.pem b/fixtures/etcd/etcd1/etcd.pem similarity index 100% rename from core/src/services/etcd/fixtures/etcd1/etcd.pem rename to fixtures/etcd/etcd1/etcd.pem diff --git a/core/src/services/etcd/fixtures/etcd2/etcd-key.pem b/fixtures/etcd/etcd2/etcd-key.pem similarity index 100% rename from core/src/services/etcd/fixtures/etcd2/etcd-key.pem rename to fixtures/etcd/etcd2/etcd-key.pem diff --git a/core/src/services/etcd/fixtures/etcd2/etcd.pem b/fixtures/etcd/etcd2/etcd.pem similarity index 100% rename from core/src/services/etcd/fixtures/etcd2/etcd.pem rename to fixtures/etcd/etcd2/etcd.pem diff --git a/core/src/services/etcd/fixtures/etcd3/etcd-key.pem b/fixtures/etcd/etcd3/etcd-key.pem similarity index 100% rename from core/src/services/etcd/fixtures/etcd3/etcd-key.pem rename to fixtures/etcd/etcd3/etcd-key.pem diff --git a/core/src/services/etcd/fixtures/etcd3/etcd.pem b/fixtures/etcd/etcd3/etcd.pem similarity index 100% rename from core/src/services/etcd/fixtures/etcd3/etcd.pem rename to fixtures/etcd/etcd3/etcd.pem diff --git a/core/src/services/etcd/fixtures/server-key.pem b/fixtures/etcd/server-key.pem similarity index 100% rename from core/src/services/etcd/fixtures/server-key.pem rename to fixtures/etcd/server-key.pem diff --git a/core/src/services/etcd/fixtures/server.pem b/fixtures/etcd/server.pem similarity index 100% rename from core/src/services/etcd/fixtures/server.pem rename to fixtures/etcd/server.pem diff --git a/core/src/services/http/fixtures/nginx.conf b/fixtures/http/nginx.conf similarity index 100% rename from core/src/services/http/fixtures/nginx.conf rename to fixtures/http/nginx.conf diff --git a/core/src/services/postgresql/fixtures/docker-compose.yml b/fixtures/postgresql/docker-compose.yml similarity index 100% rename from core/src/services/postgresql/fixtures/docker-compose.yml rename to fixtures/postgresql/docker-compose.yml diff --git a/core/src/services/postgresql/fixtures/init.sql b/fixtures/postgresql/init.sql similarity index 100% rename from core/src/services/postgresql/fixtures/init.sql rename to fixtures/postgresql/init.sql diff --git a/core/src/services/redis/fixtures/docker-compose-redis-cluster-tls.yml b/fixtures/redis/docker-compose-redis-cluster-tls.yml similarity index 100% rename from core/src/services/redis/fixtures/docker-compose-redis-cluster-tls.yml rename to fixtures/redis/docker-compose-redis-cluster-tls.yml diff --git a/core/src/services/redis/fixtures/docker-compose-redis-cluster.yml b/fixtures/redis/docker-compose-redis-cluster.yml similarity index 100% rename from core/src/services/redis/fixtures/docker-compose-redis-cluster.yml rename to fixtures/redis/docker-compose-redis-cluster.yml diff --git a/core/src/services/redis/fixtures/docker-compose-redis-tls.yml b/fixtures/redis/docker-compose-redis-tls.yml similarity index 100% rename from core/src/services/redis/fixtures/docker-compose-redis-tls.yml rename to fixtures/redis/docker-compose-redis-tls.yml diff --git a/core/src/services/redis/fixtures/docker-compose-redis.yml b/fixtures/redis/docker-compose-redis.yml similarity index 100% rename from core/src/services/redis/fixtures/docker-compose-redis.yml rename to fixtures/redis/docker-compose-redis.yml diff --git a/core/src/services/redis/fixtures/ssl/ca.crt b/fixtures/redis/ssl/ca.crt similarity index 100% rename from core/src/services/redis/fixtures/ssl/ca.crt rename to fixtures/redis/ssl/ca.crt diff --git a/core/src/services/redis/fixtures/ssl/ca.key b/fixtures/redis/ssl/ca.key similarity index 100% rename from core/src/services/redis/fixtures/ssl/ca.key rename to fixtures/redis/ssl/ca.key diff --git a/core/src/services/redis/fixtures/ssl/ca.srl b/fixtures/redis/ssl/ca.srl similarity index 100% rename from core/src/services/redis/fixtures/ssl/ca.srl rename to fixtures/redis/ssl/ca.srl diff --git a/core/src/services/redis/fixtures/ssl/redis.crt b/fixtures/redis/ssl/redis.crt similarity index 100% rename from core/src/services/redis/fixtures/ssl/redis.crt rename to fixtures/redis/ssl/redis.crt diff --git a/core/src/services/redis/fixtures/ssl/redis.key b/fixtures/redis/ssl/redis.key similarity index 100% rename from core/src/services/redis/fixtures/ssl/redis.key rename to fixtures/redis/ssl/redis.key diff --git a/core/src/services/redis/fixtures/ssl/redis.v3.ext b/fixtures/redis/ssl/redis.v3.ext similarity index 100% rename from core/src/services/redis/fixtures/ssl/redis.v3.ext rename to fixtures/redis/ssl/redis.v3.ext diff --git a/core/src/services/s3/fixtures/docker-compose-minio.yml b/fixtures/s3/docker-compose-minio.yml similarity index 100% rename from core/src/services/s3/fixtures/docker-compose-minio.yml rename to fixtures/s3/docker-compose-minio.yml diff --git a/core/src/services/tikv/fixtures/gen_cert.sh b/fixtures/tikv/gen_cert.sh similarity index 100% rename from core/src/services/tikv/fixtures/gen_cert.sh rename to fixtures/tikv/gen_cert.sh diff --git a/core/src/services/tikv/fixtures/pd-tls.toml b/fixtures/tikv/pd-tls.toml similarity index 100% rename from core/src/services/tikv/fixtures/pd-tls.toml rename to fixtures/tikv/pd-tls.toml diff --git a/core/src/services/tikv/fixtures/pd.toml b/fixtures/tikv/pd.toml similarity index 100% rename from core/src/services/tikv/fixtures/pd.toml rename to fixtures/tikv/pd.toml diff --git a/core/src/services/tikv/fixtures/ssl/ca-key.pem b/fixtures/tikv/ssl/ca-key.pem similarity index 100% rename from core/src/services/tikv/fixtures/ssl/ca-key.pem rename to fixtures/tikv/ssl/ca-key.pem diff --git a/core/src/services/tikv/fixtures/ssl/ca.pem b/fixtures/tikv/ssl/ca.pem similarity index 100% rename from core/src/services/tikv/fixtures/ssl/ca.pem rename to fixtures/tikv/ssl/ca.pem diff --git a/core/src/services/tikv/fixtures/ssl/client-key.pem b/fixtures/tikv/ssl/client-key.pem similarity index 100% rename from core/src/services/tikv/fixtures/ssl/client-key.pem rename to fixtures/tikv/ssl/client-key.pem diff --git a/core/src/services/tikv/fixtures/ssl/client.pem b/fixtures/tikv/ssl/client.pem similarity index 100% rename from core/src/services/tikv/fixtures/ssl/client.pem rename to fixtures/tikv/ssl/client.pem diff --git a/core/src/services/tikv/fixtures/ssl/pd-server-key.pem b/fixtures/tikv/ssl/pd-server-key.pem similarity index 100% rename from core/src/services/tikv/fixtures/ssl/pd-server-key.pem rename to fixtures/tikv/ssl/pd-server-key.pem diff --git a/core/src/services/tikv/fixtures/ssl/pd-server.pem b/fixtures/tikv/ssl/pd-server.pem similarity index 100% rename from core/src/services/tikv/fixtures/ssl/pd-server.pem rename to fixtures/tikv/ssl/pd-server.pem diff --git a/core/src/services/tikv/fixtures/ssl/tikv-server-key.pem b/fixtures/tikv/ssl/tikv-server-key.pem similarity index 100% rename from core/src/services/tikv/fixtures/ssl/tikv-server-key.pem rename to fixtures/tikv/ssl/tikv-server-key.pem diff --git a/core/src/services/tikv/fixtures/ssl/tikv-server.pem b/fixtures/tikv/ssl/tikv-server.pem similarity index 100% rename from core/src/services/tikv/fixtures/ssl/tikv-server.pem rename to fixtures/tikv/ssl/tikv-server.pem diff --git a/core/src/services/tikv/fixtures/tikv-tls.toml b/fixtures/tikv/tikv-tls.toml similarity index 100% rename from core/src/services/tikv/fixtures/tikv-tls.toml rename to fixtures/tikv/tikv-tls.toml diff --git a/core/src/services/tikv/fixtures/tikv.toml b/fixtures/tikv/tikv.toml similarity index 100% rename from core/src/services/tikv/fixtures/tikv.toml rename to fixtures/tikv/tikv.toml diff --git a/core/src/services/webdav/fixtures/config/nginx/http.conf b/fixtures/webdav/config/nginx/http.conf similarity index 100% rename from core/src/services/webdav/fixtures/config/nginx/http.conf rename to fixtures/webdav/config/nginx/http.conf diff --git a/core/src/services/webdav/fixtures/docker-compose-webdav-with-auth.yml b/fixtures/webdav/docker-compose-webdav-with-auth.yml similarity index 100% rename from core/src/services/webdav/fixtures/docker-compose-webdav-with-auth.yml rename to fixtures/webdav/docker-compose-webdav-with-auth.yml diff --git a/core/src/services/webdav/fixtures/docker-compose-webdav-with-empty-passwd.yml b/fixtures/webdav/docker-compose-webdav-with-empty-passwd.yml similarity index 100% rename from core/src/services/webdav/fixtures/docker-compose-webdav-with-empty-passwd.yml rename to fixtures/webdav/docker-compose-webdav-with-empty-passwd.yml diff --git a/core/src/services/webdav/fixtures/docker-compose-webdav.yml b/fixtures/webdav/docker-compose-webdav.yml similarity index 100% rename from core/src/services/webdav/fixtures/docker-compose-webdav.yml rename to fixtures/webdav/docker-compose-webdav.yml