From 78a076e0e5a7ffa0885f53d9e33dc74462f83594 Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger Date: Tue, 14 May 2024 13:42:18 +0200 Subject: [PATCH] update test settings --- .../sts/dim/DimStsConfigurationExtension.java | 32 +++++++++++-------- .../edc/lifecycle/DimParticipant.java | 2 +- .../TractusxIatpParticipantBase.java | 2 +- .../participant/TractusxParticipantBase.java | 2 +- .../transfer/test/RuntimeConfig.java | 2 +- .../tokenrefresh/e2e/RuntimeConfig.java | 2 +- .../edc-dast-runtime/configuration.properties | 2 +- .../src/test/resources/tenants.properties | 5 ++- 8 files changed, 26 insertions(+), 23 deletions(-) diff --git a/edc-extensions/iatp/tx-iatp-sts-dim/src/main/java/org/eclipse/tractusx/edc/iam/iatp/sts/dim/DimStsConfigurationExtension.java b/edc-extensions/iatp/tx-iatp-sts-dim/src/main/java/org/eclipse/tractusx/edc/iam/iatp/sts/dim/DimStsConfigurationExtension.java index c02e004bd..ba17b9b45 100644 --- a/edc-extensions/iatp/tx-iatp-sts-dim/src/main/java/org/eclipse/tractusx/edc/iam/iatp/sts/dim/DimStsConfigurationExtension.java +++ b/edc-extensions/iatp/tx-iatp-sts-dim/src/main/java/org/eclipse/tractusx/edc/iam/iatp/sts/dim/DimStsConfigurationExtension.java @@ -26,7 +26,8 @@ import org.eclipse.edc.spi.system.ServiceExtensionContext; import org.eclipse.tractusx.edc.core.utils.PathUtils; -import static org.eclipse.tractusx.edc.core.utils.ConfigUtil.propertyCompatibility; +import static java.util.Optional.ofNullable; +import static org.eclipse.tractusx.edc.core.utils.ConfigUtil.missingMandatoryProperty; /** * Configuration Extension for the STS OAuth2 client @@ -35,19 +36,13 @@ public class DimStsConfigurationExtension implements ServiceExtension { @Setting(value = "STS OAuth2 endpoint for requesting a token") - public static final String TOKEN_URL = "tx.edc.iam.sts.oauth.token.url"; - @Deprecated(since = "0.7.1") - public static final String TOKEN_URL_DEPRECATED = "edc.iam.sts.oauth.token.url"; + public static final String TOKEN_URL = "edc.iam.sts.oauth.token.url"; @Setting(value = "STS OAuth2 client id") - public static final String CLIENT_ID = "tx.edc.iam.sts.oauth.client.id"; - @Deprecated(since = "0.7.1") - public static final String CLIENT_ID_DEPRECATED = "edc.iam.sts.oauth.client.id"; + public static final String CLIENT_ID = "edc.iam.sts.oauth.client.id"; @Setting(value = "Vault alias of STS OAuth2 client secret") - public static final String CLIENT_SECRET_ALIAS = "tx.edc.iam.sts.oauth.client.secret.alias"; - @Deprecated(since = "0.7.1") - public static final String CLIENT_SECRET_ALIAS_DEPRECATED = "edc.iam.sts.oauth.client.secret.alias"; + public static final String CLIENT_SECRET_ALIAS = "edc.iam.sts.oauth.client.secret.alias"; protected static final String NAME = "DIM STS client configuration extension"; @@ -60,12 +55,21 @@ public String name() { @Provider public StsRemoteClientConfiguration clientConfiguration(ServiceExtensionContext context) { - var tokenUrl = PathUtils.removeTrailingSlash(propertyCompatibility(context, TOKEN_URL, TOKEN_URL_DEPRECATED)); - var clientId = propertyCompatibility(context, CLIENT_ID, CLIENT_ID_DEPRECATED); - var clientSecretAlias = propertyCompatibility(context, CLIENT_SECRET_ALIAS, CLIENT_SECRET_ALIAS_DEPRECATED); + var tokenUrl = ofNullable(context.getConfig().getString(TOKEN_URL, null)) + .map(PathUtils::removeTrailingSlash).orElse(null); + var clientId = context.getConfig().getString(CLIENT_ID, null); + var clientSecretAlias = context.getConfig().getString(CLIENT_SECRET_ALIAS, null); var monitor = context.getMonitor().withPrefix("STS Client for DIM"); - + if (tokenUrl == null) { + missingMandatoryProperty(monitor, TOKEN_URL); + } + if (clientId == null) { + missingMandatoryProperty(monitor, CLIENT_ID); + } + if (clientSecretAlias == null) { + missingMandatoryProperty(monitor, CLIENT_SECRET_ALIAS); + } return new StsRemoteClientConfiguration(tokenUrl, clientId, clientSecretAlias); } diff --git a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/DimParticipant.java b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/DimParticipant.java index e521753a6..6cdcd7f55 100644 --- a/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/DimParticipant.java +++ b/edc-tests/e2e-tests/src/test/java/org/eclipse/tractusx/edc/lifecycle/DimParticipant.java @@ -39,7 +39,7 @@ public class DimParticipant extends TractusxIatpParticipantBase { public Map iatpConfiguration(TractusxIatpParticipantBase... others) { var config = new HashMap<>(super.iatpConfiguration(others)); config.put("edc.iam.sts.dim.url", dimUri.toString()); - config.put("tx.iam.iatp.bdrs.server.url", bdrsUri.toString()); + config.put("tx.edc.iam.iatp.bdrs.server.url", bdrsUri.toString()); config.put("edc.transfer.proxy.token.verifier.publickey.alias", getKeyId()); return config; } diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TractusxIatpParticipantBase.java b/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TractusxIatpParticipantBase.java index 462ec1738..69dfaf4d0 100644 --- a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TractusxIatpParticipantBase.java +++ b/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TractusxIatpParticipantBase.java @@ -54,7 +54,7 @@ public Map iatpConfiguration(TractusxIatpParticipantBase... othe }; Stream.concat(Stream.of(this), Arrays.stream(others)).forEach(p -> { - var prefix = "tx.iam.iatp.audiences.%s".formatted(p.getName().toLowerCase()); + var prefix = "tx.edc.iam.iatp.audiences.%s".formatted(p.getName().toLowerCase()); iatpConfiguration.put("%s.from".formatted(prefix), p.getBpn()); iatpConfiguration.put("%s.to".formatted(prefix), p.getDid()); }); diff --git a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TractusxParticipantBase.java b/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TractusxParticipantBase.java index c6f2957a3..1ffe39b8b 100644 --- a/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TractusxParticipantBase.java +++ b/edc-tests/edc-controlplane/fixtures/src/testFixtures/java/org/eclipse/tractusx/edc/tests/participant/TractusxParticipantBase.java @@ -118,7 +118,7 @@ public Map getConfiguration() { put("edc.iam.sts.oauth.client.id", "test-clientid"); put("edc.iam.sts.oauth.client.secret.alias", "test-clientid-alias"); put("edc.iam.sts.dim.url", "http://sts.example.com"); - put("tx.iam.iatp.bdrs.server.url", "http://sts.example.com"); + put("tx.edc.iam.iatp.bdrs.server.url", "http://sts.example.com"); put("edc.dataplane.api.public.baseurl", "http://localhost:%d/api/public/v2/data".formatted(dataPlanePublic.getPort())); } }; diff --git a/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/RuntimeConfig.java b/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/RuntimeConfig.java index 5a48fc5b8..0d4b4121b 100644 --- a/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/RuntimeConfig.java +++ b/edc-tests/edc-dataplane/cloud-transfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/RuntimeConfig.java @@ -50,7 +50,7 @@ public static Map baseConfig(String controlPath, int controlPort put("edc.iam.sts.oauth.client.id", "test-clientid"); put("edc.iam.sts.oauth.client.secret.alias", "test-clientid-alias"); put("edc.iam.sts.dim.url", "http://sts.example.com"); - put("tx.iam.iatp.bdrs.server.url", "http://sts.example.com"); + put("tx.edc.iam.iatp.bdrs.server.url", "http://sts.example.com"); } }; } diff --git a/edc-tests/edc-dataplane/edc-dataplane-tokenrefresh-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/e2e/RuntimeConfig.java b/edc-tests/edc-dataplane/edc-dataplane-tokenrefresh-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/e2e/RuntimeConfig.java index e16b3d57b..1d4134ecd 100644 --- a/edc-tests/edc-dataplane/edc-dataplane-tokenrefresh-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/e2e/RuntimeConfig.java +++ b/edc-tests/edc-dataplane/edc-dataplane-tokenrefresh-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/tokenrefresh/e2e/RuntimeConfig.java @@ -57,7 +57,7 @@ public Map baseConfig() { put("edc.iam.sts.oauth.client.id", "test-clientid"); put("edc.iam.sts.oauth.client.secret.alias", "test-clientid-alias"); put("edc.iam.sts.dim.url", "http://sts.example.com"); - put("tx.iam.iatp.bdrs.server.url", "http://sts.example.com"); + put("tx.edc.iam.iatp.bdrs.server.url", "http://sts.example.com"); } }; } diff --git a/samples/edc-dast/edc-dast-runtime/configuration.properties b/samples/edc-dast/edc-dast-runtime/configuration.properties index 1e22ee6e7..0c884464b 100644 --- a/samples/edc-dast/edc-dast-runtime/configuration.properties +++ b/samples/edc-dast/edc-dast-runtime/configuration.properties @@ -20,5 +20,5 @@ web.http.default.path=/api web.http.sts.port=8990 web.http.sts.path=/v1/sts edc.api.auth.key=password -tx.iam.iatp.bdrs.server.url=http://localhost:8081 +tx.edc.iam.iatp.bdrs.server.url=http://localhost:8081 tx.vault.seed.secrets=client_secret_alias:secret \ No newline at end of file diff --git a/samples/multi-tenancy/src/test/resources/tenants.properties b/samples/multi-tenancy/src/test/resources/tenants.properties index eca9d0dec..45d6b4033 100644 --- a/samples/multi-tenancy/src/test/resources/tenants.properties +++ b/samples/multi-tenancy/src/test/resources/tenants.properties @@ -16,18 +16,17 @@ # # SPDX-License-Identifier: Apache-2.0 ################################################################################# - edc.tenants.one.edc.any=any edc.tenants.one.web.http.port=18181 edc.tenants.one.web.http.path=/api edc.tenants.one.web.http.protocol.port=18282 edc.tenants.one.web.http.protocol.path=/protocol -edc.tenants.one.tx.iam.iatp.bdrs.server.url=http://bdrs.test.com +edc.tenants.one.tx.edc.iam.iatp.bdrs.server.url=http://bdrs.test.com edc.tenants.one.edc.iam.issuer.id=did:web:tenant1 edc.tenants.two.edc.any=any edc.tenants.two.web.http.port=28181 edc.tenants.two.web.http.path=/api edc.tenants.two.web.http.protocol.port=28282 edc.tenants.two.web.http.protocol.path=/protocol -edc.tenants.two.tx.iam.iatp.bdrs.server.url=http://bdrs.test.com +edc.tenants.two.tx.edc.iam.iatp.bdrs.server.url=http://bdrs.test.com edc.tenants.two.edc.iam.issuer.id=did:web:tenant2