Skip to content

Commit 8cfc5bb

Browse files
author
Maxime Réty
committed
Merge branch 'max/gcs-signed-headers' into 'master'
chore(gcs): let the server sign and return the "x-goog-meta-tanker-metadata" header See merge request Tanker/sdk-js!473
2 parents b6e7a9e + 58a6b35 commit 8cfc5bb

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

packages/core/src/CloudStorage/Manager.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export class CloudStorageManager {
8181
const { UploadStream } = streamService;
8282

8383
const slicer = new SlicerStream({ source: clearData });
84-
const uploader = new UploadStream(urls, headers, totalEncryptedSize, recommendedChunkSize, encryptedMetadata);
84+
const uploader = new UploadStream(urls, headers, totalEncryptedSize, recommendedChunkSize);
8585

8686
const progressHandler = new ProgressHandler(progressOptions).start(totalEncryptedSize);
8787
uploader.on('uploaded', (chunk: Uint8Array) => progressHandler.report(chunk.byteLength));

packages/stream/cloud-storage/src/gcs/UploadStream.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ export class UploadStream extends Writable {
1717
_uploadedLength: number;
1818
_verbose: bool;
1919

20-
constructor(urls: Array<string>, headers: Object, contentLength: number, _recommendedChunkSize: number, encryptedMetadata: string, verbose: bool = false) {
20+
constructor(urls: Array<string>, headers: Object, contentLength: number, _recommendedChunkSize: number, verbose: bool = false) {
2121
super({
2222
highWaterMark: 1,
2323
objectMode: true
2424
});
2525

2626
this._initUrl = urls[0];
27-
this._headers = { ...headers, 'x-goog-meta-tanker-metadata': encryptedMetadata };
27+
this._headers = { ...headers }; // copy
2828
this._contentLength = contentLength;
2929
this._uploadedLength = 0;
3030
this._verbose = verbose;
@@ -40,7 +40,6 @@ export class UploadStream extends Writable {
4040

4141
async initialize() {
4242
this.log('initializing...');
43-
4443
const { ok, status, statusText, headers } = await fetch(this._initUrl, { method: 'POST', headers: this._headers });
4544
if (!ok) {
4645
throw new NetworkError(`GCS init request failed with status ${status}: ${statusText}`);

packages/stream/cloud-storage/src/s3/UploadStream.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export class UploadStream extends Writable {
1414
_recommendedChunkSize: number;
1515
_verbose: bool;
1616

17-
constructor(urls: Array<string>, headers: Object, contentLength: number, recommendedChunkSize: number, encryptedMetadata: string, verbose: bool = false) {
17+
constructor(urls: Array<string>, headers: Object, contentLength: number, recommendedChunkSize: number, verbose: bool = false) {
1818
super({
1919
highWaterMark: 1,
2020
objectMode: true

0 commit comments

Comments
 (0)