fix: use object key

FraunhoferISST · Dec 4, 2024 · 3cd7dbf · 3cd7dbf
1 parent f814df8
commit 3cd7dbf
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/...src/main/java/org/eclipse/edc/connector/provision/aws/s3/S3BucketProvisionedResource.java b/...src/main/java/org/eclipse/edc/connector/provision/aws/s3/S3BucketProvisionedResource.java
@@ -24,6 +24,7 @@
 import static org.eclipse.edc.aws.s3.spi.S3BucketSchema.ACCESS_KEY_ID;
 import static org.eclipse.edc.aws.s3.spi.S3BucketSchema.BUCKET_NAME;
 import static org.eclipse.edc.aws.s3.spi.S3BucketSchema.ENDPOINT_OVERRIDE;
+import static org.eclipse.edc.aws.s3.spi.S3BucketSchema.OBJECT_NAME;
 import static org.eclipse.edc.aws.s3.spi.S3BucketSchema.REGION;
 import static org.eclipse.edc.aws.s3.spi.S3BucketSchema.SECRET_ACCESS_KEY;
 
@@ -78,6 +79,11 @@ public Builder bucketName(String bucketName) {
             dataAddressBuilder.property(BUCKET_NAME, bucketName);
             return this;
         }
+
+        public Builder objectName(String objectName) {
+            dataAddressBuilder.property(OBJECT_NAME, objectName);
+            return this;
+        }
 
         public Builder endpointOverride(String endpointOverride) {
             dataAddressBuilder.property(ENDPOINT_OVERRIDE, endpointOverride);

diff --git a/...-aws-s3/src/main/java/org/eclipse/edc/connector/provision/aws/s3/S3BucketProvisioner.java b/...-aws-s3/src/main/java/org/eclipse/edc/connector/provision/aws/s3/S3BucketProvisioner.java
@@ -81,6 +81,7 @@ private StatusResult<ProvisionResponse> provisionSucceeded(S3BucketResourceDefin
                 .hasToken(true)
                 .region(resourceDefinition.getRegionId())
                 .bucketName(resourceDefinition.getBucketName())
+                .objectName(resourceDefinition.getObjectName())
                 .transferProcessId(resourceDefinition.getTransferProcessId())
                 .resourceName(resourceDefinition.getBucketName())
                 .endpointOverride(resourceDefinition.getEndpointOverride())

diff --git a/.../src/main/java/org/eclipse/edc/connector/provision/aws/s3/S3BucketResourceDefinition.java b/.../src/main/java/org/eclipse/edc/connector/provision/aws/s3/S3BucketResourceDefinition.java
@@ -30,6 +30,7 @@
 public class S3BucketResourceDefinition extends ResourceDefinition {
     private String regionId;
     private String bucketName;
+    private String objectName;
     private String endpointOverride;
     private String accessKeyId;
     private String secretAccessKey;
@@ -45,6 +46,10 @@ public String getBucketName() {
         return bucketName;
     }
 
+    public String getObjectName() {
+        return objectName;
+    }
+
     public String getEndpointOverride() {
         return endpointOverride;
     }
@@ -62,6 +67,7 @@ public Builder toBuilder() {
         return initializeBuilder(new Builder())
                 .regionId(regionId)
                 .bucketName(bucketName)
+                .objectName(objectName)
                 .endpointOverride(endpointOverride)
                 .accessKeyId(accessKeyId)
                 .secretAccessKey(secretAccessKey);
@@ -87,6 +93,11 @@ public Builder bucketName(String bucketName) {
             resourceDefinition.bucketName = bucketName;
             return this;
         }
+
+        public Builder objectName(String objectName) {
+            resourceDefinition.objectName = objectName;
+            return this;
+        }
 
         public Builder endpointOverride(String endpointOverride) {
             resourceDefinition.endpointOverride = endpointOverride;

diff --git a/...ava/org/eclipse/edc/connector/provision/aws/s3/S3ConsumerResourceDefinitionGenerator.java b/...ava/org/eclipse/edc/connector/provision/aws/s3/S3ConsumerResourceDefinitionGenerator.java
@@ -25,6 +25,7 @@
 
 import static java.util.UUID.randomUUID;
 import static org.eclipse.edc.aws.s3.spi.S3BucketSchema.ACCESS_KEY_ID;
+import static org.eclipse.edc.aws.s3.spi.S3BucketSchema.OBJECT_NAME;
 import static org.eclipse.edc.aws.s3.spi.S3BucketSchema.SECRET_ACCESS_KEY;
 
 /**
@@ -44,6 +45,7 @@ public ResourceDefinition generate(TransferProcess transferProcess, Policy polic
 
         return S3BucketResourceDefinition.Builder.newInstance().id(id)
                 .bucketName(dataDestination.getStringProperty(S3BucketSchema.BUCKET_NAME))
+                .objectName(dataDestination.getStringProperty(OBJECT_NAME))
                 .regionId(dataDestination.getStringProperty(S3BucketSchema.REGION))
                 .endpointOverride(endpointOverride)
                 .accessKeyId(transferProcess.getDataDestination().getStringProperty(ACCESS_KEY_ID))