feat: Clean up the 0.7.x deprecated instances (#2335)

* feat: remove deprecation 0.7.X

* feat: remove deprecation 0.7.X

* feat: remove deprecation 0.7.X

Author: AndrYurk

charts/tractusx-connector-memory/templates/deployment-runtime.yaml

@@ -261,10 +261,10 @@ spec:
             ## BDRS CLIENT ##
             #################
 
-            - name: "TX_IAM_IATP_BDRS_SERVER_URL"
+            - name: "TX_EDC_IAM_IATP_BDRS_SERVER_URL"
               value: {{ .Values.runtime.bdrs.server.url | required ".Values.runtime.bdrs.server.url is required" | quote }}
             {{- if .Values.runtime.bdrs.cache_validity_seconds }}
-            - name: "TX_IAM_IATP_BDRS_CACHE_VALIDITY"
+            - name: "TX_EDC_IAM_IATP_BDRS_CACHE_VALIDITY"
               value: {{ .Values.runtime.bdrs.cache_validity_seconds | quote}}
             {{- end}}
 
@@ -308,7 +308,7 @@ spec:
             ###########
 
             # see extension https://github.com/eclipse-tractusx/tractusx-edc/tree/develop/edc-extensions/hashicorp-vault
-            - name: "EDC_VAULT_SECRETS"
+            - name: "TX_EDC_VAULT_SECRETS"
               value: {{ .Values.vault.secrets | quote}}
 
 

charts/tractusx-connector/templates/deployment-controlplane.yaml

@@ -259,10 +259,10 @@ spec:
             ## BDRS CLIENT ##
             #################
 
-            - name: "TX_IAM_IATP_BDRS_SERVER_URL"
+            - name: "TX_EDC_IAM_IATP_BDRS_SERVER_URL"
               value: {{ .Values.controlplane.bdrs.server.url | required ".Values.controlplane.bdrs.server.url is required" | quote }}
             {{- if .Values.controlplane.bdrs.cache_validity_seconds }}
-            - name: "TX_IAM_IATP_BDRS_CACHE_VALIDITY"
+            - name: "TX_EDC_IAM_IATP_BDRS_CACHE_VALIDITY"
               value: {{ .Values.controlplane.bdrs.cache_validity_seconds | quote}}
             {{- end}}
 

edc-controlplane/edc-controlplane-base/build.gradle.kts

@@ -48,7 +48,6 @@ dependencies {
     implementation(project(":edc-extensions:cx-policy"))
     implementation(project(":edc-extensions:cx-policy-legacy"))
     implementation(project(":edc-extensions:data-flow-properties-provider"))
-    implementation(project(":edc-extensions:dataplane:dataplane-selector-configuration"))
     implementation(project(":edc-extensions:dcp:tx-dcp"))
     implementation(project(":edc-extensions:dcp:tx-dcp-sts-dim"))
     implementation(project(":edc-extensions:edr:edr-api-v2"))

edc-controlplane/edc-runtime-memory/README.md

@@ -30,7 +30,7 @@ extension. When in doubt, check the extensions' README that will likely be in [t
 
 ```shell
 docker run \
-    -e EDC_VAULT_SECRETS="key1:secret1;key2:secret2" \
+    -e TX_EDC_VAULT_SECRETS="key1:secret1;key2:secret2" \
     -p 8080:8080 -p 8181:8181 -p 8282:8282 -p 9090:9090 -p 9999:9999 \
     -v ${CONFIGURATION_PROPERTIES_FILE:-/dev/null}:/app/configuration.properties \
     -v ${LOGGING_PROPERTIES_FILE:-/dev/null}:/app/logging.properties \

edc-controlplane/edc-runtime-memory/src/main/java/org/eclipse/tractusx/edc/vault/memory/VaultSeedExtension.java

@@ -27,7 +27,6 @@
 import org.eclipse.edc.spi.security.Vault;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
-import org.eclipse.tractusx.edc.core.utils.ConfigUtil;
 
 import java.util.stream.Stream;
 
@@ -37,8 +36,6 @@ public class VaultSeedExtension implements ServiceExtension {
 
     @Setting(value = "Secrets with which the vault gets initially populated. Specify as comma-separated list of key:secret pairs.")
     public static final String VAULT_MEMORY_SECRETS_PROPERTY = "tx.edc.vault.secrets";
-    @Deprecated(since = "0.7.1")
-    public static final String VAULT_MEMORY_SECRETS_PROPERTY_DEPRECATED = "edc.vault.secrets";
     public static final String NAME = "Vault Seed Extension";
 
     @Inject
@@ -51,7 +48,8 @@ public String name() {
 
     @Provider
     public Vault createInMemVault(ServiceExtensionContext context) {
-        var seedSecrets = ConfigUtil.propertyCompatibility(context, VAULT_MEMORY_SECRETS_PROPERTY, VAULT_MEMORY_SECRETS_PROPERTY_DEPRECATED, (String) null);
+
+        var seedSecrets = context.getSetting(VAULT_MEMORY_SECRETS_PROPERTY, null);
         if (seedSecrets != null) {
             Stream.of(seedSecrets.split(";"))
                     .filter(pair -> pair.contains(":"))

edc-extensions/bdrs-client/src/main/java/org/eclipse/tractusx/edc/identity/mapper/BdrsClientExtension.java

@@ -36,7 +36,6 @@
 import java.util.function.Supplier;
 
 import static org.eclipse.tractusx.edc.core.utils.ConfigUtil.missingMandatoryProperty;
-import static org.eclipse.tractusx.edc.core.utils.ConfigUtil.propertyCompatibility;
 import static org.eclipse.tractusx.edc.identity.mapper.BdrsClientExtension.NAME;
 
 @Extension(value = NAME)
@@ -46,18 +45,12 @@ public class BdrsClientExtension implements ServiceExtension {
     public static final int DEFAULT_BDRS_CACHE_VALIDITY = 15 * 60; // 15 minutes
     @Setting(value = "Base URL of the BDRS service", required = true)
     public static final String BDRS_SERVER_URL_PROPERTY = "tx.edc.iam.iatp.bdrs.server.url";
-    @Deprecated(since = "0.7.1")
-    public static final String BDRS_SERVER_URL_PROPERTY_DEPRECATED = "tx.iam.iatp.bdrs.server.url";
 
     @Setting(value = "Base URL of the CredentialService, that belongs to this connector runtime. If not specified, the URL is resolved from this participant's DID document.")
     public static final String CREDENTIAL_SERVICE_BASE_URL_PROPERTY = "tx.edc.iam.iatp.credentialservice.url";
-    @Deprecated(since = "0.7.1")
-    public static final String CREDENTIAL_SERVICE_BASE_URL_PROPERTY_DEPRECATED = "tx.iam.iatp.credentialservice.url";
 
     @Setting(value = "Validity period in seconds for the cached BPN/DID mappings. After this period a new resolution request will hit the server.", defaultValue = DEFAULT_BDRS_CACHE_VALIDITY + "")
     public static final String BDRS_SERVER_CACHE_VALIDITY_PERIOD = "tx.edc.iam.iatp.bdrs.cache.validity";
-    @Deprecated(since = "0.7.1")
-    public static final String BDRS_SERVER_CACHE_VALIDITY_PERIOD_DEPRECATED = "tx.iam.iatp.bdrs.cache.validity";
 
     // this setting is already defined in IdentityAndTrustExtension
     public static final String CONNECTOR_DID_PROPERTY = "edc.iam.issuer.id";
@@ -84,9 +77,9 @@ public String name() {
 
     @Provider
     public BdrsClient getBdrsClient(ServiceExtensionContext context) {
-        var baseUrl = propertyCompatibility(context, BDRS_SERVER_URL_PROPERTY, BDRS_SERVER_URL_PROPERTY_DEPRECATED);
+        var baseUrl = context.getConfig().getString(BDRS_SERVER_URL_PROPERTY);
         var monitor = context.getMonitor();
-        var cacheValidity = propertyCompatibility(context, BDRS_SERVER_CACHE_VALIDITY_PERIOD, BDRS_SERVER_CACHE_VALIDITY_PERIOD_DEPRECATED, DEFAULT_BDRS_CACHE_VALIDITY);
+        var cacheValidity = context.getSetting(BDRS_SERVER_CACHE_VALIDITY_PERIOD, DEFAULT_BDRS_CACHE_VALIDITY);
 
         // get DID
         var ownDid = context.getConfig().getString(CONNECTOR_DID_PROPERTY, null);
@@ -96,7 +89,7 @@ public BdrsClient getBdrsClient(ServiceExtensionContext context) {
 
         // get CS URL
         Supplier<String> urlSupplier;
-        var configuredUrl = propertyCompatibility(context, CREDENTIAL_SERVICE_BASE_URL_PROPERTY, CREDENTIAL_SERVICE_BASE_URL_PROPERTY_DEPRECATED, (String) null);
+        var configuredUrl = context.getSetting(CREDENTIAL_SERVICE_BASE_URL_PROPERTY, null);
         if (configuredUrl != null) {
             urlSupplier = () -> configuredUrl;
         } else {

edc-extensions/bdrs-client/src/test/java/org/eclipse/tractusx/edc/identity/mapper/BdrsClientImplExtensionTest.java

@@ -36,7 +36,6 @@
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.eclipse.tractusx.edc.identity.mapper.BdrsClientExtension.BDRS_SERVER_URL_PROPERTY;
-import static org.eclipse.tractusx.edc.identity.mapper.BdrsClientExtension.BDRS_SERVER_URL_PROPERTY_DEPRECATED;
 import static org.eclipse.tractusx.edc.identity.mapper.BdrsClientExtension.CONNECTOR_DID_PROPERTY;
 import static org.eclipse.tractusx.edc.identity.mapper.BdrsClientExtension.CREDENTIAL_SERVICE_BASE_URL_PROPERTY;
 import static org.mockito.ArgumentMatchers.anyString;
@@ -63,7 +62,7 @@ void setup(ServiceExtensionContext context) {
     @Test
     void createClient_whenUrlMissing_expectException(ServiceExtensionContext context, BdrsClientExtension extension) {
         var cfg = mock(Config.class);
-        when(cfg.getString(eq(BDRS_SERVER_URL_PROPERTY_DEPRECATED))).thenThrow(new EdcException(BDRS_SERVER_URL_PROPERTY));
+        when(cfg.getString(eq(BDRS_SERVER_URL_PROPERTY))).thenThrow(new EdcException(BDRS_SERVER_URL_PROPERTY));
         when(context.getConfig()).thenReturn(cfg);
         when(cfg.getString(eq(BDRS_SERVER_URL_PROPERTY), isNull())).thenReturn(null);
         when(cfg.getString(eq(CONNECTOR_DID_PROPERTY), isNull())).thenReturn("did:web:self");

edc-extensions/dataplane/dataplane-proxy/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/DataPlaneProxyConsumerApiExtension.java

@@ -44,7 +44,6 @@
 
 import static java.util.Optional.ofNullable;
 import static java.util.concurrent.Executors.newFixedThreadPool;
-import static org.eclipse.tractusx.edc.core.utils.ConfigUtil.propertyCompatibility;
 
 /**
  * Instantiates the Proxy Data API for the consumer-side data plane.
@@ -65,16 +64,8 @@ public class DataPlaneProxyConsumerApiExtension implements ServiceExtension {
 
     @Setting(value = "Data plane proxy API consumer port", type = "int")
     private static final String CONSUMER_PORT = "tx.edc.dpf.consumer.proxy.port";
-    @Deprecated(since = "0.7.1")
-    private static final String CONSUMER_PORT_DEPRECATED = "tx.dpf.consumer.proxy.port";
     @Setting(value = "Thread pool size for the consumer data plane proxy gateway", type = "int")
     private static final String THREAD_POOL_SIZE = "tx.edc.dpf.consumer.proxy.thread.pool";
-    @Deprecated(since = "0.7.1")
-    private static final String THREAD_POOL_SIZE_DEPRECATED = "tx.dpf.consumer.proxy.thread.pool";
-    @Deprecated(since = "0.7.1")
-    private static final String AUTH_SETTING_APIKEY_ALIAS_DEPRECATED = "edc.api.auth.key.alias";
-    @Deprecated(since = "0.7.1")
-    private static final String AUTH_SETTING_APIKEY_DEPRECATED = "edc.api.auth.key";
 
     @Configuration
     private DataPlaneProxyConsumerApiConfiguration apiConfiguration;
@@ -104,11 +95,11 @@ public String name() {
     @Override
     public void initialize(ServiceExtensionContext context) {
         // when deprecated port will be purged, just assign `apiConfiguration.port()` to `port`
-        var port = propertyCompatibility(context, CONSUMER_PORT, CONSUMER_PORT_DEPRECATED, DEFAULT_PROXY_PORT);
+        var port = context.getSetting(CONSUMER_PORT, DEFAULT_PROXY_PORT);
         var portMapping = new PortMapping(PROXY, port, apiConfiguration.path());
         portMappingRegistry.register(portMapping);
 
-        var poolSize = propertyCompatibility(context, THREAD_POOL_SIZE, THREAD_POOL_SIZE_DEPRECATED, DEFAULT_THREAD_POOL);
+        var poolSize = context.getSetting(THREAD_POOL_SIZE, DEFAULT_THREAD_POOL);
         executorService = newFixedThreadPool(poolSize);
 
         var authenticationService = createAuthenticationService(context);
@@ -130,9 +121,9 @@ public void shutdown() {
 
     private AuthenticationService createAuthenticationService(ServiceExtensionContext context) {
 
-        var apiKey = ofNullable(propertyCompatibility(context, AUTH_SETTING_CONSUMER_PROXY_APIKEY_ALIAS, AUTH_SETTING_APIKEY_ALIAS_DEPRECATED, null))
+        var apiKey = ofNullable(context.getSetting(AUTH_SETTING_CONSUMER_PROXY_APIKEY_ALIAS, null))
                 .map(alias -> vault.resolveSecret(alias))
-                .orElseGet(() -> propertyCompatibility(context, AUTH_SETTING_CONSUMER_PROXY_APIKEY, AUTH_SETTING_APIKEY_DEPRECATED, UUID.randomUUID().toString()));
+                .orElseGet(() -> context.getSetting(AUTH_SETTING_CONSUMER_PROXY_APIKEY, UUID.randomUUID().toString()));
         return new TokenBasedAuthenticationService(context.getMonitor().withPrefix("ConsumerProxyAPI"), apiKey);
     }