lifecycle and indexes apis

Author: SylvainSenechal

extensions/lifecycle/tasks/LifecycleTaskV2.js

@@ -165,7 +165,7 @@ class LifecycleTaskV2 extends LifecycleTask {
         // Undefined params can happen when lifecycle configuration rule is disabled for example.
         if (!params) {
             log.debug('no appropriate listing found', {
-                method: 'LifecycleTaskV2._getObjectList',
+                method: 'LifecycleTaskV2._getObjectVersions',
                 bucketLCRules,
                 currentDate,
                 bucketData,
@@ -213,7 +213,7 @@ class LifecycleTaskV2 extends LifecycleTask {
                     if (!err) {
                         log.debug(
                             'sent kafka entry for bucket consumption', {
-                                method: 'LifecycleTaskV2._getObjectList',
+                                method: 'LifecycleTaskV2._getObjectVersions',
                             });
                     }
                 });

extensions/replication/tasks/ReplicateObject.js

@@ -12,6 +12,7 @@ const {
     CloudserverClient,
     CloudserverClientConfig,
     GetObjectCommand,
+    PutDataCommand,
     MultipleBackendPutObjectCommand,
     MultipleBackendInitiateMPUCommand,
     MultipleBackendPutMPUPartCommand,
@@ -555,7 +556,7 @@ class ReplicateObject extends BackbeatTask {
             this._publishReadMetrics(partSize, readStartTime);
         });
         log.debug('putting data', { entry: destEntry.getLogInfo(), part });
-        const command = new MultipleBackendPutObjectCommand({
+        const command = new PutDataCommand({
             Bucket: destEntry.getBucket(),
             Key: destEntry.getObjectKey(),
             CanonicalID: destEntry.getOwnerId(),

lib/BackbeatMetadataProxy.js

@@ -9,6 +9,16 @@ const RoleCredentials = require('./credentials/RoleCredentials');
 const { getAccountCredentials } = require('./credentials/AccountCredentials');
 const { http: HttpAgent } = require('httpagent');
 const { lifecycleListing: { NON_CURRENT_TYPE, CURRENT_TYPE, ORPHAN_DM_TYPE } } = require('./constants');
+const { 
+    CloudserverClient,
+    CloudserverClientConfig,
+    GetBucketIndexesCommand,
+    PutBucketIndexesCommand,
+    DeleteBucketIndexesCommand,
+    ListLifecycleCurrentsCommand,
+    ListLifecycleNonCurrentsCommand,
+    ListLifecycleOrphansCommand
+} = require('./clients/smithy/build/smithy/source/typescript-codegen');
 
 class BackbeatMetadataProxy extends BackbeatTask {
     constructor(s3Endpoint, s3Auth, sourceHTTPAgent) {
@@ -229,37 +239,43 @@ class BackbeatMetadataProxy extends BackbeatTask {
 
     listLifecycle(listType, params, log, cb) {
         if (listType === CURRENT_TYPE) {
-            return this.backbeatSource.listLifecycleCurrents(params, (err, data) => {
-                if (err) {
+            const command = new ListLifecycleCurrentsCommand(params);
+            return this.cloudserverSourceClient.send(command)
+                .then(data => {
+                    return cb(null, data.Contents, data.IsTruncated, {
+                        marker: data.NextMarker,
+                    });
+                })
+                .catch(err => {
                     return cb(err);
-                }
-                return cb(null, data.Contents, data.IsTruncated, {
-                    marker: data.NextMarker,
                 });
-            });
         }
 
         if (listType === NON_CURRENT_TYPE) {
-            return this.backbeatSource.listLifecycleNonCurrents(params, (err, data) => {
-                if (err) {
+            const command = new ListLifecycleNonCurrentsCommand(params);
+            return this.cloudserverSourceClient.send(command)
+                .then(data => {
+                    return cb(null, data.Contents, data.IsTruncated, {
+                        keyMarker: data.NextKeyMarker,
+                        versionIdMarker: data.NextVersionIdMarker,
+                    });
+                })
+                .catch(err => {
                     return cb(err);
-                }
-                return cb(null, data.Contents, data.IsTruncated, {
-                    keyMarker: data.NextKeyMarker,
-                    versionIdMarker: data.NextVersionIdMarker,
                 });
-            });
         }
 
         if (listType === ORPHAN_DM_TYPE) {
-            return this.backbeatSource.listLifecycleOrphans(params, (err, data) => {
-                if (err) {
+            const command = new ListLifecycleOrphansCommand(params);
+            return this.cloudserverSourceClient.send(command)
+                .then(data => {
+                    return cb(null, data.Contents, data.IsTruncated, {
+                        marker: data.NextMarker,
+                    });
+                })
+                .catch(err => {
                     return cb(err);
-                }
-                return cb(null, data.Contents, data.IsTruncated, {
-                    marker: data.NextMarker,
                 });
-            });
         }
 
         log.error('invalid listType', {
@@ -272,36 +288,47 @@ class BackbeatMetadataProxy extends BackbeatTask {
     }
 
     getBucketIndexes(bucket, log, cb) {
-        this.backbeatSource.getBucketIndexes({ Bucket: bucket }, (err, res) => {
-            if (err) {
-                return cb(err);
-            }
-            return cb(null, res.Indexes);
+        const command = new GetBucketIndexesCommand({
+            Bucket: bucket,
         });
+        
+        return this.cloudserverSourceClient.send(command)
+            .then(res => {
+                return cb(null, res.Indexes);
+            })
+            .catch(err => {
+                return cb(err);
+            });
     }
 
     putBucketIndexes(bucket, indexes, log, cb) {
-        this.backbeatSource.putBucketIndexes({
+        const command = new PutBucketIndexesCommand({
             Bucket: bucket,
             Body: JSON.stringify(indexes),
-        }, err => {
-            if (err) {
-                return cb(err);
-            }
-            return cb(null);
         });
+        
+        return this.cloudserverSourceClient.send(command)
+            .then(() => {
+                return cb(null);
+            })
+            .catch(err => {
+                return cb(err);
+            });
     }
 
     deleteBucketIndexes(bucket, indexes, log, cb) {
-        this.backbeatSource.deleteBucketIndexes({
+        const command = new DeleteBucketIndexesCommand({
             Bucket: bucket,
             Body: JSON.stringify(indexes),
-        }, err => {
-            if (err) {
-                return cb(err);
-            }
-            return cb(null);
         });
+        
+        return this.cloudserverSourceClient.send(command)
+            .then(() => {
+                return cb(null);
+            })
+            .catch(err => {
+                return cb(err);
+            });
     }