Skip to content

Commit 7054c86

Browse files
committed
Merge branch 'main' of https://github.com/weaviate/typescript-client into snyk-upgrade-875a0511323986c0c54a8a6f9d3a6d94
2 parents 39bfa21 + c1efeb4 commit 7054c86

Some content is hidden

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

58 files changed

+8924
-3523
lines changed

.github/workflows/main.yaml

Lines changed: 42 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ on:
88

99
env:
1010
WEAVIATE_124: 1.24.26
11-
WEAVIATE_125: 1.25.28
12-
WEAVIATE_126: 1.26.13
13-
WEAVIATE_127: 1.27.9
14-
WEAVIATE_128: 1.28.2
11+
WEAVIATE_125: 1.25.30
12+
WEAVIATE_126: 1.26.14
13+
WEAVIATE_127: 1.27.11
14+
WEAVIATE_128: 1.28.4
15+
WEAVIATE_129: 1.29.0
1516

1617
jobs:
1718
checks:
@@ -28,7 +29,7 @@ jobs:
2829
npm run format:check
2930
npm run docs
3031
31-
tests:
32+
tests-without-auth:
3233
needs: checks
3334
runs-on: ubuntu-latest
3435
strategy:
@@ -39,9 +40,41 @@ jobs:
3940
{ node: "22.x", weaviate: $WEAVIATE_125},
4041
{ node: "22.x", weaviate: $WEAVIATE_126},
4142
{ node: "22.x", weaviate: $WEAVIATE_127},
42-
{ node: "18.x", weaviate: $WEAVIATE_128},
43-
{ node: "20.x", weaviate: $WEAVIATE_128},
44-
{ node: "22.x", weaviate: $WEAVIATE_128}
43+
{ node: "22.x", weaviate: $WEAVIATE_128},
44+
{ node: "18.x", weaviate: $WEAVIATE_129},
45+
{ node: "20.x", weaviate: $WEAVIATE_129},
46+
{ node: "22.x", weaviate: $WEAVIATE_129}
47+
]
48+
steps:
49+
- uses: actions/checkout@v3
50+
- uses: actions/setup-node@v3
51+
with:
52+
node-version: ${{ matrix.versions.node }}
53+
- name: Login to Docker Hub
54+
if: ${{ !github.event.pull_request.head.repo.fork && github.triggering_actor != 'dependabot[bot]' }}
55+
uses: docker/login-action@v3
56+
with:
57+
username: ${{secrets.DOCKER_USERNAME}}
58+
password: ${{secrets.DOCKER_PASSWORD}}
59+
- name: "Install dependencies"
60+
run: |
61+
npm ci
62+
ci/run_dependencies.sh ${{ matrix.versions.weaviate }}
63+
- name: "Run tests without authentication tests"
64+
run: WEAVIATE_VERSION=${{ matrix.versions.weaviate }} npm test
65+
- name: "Transpile the package"
66+
run: npm run build
67+
- name: "Stop Weaviate"
68+
run: ci/stop_dependencies.sh ${{ matrix.versions.weaviate }}
69+
70+
tests-with-auth:
71+
needs: checks
72+
runs-on: ubuntu-latest
73+
strategy:
74+
fail-fast: false
75+
matrix:
76+
versions: [
77+
{ node: "22.x", weaviate: $WEAVIATE_129}
4578
]
4679
steps:
4780
- uses: actions/checkout@v3
@@ -66,16 +99,11 @@ jobs:
6699
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
67100
OKTA_CLIENT_SECRET: ${{ secrets.OKTA_CLIENT_SECRET }}
68101
run: WEAVIATE_VERSION=${{ matrix.versions.weaviate }} npm test
69-
- name: "Run tests without authentication tests (for forks)"
70-
if: ${{ github.event.pull_request.head.repo.fork }}
71-
run: WEAVIATE_VERSION=${{ matrix.versions.weaviate }} npm test
72-
- name: "Transpile the package"
73-
run: npm run build
74102
- name: "Stop Weaviate"
75103
run: ci/stop_dependencies.sh ${{ matrix.versions.weaviate }}
76104

77105
publish:
78-
needs: tests
106+
needs: [tests-with-auth, tests-without-auth]
79107
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
80108
runs-on: ubuntu-latest
81109
permissions:

ci/compose.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ function compose_down_all {
2121
}
2222

2323
function all_weaviate_ports {
24-
echo "8078 8080 8081 8082 8083 8085 8086 8087 8088 8089 8090"
24+
echo "8078 8080 8081 8082 8083 8085 8086 8087 8088 8089 8090 8091"
2525
}

ci/docker-compose-rbac.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
version: '3.4'
3+
services:
4+
weaviate-rbac:
5+
command:
6+
- --host
7+
- 0.0.0.0
8+
- --port
9+
- '8085'
10+
- --scheme
11+
- http
12+
- --write-timeout=600s
13+
image: semitechnologies/weaviate:${WEAVIATE_VERSION}
14+
ports:
15+
- 8091:8085
16+
- 50062:50051
17+
restart: on-failure:0
18+
environment:
19+
ENABLE_MODULES: "generative-dummy,reranker-dummy"
20+
PERSISTENCE_DATA_PATH: "./data-weaviate-0"
21+
CLUSTER_IN_LOCALHOST: "true"
22+
CLUSTER_GOSSIP_BIND_PORT: "7100"
23+
CLUSTER_DATA_BIND_PORT: "7101"
24+
RAFT_BOOTSTRAP_EXPECT: "1"
25+
AUTHENTICATION_APIKEY_ENABLED: "true"
26+
AUTHENTICATION_APIKEY_ALLOWED_KEYS: 'viewer-key,editor-key,admin-key,custom-key'
27+
AUTHENTICATION_APIKEY_USERS: 'viewer-user,editor-user,admin-user,custom-user'
28+
AUTHORIZATION_RBAC_ENABLED: "true"
29+
AUTHORIZATION_ADMIN_USERS: "admin-user"
30+
AUTHORIZATION_VIEWER_USERS: "viewer-user"
31+
...

package-lock.json

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "weaviate-client",
3-
"version": "3.3.6",
3+
"version": "3.4.2",
44
"description": "JS/TS client for Weaviate",
55
"main": "dist/node/cjs/index.js",
66
"type": "module",
@@ -33,8 +33,8 @@
3333
"format": "prettier --write --no-error-on-unmatched-pattern '**/*.{ts,js}' '!dist/**'",
3434
"format:check": "prettier --check --no-error-on-unmatched-pattern '**/*.{ts,js}' '!dist/**'",
3535
"format:dist": "prettier --write --no-error-on-unmatched-pattern '**/dist/**/*.{ts,js}'",
36-
"schema": "./tools/refresh_schema.sh",
37-
"protos": "./tools/refresh_protos.sh",
36+
"refresh-schema": "./tools/refresh_schema.sh",
37+
"refresh-protos": "./tools/refresh_protos.sh",
3838
"docs": "typedoc --plugin typedoc-plugin-extras --favicon public/favicon.ico --out docs/ src/"
3939
},
4040
"repository": {
@@ -55,8 +55,8 @@
5555
"graphql": "^16.9.0",
5656
"graphql-request": "^6.1.0",
5757
"long": "^5.2.4",
58-
"nice-grpc": "^2.1.10",
59-
"nice-grpc-client-middleware-retry": "^3.1.9",
58+
"nice-grpc": "^2.1.11",
59+
"nice-grpc-client-middleware-retry": "^3.1.10",
6060
"nice-grpc-common": "^2.0.2",
6161
"uuid": "^9.0.1"
6262
},

0 commit comments

Comments
 (0)