From 9b570066b99bb3605ddec880b770086e7cfa6a32 Mon Sep 17 00:00:00 2001 From: Desislav Arashev Date: Thu, 13 Apr 2023 17:50:42 +0300 Subject: [PATCH 1/2] Remove daps from the connector --- connector/README.md | 6 +----- connector/build.gradle.kts | 6 +----- connector/connector.env | 4 ---- connector/docker-compose.yml | 5 +---- connector/resources/config.properties | 7 ------- connector/resources/keystore.p12 | 0 6 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 connector/connector.env delete mode 100644 connector/resources/keystore.p12 diff --git a/connector/README.md b/connector/README.md index 08b1c096..ab30829f 100644 --- a/connector/README.md +++ b/connector/README.md @@ -24,13 +24,9 @@ Just check the `Configuration` section of the example [readme](../example/README Open the `resources/config.properties` file and insert the key and the secret of your IONOS S3 storage and the token. -Replace the `resources/keystore.p12` with the one generated from the EDC. - -Change the value of `EDC_KEYSTORE_PASSWORD` in docker-compose.yml with the password for the keystore. - ## Building and running the docker ```bash -docker build -t edc-ionos-s3 . +docker build -t ionos-connector . docker-compose up ``` diff --git a/connector/build.gradle.kts b/connector/build.gradle.kts index f1482055..ecb85062 100644 --- a/connector/build.gradle.kts +++ b/connector/build.gradle.kts @@ -66,11 +66,7 @@ dependencies { implementation("${edcGroup}:iam-mock:${edcVersion}") - implementation(project(":edc-ionos-extension:vault-hashicorp")) - implementation("${edcGroup}:vault-filesystem:${edcVersion}") - - implementation("${edcGroup}:oauth2-service:${edcVersion}") - implementation("${edcGroup}:oauth2-daps:${edcVersion}") + implementation("${edcGroup}:vault-hashicorp:${edcVersion}") //Ionos Extension implementation(project(":edc-ionos-extension:provision-ionos-s3")) diff --git a/connector/connector.env b/connector/connector.env deleted file mode 100644 index c808e467..00000000 --- a/connector/connector.env +++ /dev/null @@ -1,4 +0,0 @@ -EDC_FS_CONFIG=/config/config.properties -EDC_VAULT=/config/config.properties -EDC_KEYSTORE=/config/keystore.p12 -EDC_KEYSTORE_PASSWORD= diff --git a/connector/docker-compose.yml b/connector/docker-compose.yml index d564188b..e85fa2e9 100644 --- a/connector/docker-compose.yml +++ b/connector/docker-compose.yml @@ -8,7 +8,4 @@ services: - "8182:8182" - "8282:8282" environment: - EDC_FS_CONFIG: /resources/config.properties - EDC_VAULT: /resources/config.properties - EDC_KEYSTORE: /resources/keystore.p12 - EDC_KEYSTORE_PASSWORD: + EDC_FS_CONFIG: /resources/config.properties \ No newline at end of file diff --git a/connector/resources/config.properties b/connector/resources/config.properties index c604c600..31ae964c 100644 --- a/connector/resources/config.properties +++ b/connector/resources/config.properties @@ -17,10 +17,3 @@ edc.ionos.secret.key= edc.ionos.endpoint = edc.ionos.token = ids.webhook.address=http://localhost:9292 - -edc.oauth.token.url=http://localhost/auth/token -edc.oauth.client.id= -edc.oauth.provider.audience=idsc:IDS_CONNECTORS_ALL -edc.oauth.provider.jwks.url=http://localhost/auth/jwks.json -edc.oauth.certificate.alias=1 -edc.oauth.private.key.alias=1 diff --git a/connector/resources/keystore.p12 b/connector/resources/keystore.p12 deleted file mode 100644 index e69de29b..00000000 From 97a96325f995a64b0e651bf66d46273b73cbea0a Mon Sep 17 00:00:00 2001 From: Desislav Arashev Date: Thu, 13 Apr 2023 17:53:43 +0300 Subject: [PATCH 2/2] Change connector image name in readme --- connector/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connector/README.md b/connector/README.md index ab30829f..d121b95d 100644 --- a/connector/README.md +++ b/connector/README.md @@ -27,6 +27,6 @@ Open the `resources/config.properties` file and insert the key and the secret of ## Building and running the docker ```bash -docker build -t ionos-connector . +docker build -t edc-ionos-s3 . docker-compose up ```