Migrate to use new S3 SDK.

Author: mattl-netflix

priam/src/main/java/com/netflix/priam/aws/S3FileSystem.java

@@ -17,35 +17,20 @@
 package com.netflix.priam.aws;
 
 import com.google.common.base.Preconditions;
+import com.netflix.priam.aws.auth.IS3Credential;
 import com.netflix.priam.backup.AbstractBackupPath;
 import com.netflix.priam.backup.BackupRestoreException;
 import com.netflix.priam.backup.DynamicRateLimiter;
 import com.netflix.priam.backup.RangeReadInputStream;
 import com.netflix.priam.compress.ChunkedStream;
 import com.netflix.priam.compress.CompressionType;
-import com.netflix.priam.aws.auth.IS3Credential;
 import com.netflix.priam.compress.ICompression;
 import com.netflix.priam.config.IConfiguration;
 import com.netflix.priam.identity.config.InstanceInfo;
 import com.netflix.priam.merics.BackupMetrics;
 import com.netflix.priam.notification.BackupNotificationMgr;
 import com.netflix.priam.utils.BoundedExponentialRetryCallable;
 import com.netflix.priam.utils.SystemUtils;
-import java.io.*;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
-import javax.inject.Singleton;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -54,6 +39,17 @@
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.model.*;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Provider;
+import javax.inject.Singleton;
+import java.io.*;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.Instant;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
 /** Implementation of IBackupFileSystem for S3 */
 @Singleton
 public class S3FileSystem extends S3FileSystemBase {
@@ -109,11 +105,13 @@ protected void downloadFileImpl(AbstractBackupPath path, String suffix)
 
     @Override
     public void putObject(String bucket, String key, String value) {
-        s3Client.putObject(bucket, key, value);
+        s3Client.putObject(
+                PutObjectRequest.builder().bucket(bucket).key(key).build(),
+                RequestBody.fromBytes(value.getBytes()));
     }
 
-    private ObjectMetadata getObjectMetadata(File file) {
-        ObjectMetadata ret = new ObjectMetadata();
+    private Map<String, String> getFileMetadata(File file) {
+            Map<String, String> metadata = new HashMap<>();
         long lastModified = file.lastModified();
         long fileSize = file.length();
 

priam/src/main/java/com/netflix/priam/backupv2/SnapshotVerificationMarkerWriter.java

@@ -1,9 +1,7 @@
 package com.netflix.priam.backupv2;
 
-import com.amazonaws.services.s3.model.PutObjectResult;
 import com.netflix.priam.aws.RemoteBackupPath;
 import com.netflix.priam.backup.AbstractBackupPath;
-import com.netflix.priam.backup.BackupRestoreException;
 import com.netflix.priam.backup.IBackupFileSystem;
 import com.netflix.priam.config.IConfiguration;
 import com.netflix.priam.identity.config.InstanceInfo;

priam/src/test/java/com/netflix/priam/backupv2/TestBackupVerificationTask.java

@@ -188,7 +188,7 @@ private static BackupMetadata getRecentlyValidatedMetadata() {
         BackupMetadata backupMetadata = new BackupMetadata("12345", new Date());
         backupMetadata.setLastValidated(
                 new Date(Instant.now().plus(1, ChronoUnit.HOURS).toEpochMilli()));
-        backupMetadata.setSnapshotLocation("bucket/path/to/file.db");
+        backupMetadata.setSnapshotLocation("useast1-cass-test-1/test_backup/-1002_cass_compromised_credentials/-3074457343809683002/META_V2/1762448400000/SNAPPY/PLAINTEXT/meta_v2_202511061700.json");
         return backupMetadata;
     }
 }

priam/src/test/java/com/netflix/priam/resources/BackupServletV2Test.java

@@ -264,7 +264,7 @@ private static BackupVerificationResult getBackupVerificationResult() {
         BackupVerificationResult result = new BackupVerificationResult();
         result.valid = true;
         result.manifestAvailable = true;
-        result.remotePath = "some_random";
+        result.remotePath = "test_backup/-1002_cass_compromised_credentials/-3074457343809683002/META_V2/1762448400000/SNAPPY/PLAINTEXT/meta_v2_202511061700.json";
         result.filesMatched = 123;
         result.snapshotInstant = Instant.EPOCH;
         return result;