Skip to content

Commit b13547f

Browse files
committed
step1: removing unused and updating tests to use send command
1 parent dbde6ff commit b13547f

File tree

2 files changed

+6
-123
lines changed

2 files changed

+6
-123
lines changed

lib/storage/data/external/GCP/GcpService.js

Lines changed: 0 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ const { S3Client,
99
CopyObjectCommand,
1010
HeadObjectCommand,
1111
HeadBucketCommand,
12-
PutBucketVersioningCommand,
13-
GetBucketVersioningCommand,
1412
} = require('@aws-sdk/client-s3');
1513
const { createNormalizeHeadersMiddleware } = require('../../../../utils/normalizeHeaders');
1614
const { attachHeaderCaptureMiddleware } = require('./GcpUtils');
@@ -75,16 +73,6 @@ class GcpService extends S3Client {
7573
);
7674
}
7775

78-
listBuckets(params, callback) {
79-
return callback(errorInstances.NotImplemented
80-
.customizeDescription('GCP: listBuckets not implemented'));
81-
}
82-
83-
getBucketLocation(params, callback) {
84-
return callback(errorInstances.NotImplemented
85-
.customizeDescription('GCP: getBucketLocation not implemented'));
86-
}
87-
8876
headBucket(params, callback) {
8977
const command = new HeadBucketCommand(params);
9078
let metaVersionId;
@@ -110,112 +98,6 @@ class GcpService extends S3Client {
11098
.catch(err => callback(err));
11199
}
112100

113-
deleteBucket(params, callback) {
114-
return callback(errorInstances.NotImplemented
115-
.customizeDescription('GCP: deleteBucket not implemented'));
116-
}
117-
118-
createBucket(params, callback) {
119-
return callback(errorInstances.NotImplemented
120-
.customizeDescription('GCP: createBucket not implemented'));
121-
}
122-
123-
putBucket(params, callback) {
124-
return callback(errorInstances.NotImplemented
125-
.customizeDescription('GCP: putBucket not implemented'));
126-
}
127-
128-
putBucketVersioning(params, callback) {
129-
if (!params || !params.Bucket || !params.VersioningConfiguration) {
130-
const error = errorInstances.InvalidRequest
131-
.customizeDescription('Missing required parameter');
132-
return callback(error);
133-
}
134-
return this.send(new PutBucketVersioningCommand(params))
135-
.then(data => {
136-
if (callback) {
137-
return callback(null, data);
138-
}
139-
return data;
140-
})
141-
.catch(err => {
142-
if (callback) {
143-
return callback(err);
144-
}
145-
throw err;
146-
});
147-
}
148-
149-
getBucketVersioning(params, callback) {
150-
if (!params || !params.Bucket) {
151-
const error = errorInstances.InvalidRequest
152-
.customizeDescription('Missing required parameter');
153-
return callback(error);
154-
}
155-
return this.send(new GetBucketVersioningCommand(params))
156-
.then(data => {
157-
if (callback) {
158-
return callback(null, data);
159-
}
160-
return data;
161-
})
162-
.catch(err => {
163-
if (callback) {
164-
return callback(err);
165-
}
166-
throw err;
167-
});
168-
}
169-
170-
getBucketAcl(params, callback) {
171-
return callback(errorInstances.NotImplemented
172-
.customizeDescription('GCP: getBucketAcl not implemented'));
173-
}
174-
175-
putBucketAcl(params, callback) {
176-
return callback(errorInstances.NotImplemented
177-
.customizeDescription('GCP: putBucketAcl not implemented'));
178-
}
179-
180-
putBucketWebsite(params, callback) {
181-
return callback(errorInstances.NotImplemented
182-
.customizeDescription('GCP: putBucketWebsite not implemented'));
183-
}
184-
185-
getBucketWebsite(params, callback) {
186-
return callback(errorInstances.NotImplemented
187-
.customizeDescription('GCP: getBucketWebsite not implemented'));
188-
}
189-
190-
deleteBucketWebsite(params, callback) {
191-
return callback(errorInstances.NotImplemented
192-
.customizeDescription('GCP: deleteBucketWebsite not implemented'));
193-
}
194-
195-
putBucketCors(params, callback) {
196-
return callback(errorInstances.NotImplemented
197-
.customizeDescription('GCP: putBucketCors not implemented'));
198-
}
199-
200-
getBucketCors(params, callback) {
201-
return callback(errorInstances.NotImplemented
202-
.customizeDescription('GCP: getBucketCors not implemented'));
203-
}
204-
205-
deleteBucketCors(params, callback) {
206-
return callback(errorInstances.NotImplemented
207-
.customizeDescription('GCP: deleteBucketCors not implemented'));
208-
}
209-
210-
putObjectAcl(params, callback) {
211-
return callback(errorInstances.NotImplemented
212-
.customizeDescription('GCP: putObjectAcl not implemented'));
213-
}
214-
215-
getObjectAcl(params, callback) {
216-
return callback(errorInstances.NotImplemented
217-
.customizeDescription('GCP: getObjectAcl not implemented'));
218-
}
219101

220102
/**
221103
* Multipart upload (managed upload, single or multi-part).
@@ -232,10 +114,6 @@ class GcpService extends S3Client {
232114
}
233115
}
234116

235-
putObjectCopy(params, callback) {
236-
return this.copyObject(params, callback);
237-
}
238-
239117
/**
240118
* Copy an object (mock for test compatibility).
241119
* @param {object} params - S3 copyObject params

tests/unit/storage/data/external/GcpService.spec.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const assert = require('assert');
22
const http = require('http');
33
const { GCP } = require('../../../../../lib/storage/data/external/GCP');
4-
const { ListObjectsCommand, ListObjectVersionsCommand } = require('@aws-sdk/client-s3');
4+
const { ListObjectsCommand, ListObjectVersionsCommand, GetBucketVersioningCommand } = require('@aws-sdk/client-s3');
55
const MpuHelper = require('../../../../../lib/storage/data/external/GCP/GcpApis/mpuHelper');
66
const { createMpuKey } = require('../../../../../lib/storage/data/external/GCP/GcpUtils');
77

@@ -195,6 +195,11 @@ function callOperation(client, op, params, cb) {
195195
.then(() => cb(null))
196196
.catch(err => cb(err));
197197
}
198+
if (op === 'getBucketVersioning') {
199+
return client.send(new GetBucketVersioningCommand(params))
200+
.then(() => cb(null))
201+
.catch(err => cb(err));
202+
}
198203
return client[op](params, cb);
199204
}
200205

0 commit comments

Comments
 (0)