fix: missing data address in provisioned resource

FraunhoferISST · Dec 4, 2024 · bed573e · bed573e
1 parent 4967ff6
commit bed573e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
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
@@ -62,7 +62,7 @@ public CompletableFuture<StatusResult<ProvisionResponse>> provision(S3BucketReso
                 .createBucketConfiguration(CreateBucketConfiguration.builder().build())
                 .build();
 
-        monitor.debug("S3ProvisionPipeline: create bucket " + resourceDefinition.getBucketName());
+        monitor.debug("S3Provisioner: create bucket " + resourceDefinition.getBucketName());
         return s3AsyncClient.createBucket(request)
                 .thenApply(response -> provisionSucceeded(resourceDefinition));
     }
@@ -84,9 +84,10 @@ private StatusResult<ProvisionResponse> provisionSucceeded(S3BucketResourceDefin
                 .transferProcessId(resourceDefinition.getTransferProcessId())
                 .resourceName(resourceDefinition.getBucketName())
                 .endpointOverride(resourceDefinition.getEndpointOverride())
+                .dataAddress(resourceDefinition.getOriginalDataAddress())
                 .build();
 
-        monitor.debug("S3BucketProvisioner: Bucket request submitted: " + resourceDefinition.getBucketName());
+        monitor.debug("S3BucketProvisioner: Bucket created successfully: " + resourceDefinition.getBucketName());
         var response = ProvisionResponse.Builder.newInstance().resource(resource).build();
         return StatusResult.success(response);
     }

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
@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import org.eclipse.edc.connector.controlplane.transfer.spi.types.ResourceDefinition;
+import org.eclipse.edc.spi.types.domain.DataAddress;
 
 import java.util.Objects;
 
@@ -30,6 +31,7 @@ public class S3BucketResourceDefinition extends ResourceDefinition {
     private String regionId;
     private String bucketName;
     private String endpointOverride;
+    private DataAddress originalDataAddress;
 
     private S3BucketResourceDefinition() {
     }
@@ -41,16 +43,22 @@ public String getRegionId() {
     public String getBucketName() {
         return bucketName;
     }
-
+
+    public String getEndpointOverride() {
+        return endpointOverride;
+    }
+
+    public DataAddress getOriginalDataAddress() {
+        return originalDataAddress;
+    }
+
     @Override
     public Builder toBuilder() {
         return initializeBuilder(new Builder())
                 .regionId(regionId)
-                .bucketName(bucketName);
-    }
-
-    public String getEndpointOverride() {
-        return endpointOverride;
+                .bucketName(bucketName)
+                .endpointOverride(endpointOverride)
+                .originalDataAddress(originalDataAddress);
     }
 
     @JsonPOJOBuilder(withPrefix = "")
@@ -78,6 +86,11 @@ public Builder endpointOverride(String endpointOverride) {
             resourceDefinition.endpointOverride = endpointOverride;
             return this;
         }
+
+        public Builder originalDataAddress(DataAddress dataAddress) {
+            resourceDefinition.originalDataAddress = dataAddress;
+            return this;
+        }
 
         @Override
         protected void verify() {

diff --git a/...ava/org/eclipse/edc/connector/provision/aws/s3/S3ConsumerResourceDefinitionGenerator.java b/...ava/org/eclipse/edc/connector/provision/aws/s3/S3ConsumerResourceDefinitionGenerator.java
@@ -44,6 +44,7 @@ public ResourceDefinition generate(TransferProcess transferProcess, Policy polic
                 .bucketName(dataDestination.getStringProperty(S3BucketSchema.BUCKET_NAME))
                 .regionId(dataDestination.getStringProperty(S3BucketSchema.REGION))
                 .endpointOverride(endpointOverride)
+                .originalDataAddress(transferProcess.getDataDestination())
                 .build();
     }