Skip to content

Commit 4e0c65b

Browse files
authored
Merge branch 'main' into chore/update-weav-vers-in-ci
2 parents 8a83e6f + 5f0a44f commit 4e0c65b

File tree

7 files changed

+88
-95
lines changed

7 files changed

+88
-95
lines changed

package-lock.json

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

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@
5151
},
5252
"homepage": "https://github.com/weaviate/typescript-client#readme",
5353
"dependencies": {
54-
"abort-controller-x": "^0.4.3",
55-
"graphql": "^16.11.0",
54+
"abort-controller-x": "^0.5.0",
55+
"graphql": "^16.12.0",
5656
"graphql-request": "^6.1.0",
5757
"long": "^5.3.2",
58-
"nice-grpc": "^2.1.12",
59-
"nice-grpc-client-middleware-retry": "^3.1.11",
58+
"nice-grpc": "^2.1.13",
59+
"nice-grpc-client-middleware-retry": "^3.1.12",
6060
"nice-grpc-common": "^2.0.2",
6161
"uuid": "^9.0.1"
6262
},

src/backup/journey.test.ts

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,6 @@ describe('creates backup with valid compression config values', () => {
693693
.withWaitForCompletion(true)
694694
.withConfig({
695695
CPUPercentage: 80,
696-
ChunkSize: 512,
697696
CompressionLevel: 'BestSpeed',
698697
})
699698
.do()
@@ -754,44 +753,6 @@ describe('fails creating backup with invalid compression config', () => {
754753
});
755754
});
756755

757-
it('fails creating backup with ChunkSize too high', () => {
758-
return client.backup
759-
.creator()
760-
.withIncludeClassNames(PIZZA_CLASS_NAME)
761-
.withBackend(BACKEND)
762-
.withBackupId(BACKUP_ID)
763-
.withConfig({
764-
ChunkSize: 513, // Max is 512
765-
})
766-
.do()
767-
.then(() => {
768-
throw new Error('should fail on create backup');
769-
})
770-
.catch((err: Error) => {
771-
expect(err.message).toContain('422');
772-
expect(err.message).toContain('ChunkSize');
773-
});
774-
});
775-
776-
it('fails creating backup with ChunkSize too low', () => {
777-
return client.backup
778-
.creator()
779-
.withIncludeClassNames(PIZZA_CLASS_NAME)
780-
.withBackend(BACKEND)
781-
.withBackupId(BACKUP_ID)
782-
.withConfig({
783-
ChunkSize: 1, // Min is 2
784-
})
785-
.do()
786-
.then(() => {
787-
throw new Error('should fail on create backup');
788-
})
789-
.catch((err: Error) => {
790-
expect(err.message).toContain('422');
791-
expect(err.message).toContain('ChunkSize');
792-
});
793-
});
794-
795756
it('cleans up', () => cleanupTestFood(client));
796757
});
797758

src/collections/backup/client.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ export const backup = (connection: Connection): Backup => {
118118
}
119119
if (args.config) {
120120
builder = builder.withConfig({
121-
ChunkSize: args.config.chunkSize,
122121
CompressionLevel: args.config.compressionLevel,
123122
CPUPercentage: args.config.cpuPercentage,
124123
});

src/collections/backup/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export type BackupReturn = BackupStatusReturn & {
3131

3232
/** Configuration options available when creating a backup */
3333
export type BackupConfigCreate = {
34-
/** The size of the chunks to use for the backup. */
34+
/** Deprecated: This parameter no longer has any effect. (The size of the chunks to use for the backup.) */
3535
chunkSize?: number;
3636
/** The standard of compression to use for the backup. */
3737
compressionLevel?: BackupCompressionLevel;

src/connection/grpc.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,6 @@ const getMetadataWithEmbeddingServiceAuth = (config: GrpcConnectionParams, beare
264264
...config.headers,
265265
authorization: bearerToken,
266266
'X-Weaviate-Cluster-Url': config.host,
267-
// keeping for backwards compatibility for older clusters for now. On newer clusters, Embedding Service reuses Authorization header.
268-
'X-Weaviate-Api-Key': bearerToken,
269267
}
270268
: config.headers
271269
);

src/connection/http.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,5 @@ const getAuthHeaders = (config: InternalConnectionParams, bearerToken: string) =
435435
? {
436436
Authorization: `Bearer ${bearerToken}`,
437437
'X-Weaviate-Cluster-Url': config.host,
438-
// keeping for backwards compatibility for older clusters for now. On newer clusters, Embedding Service reuses Authorization header.
439-
'X-Weaviate-Api-Key': bearerToken,
440438
}
441439
: undefined;

0 commit comments

Comments
 (0)