Skip to content

Commit

Permalink
feat: removes StatusChecker (#96)
Browse files Browse the repository at this point in the history
* feat: removes StatusChecker

* chore: deps file
  • Loading branch information
wolf4ood authored Sep 28, 2023
1 parent 9b1a838 commit 2bb6d23
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 254 deletions.
3 changes: 1 addition & 2 deletions DEPENDENCIES
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ maven/mavencentral/jakarta.activation/jakarta.activation-api/2.1.0, EPL-2.0 OR B
maven/mavencentral/jakarta.annotation/jakarta.annotation-api/2.1.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.ca
maven/mavencentral/jakarta.inject/jakarta.inject-api/2.0.1, Apache-2.0, approved, clearlydefined
maven/mavencentral/jakarta.transaction/jakarta.transaction-api/2.0.0, EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, #7697
maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.2, Apache-2.0, approved, clearlydefined
maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.2, Apache-2.0, approved, ee4j.validation
maven/mavencentral/jakarta.ws.rs/jakarta.ws.rs-api/3.1.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.rest
maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/4.0.0, BSD-3-Clause, approved, ee4j.jaxb
maven/mavencentral/junit/junit/4.13.2, EPL-2.0, approved, CQ23636
Expand Down Expand Up @@ -202,7 +202,6 @@ maven/mavencentral/org.slf4j/slf4j-api/1.7.25, MIT, approved, CQ13368
maven/mavencentral/org.slf4j/slf4j-api/1.7.30, MIT, approved, CQ13368
maven/mavencentral/org.slf4j/slf4j-api/1.7.36, MIT, approved, CQ13368
maven/mavencentral/org.slf4j/slf4j-api/2.0.5, MIT, approved, #5915
maven/mavencentral/org.slf4j/slf4j-api/2.0.9, MIT, approved, #5915
maven/mavencentral/org.testcontainers/junit-jupiter/1.19.0, MIT, approved, #10344
maven/mavencentral/org.testcontainers/testcontainers/1.19.0, Apache-2.0 AND MIT, approved, #10347
maven/mavencentral/software.amazon.awssdk/annotations/2.20.146, Apache-2.0, approved, #8598
Expand Down
4 changes: 3 additions & 1 deletion extensions/common/aws/aws-s3-test/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
## Local testing using MinIO

To run AWS integration tests you will need a MinIO instances running:

```
docker run --name miniosource -p 9000:9000 -p 9001:9001 -d -e MINIO_ROOT_USER=root -e MINIO_ROOT_PASSWORD=password bitnami/minio:latest
docker run --name miniodest -p 9002:9000 -p 9003:9001 -d -e MINIO_ROOT_USER=root -e MINIO_ROOT_PASSWORD=password bitnami/minio:latest
```

Then set the two environment variables:

```
S3_ACCESS_KEY_ID=root
S3_SECRET_ACCESS_KEY=password
Expand All @@ -23,7 +25,7 @@ for running integration tests against AWS S3 by environment variable:
$ IT_AWS_ENDPOINT=https://s3.us-east-1.amazonaws.com/ \
IT_AWS_REGION=us-east-1 \
IT_AWS_PROFILE=myprofie \
./gradlew clean test -DincludeTags="AwsS3IntegrationTest" --tests '*S3StatusCheckerIntegrationTest'
./gradlew clean test -DincludeTags="AwsS3IntegrationTest"
```

`IT_AWS_REGION` must be set to your region code in order to avoid
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,9 @@
import dev.failsafe.RetryPolicy;
import org.eclipse.edc.aws.s3.AwsClientProvider;
import org.eclipse.edc.aws.s3.AwsTemporarySecretToken;
import org.eclipse.edc.aws.s3.S3BucketSchema;
import org.eclipse.edc.connector.transfer.spi.provision.ProvisionManager;
import org.eclipse.edc.connector.transfer.spi.provision.Provisioner;
import org.eclipse.edc.connector.transfer.spi.provision.ResourceManifestGenerator;
import org.eclipse.edc.connector.transfer.spi.status.StatusCheckerRegistry;
import org.eclipse.edc.runtime.metamodel.annotation.Extension;
import org.eclipse.edc.runtime.metamodel.annotation.Inject;
import org.eclipse.edc.runtime.metamodel.annotation.Setting;
Expand Down Expand Up @@ -75,9 +73,6 @@ public void initialize(ServiceExtensionContext context) {
var manifestGenerator = context.getService(ResourceManifestGenerator.class);
manifestGenerator.registerGenerator(new S3ConsumerResourceDefinitionGenerator());

var statusCheckerReg = context.getService(StatusCheckerRegistry.class);
statusCheckerReg.register(S3BucketSchema.TYPE, new S3StatusChecker(clientProvider, retryPolicy));

registerTypes(typeManager);
}

Expand Down

This file was deleted.

This file was deleted.

0 comments on commit 2bb6d23

Please sign in to comment.