chore: remove FsVault

extensions/README.md

@@ -42,7 +42,6 @@
         - [Local](common/transaction/transaction-local/)
     - Vault
         - [Azure](common/vault/vault-azure/)
-        - [Filesystem](common/vault/vault-filesystem/)
         - [HashiCorp](common/vault/vault-hashicorp/)
 - Control Plane
     - [Management API](control-plane/api/management-api/)

extensions/common/iam/oauth2/oauth2-daps/build.gradle.kts

@@ -21,7 +21,6 @@ dependencies {
     api(project(":spi:common:oauth2-spi"))
 
     testImplementation(project(":core:common:connector-core"))
-    testImplementation(project(":extensions:common:vault:vault-filesystem"))
     testImplementation(project(":extensions:common:iam:oauth2:oauth2-core"))
     testImplementation(project(":core:common:junit"))
     testImplementation(libs.testcontainers.junit)

extensions/common/iam/oauth2/oauth2-daps/src/test/java/org/eclipse/edc/iam/oauth2/daps/DapsIntegrationTest.java

@@ -39,9 +39,10 @@
 @ComponentTest
 class DapsIntegrationTest {
 
+    public static final String CLIENT_CERTIFICATE_ALIAS = "1";
+    public static final String CLIENT_PRIVATE_KEY_ALIAS = "2";
     private static final String AUDIENCE_IDS_CONNECTORS_ALL = "idsc:IDS_CONNECTORS_ALL";
     private static final String CLIENT_ID = "68:99:2E:D4:13:2D:FD:3A:66:6B:85:DE:FB:98:2E:2D:FD:E7:83:D7";
-    private static final String CLIENT_KEYSTORE_KEY_ALIAS = "1";
     private static final String CLIENT_KEYSTORE_PASSWORD = "1234";
 
     private final Path resourceFolder = findBuildRoot().toPath().resolve("extensions/common/iam/oauth2/oauth2-daps/src/test/resources");
@@ -88,8 +89,8 @@ protected void before(EdcExtension extension) {
                 "edc.oauth.provider.audience", AUDIENCE_IDS_CONNECTORS_ALL,
                 "edc.oauth.endpoint.audience", AUDIENCE_IDS_CONNECTORS_ALL,
                 "edc.oauth.provider.jwks.url", dapsUrl + jwksPath,
-                "edc.oauth.certificate.alias", CLIENT_KEYSTORE_KEY_ALIAS,
-                "edc.oauth.private.key.alias", CLIENT_KEYSTORE_KEY_ALIAS,
+                "edc.oauth.certificate.alias", CLIENT_CERTIFICATE_ALIAS,
+                "edc.oauth.private.key.alias", CLIENT_PRIVATE_KEY_ALIAS,
                 "edc.iam.token.scope", "idsc:IDS_CONNECTOR_ATTRIBUTES_ALL"
         ));
     }

extensions/common/iam/oauth2/oauth2-daps/src/test/java/org/eclipse/edc/iam/oauth2/daps/VaultSeedExtension.java

@@ -0,0 +1,38 @@
+/*
+ *  Copyright (c) 2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
+ *
+ */
+
+package org.eclipse.edc.iam.oauth2.daps;
+
+import org.eclipse.edc.junit.testfixtures.TestUtils;
+import org.eclipse.edc.runtime.metamodel.annotation.Inject;
+import org.eclipse.edc.spi.security.Vault;
+import org.eclipse.edc.spi.system.ServiceExtension;
+import org.eclipse.edc.spi.system.ServiceExtensionContext;
+
+import static org.eclipse.edc.iam.oauth2.daps.DapsIntegrationTest.CLIENT_CERTIFICATE_ALIAS;
+import static org.eclipse.edc.iam.oauth2.daps.DapsIntegrationTest.CLIENT_PRIVATE_KEY_ALIAS;
+
+public class VaultSeedExtension implements ServiceExtension {
+
+    @Inject
+    private Vault vault;
+
+    @Override
+    public void initialize(ServiceExtensionContext context) {
+        var certificate = TestUtils.getResourceFileContentAsString("certificate.pem");
+        var privateKey = TestUtils.getResourceFileContentAsString("privatekey.pem");
+        vault.storeSecret(CLIENT_CERTIFICATE_ALIAS, certificate);
+        vault.storeSecret(CLIENT_PRIVATE_KEY_ALIAS, privateKey);
+    }
+}

extensions/common/iam/oauth2/oauth2-daps/src/test/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension

@@ -0,0 +1 @@
+org.eclipse.edc.iam.oauth2.daps.VaultSeedExtension

extensions/common/iam/oauth2/oauth2-daps/src/test/resources/certificate.pem

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDazCCAlOgAwIBAgIUKLpU2zUcd6PlJQ90Jt2WbdG/kxgwDQYJKoZIhvcNAQEL
+BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMTExMjIwODA1NTJaFw0zMTEx
+MjAwODA1NTJaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
+HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDq4RvLUrLw6tfY5/8Wz6QmG93Gyagbwvr4Y5nXXfMf
+lKwAyV6FbxIXp2KnguuXq4wEAss0D3CHbRoSG6Wwur46gigDSaFZIqKKog1dXXaa
+2GopTyptAUTedLPD2k5ZeyrU6kRqdOkOj0N1IqrqqrBSSs57zIFz7U86TUEx13+x
+FrzpfkiToSPACpvHX4TSs+6bLOnImfqlGghh4lmq22RgRoUFqGa0IrLY1tARsr7g
+lcxKWt1VdnudXGA32HL3QIAfTvhitbw4R3068s+wswCpkW98MjHogSR+6x3YvQI/
+gkiyZn5/5jWxrlbOwaFMB5xNkuSd5UnE4PAiaDVUNNprAgMBAAGjUzBRMB0GA1Ud
+DgQWBBRomS7UEy39OmZrhd77mC4t/eeD1zAfBgNVHSMEGDAWgBRomS7UEy39OmZr
+hd77mC4t/eeD1zAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBj
+KgRXg+6rJih1ENc7y2xKKoGS8GvLCAKp9KmRer3nycaqR/2YmOqAatyFKscW4FCh
+s/WIel/L+8SEJSsaAXnfcjk5R18qbxFGY74z25Pbdxskq0WEWrxCVDL4jrPOSFIw
+9rY4Ym6rtaPUrelcXpvNuaCSDDVlZt9R7BGncwU0sZCIHtxKnMQklnNhQ2ppRq/e
+loVCvuYHS6aTG+QSj5Fejqmazgagf94yRdhQuO0HSCjU/PFyUmthCUGVGGGjcjfT
+QookwrHG0TIlXkCCgVcQF+7W6g8MnxJD7JxFDM0LfmKjzx1AstY/Hv6W0JHBaSUm
+96sClTHVKuOjc8ox80Oo
+-----END CERTIFICATE-----

extensions/common/iam/oauth2/oauth2-daps/src/test/resources/privatekey.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDq4RvLUrLw6tfY
+5/8Wz6QmG93Gyagbwvr4Y5nXXfMflKwAyV6FbxIXp2KnguuXq4wEAss0D3CHbRoS
+G6Wwur46gigDSaFZIqKKog1dXXaa2GopTyptAUTedLPD2k5ZeyrU6kRqdOkOj0N1
+IqrqqrBSSs57zIFz7U86TUEx13+xFrzpfkiToSPACpvHX4TSs+6bLOnImfqlGghh
+4lmq22RgRoUFqGa0IrLY1tARsr7glcxKWt1VdnudXGA32HL3QIAfTvhitbw4R306
+8s+wswCpkW98MjHogSR+6x3YvQI/gkiyZn5/5jWxrlbOwaFMB5xNkuSd5UnE4PAi
+aDVUNNprAgMBAAECggEAek/feXIHXQ3ueTXW0LowcOfyBaLduBdBOjgj1NNH2BpD
+t+UlI7dDZK314eV7afAbabtKtkGUB/H4sZVUI0Qb67v7ujqNmy0+F5NsAkK5kMlB
+/2EKZtlSU8XSFxuH0XEiTN3x4r4e30YbitQSzUE1sKTkAfPtNcFOkL3KRXpDNKPz
+I7KkJM7/Z7f2uzX70p/kTwAYksPNsKJZHyHCHk/l0kBDA37/MRRrM8a8qmBp/l22
+wgmwPjGjTU3KLAjsIxVvQQzV6/EV1H+wHlgHDxj9DcSqmrwJv7MuiIakpxntemfp
+Ps5PQqnJbO4Jt9foR8V3ok1+zry9c8DorsbzYd1CgQKBgQD7f5VG1BLh5XHykB8/
+Fr8qrji465PCYllrdIgNR1toPKqc/+IRsVMAZoXyG5NlT+G6Jp1uI6eeKk0aPYnP
+83vuaU2xgFPJMKIb2ufF2iLybTckST0KJUH4EaeJ/wTjhXvS6wSNkZZPyhXs2LzU
+O2r/oey3cQv1DyMiVTTRGd9BFwKBgQDvFV+lhJpY95XphaXgIj6GXUIlcKyur5vv
+IP/LfO3FZPk9zsqDN7ZmpzrHv+VZGCWR9iEnH8qIe+7P7PY93m4jXXXiALHeWEHZ
+phKt2a7PLNt9uz/F+rfs+BY7SyXIZpJf4pH2kIJ0jnxHl26JYHDt/CSq+6y2ZsgI
+QMgUG/b9zQKBgQDKRlTjgJInSYkaFDxtW3gpdbJ9WEuhHcTZngIG3AtyjMiUOWGz
+5TDis5KrpO4pn9PnCkO4X8jidxdIMZJzxFs650rrplC9EfZv/OJIyScuYBTnhFgp
+nsmuIVTksk1WSPfMLeWdjyibx+dWdQN6lsd6Dtv6tlttn90cMfem7e4XxQKBgByL
+z8TChW9T+HlOdNTDIfYHEovH3UZqP1MY/JG+U+F6weuoUjPCpiuxkeohtm+h23KH
+EcRLHnKXYZc/8tLGSR493YJjlNk4bnxfQOGzGRUxhO+JOP8ZhXZs1LK1sUgxPw7l
+zYnEDV9/V8Vwhkku060GqxYjQKbytLWPjpQgFqiNAoGAdRZumtaUu1NZ3agKLNdJ
+F7CCExrwPWA01U2QT+c/fi1BZppy+tFxBUx8I7dIm/72I3Dxe4wjcyztC71E0ZcJ
+6EKRNjNspzJEo2cvhl17HpLfWPfwHMSbyajjXzsiZAmynM+1gDgR/OdvoSm734RK
+6qFiMzfjNG4FjMcKmwEoNn8=
+-----END PRIVATE KEY-----