fix: Made config values optional to avoid troubles with native build. (…

…#20)
pagopa · Aug 9, 2024 · 7584d2f · 7584d2f
1 parent 3db062b
commit 7584d2f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/...ent/mil/azureservices/identity/client/systemmanaged/AzureSystemManagedIdentityClient.java b/...ent/mil/azureservices/identity/client/systemmanaged/AzureSystemManagedIdentityClient.java
@@ -6,6 +6,7 @@
 package it.pagopa.swclient.mil.azureservices.identity.client.systemmanaged;
 
 import java.net.URI;
+import java.util.Optional;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
@@ -44,10 +45,10 @@ public class AzureSystemManagedIdentityClient implements AzureIdentityClient {
 	 * 
 	 * @param identityEndpoint Endpoint to get access token by means of system managed identity
 	 */
-	AzureSystemManagedIdentityClient(@ConfigProperty(name = "IDENTITY_ENDPOINT", defaultValue = "") String identityEndpoint) {
+	AzureSystemManagedIdentityClient(@ConfigProperty(name = "IDENTITY_ENDPOINT") Optional<String> identityEndpoint) {
 		Log.trace("Azure System Managed Identity client initialization");
 		restClient = QuarkusRestClientBuilder.newBuilder()
-			.baseUri(URI.create(identityEndpoint))
+			.baseUri(URI.create(identityEndpoint.orElseThrow()))
 			.build(AzureSystemManagedIdentityRestClient.class);
 	}
 

diff --git a/...gopa/swclient/mil/azureservices/identity/client/workload/AzureWorkloadIdentityClient.java b/...gopa/swclient/mil/azureservices/identity/client/workload/AzureWorkloadIdentityClient.java
@@ -6,6 +6,7 @@
 package it.pagopa.swclient.mil.azureservices.identity.client.workload;
 
 import java.net.URI;
+import java.util.Optional;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
@@ -45,11 +46,11 @@ public class AzureWorkloadIdentityClient implements AzureIdentityClient {
 	 * @param tenantId      Tenant ID
 	 */
 	AzureWorkloadIdentityClient(
-		@ConfigProperty(name = "AZURE_AUTHORITY_HOST", defaultValue = "") String authorityHost,
-		@ConfigProperty(name = "AZURE_TENANT_ID", defaultValue = "") String tenantId) {
+		@ConfigProperty(name = "AZURE_AUTHORITY_HOST") Optional<String> authorityHost,
+		@ConfigProperty(name = "AZURE_TENANT_ID") Optional<String> tenantId) {
 		Log.trace("Azure Workload Identity client initialization");
 		restClient = QuarkusRestClientBuilder.newBuilder()
-			.baseUri(URI.create(authorityHost + tenantId))
+			.baseUri(URI.create(authorityHost.orElseThrow() + tenantId.orElseThrow()))
 			.build(AzureWorkloadIdentityRestClient.class);
 	}
 

diff --git a/...mil/azureservices/identity/client/systemmanaged/AzureSystemManagedIdentityClientTest.java b/...mil/azureservices/identity/client/systemmanaged/AzureSystemManagedIdentityClientTest.java
@@ -13,6 +13,7 @@
 import java.net.URI;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
+import java.util.Optional;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -83,7 +84,7 @@ void given_requestToGetAccessToken_when_requestIsDone_then_returnAccessToken() {
 			/*
 			 * Test.
 			 */
-			AzureSystemManagedIdentityClient client = new AzureSystemManagedIdentityClient("https://login.microsoftonline.com/");
+			AzureSystemManagedIdentityClient client = new AzureSystemManagedIdentityClient(Optional.of("https://login.microsoftonline.com/"));
 			client.getAccessToken(Scope.STORAGE)
 				.subscribe()
 				.withSubscriber(UniAssertSubscriber.create())

diff --git a/.../swclient/mil/azureservices/identity/client/workload/AzureWorkloadIdentityClientTest.java b/.../swclient/mil/azureservices/identity/client/workload/AzureWorkloadIdentityClientTest.java
@@ -13,6 +13,7 @@
 import java.net.URI;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
+import java.util.Optional;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -84,8 +85,8 @@ void given_requestToGetAccessToken_when_requestIsDone_then_returnAccessToken() {
 			 * Test.
 			 */
 			AzureWorkloadIdentityClient client = new AzureWorkloadIdentityClient(
-				"https://login.microsoftonline.com/",
-				"da795842-fa15-4fd4-b556-f371ac9bafed");
+				Optional.of("https://login.microsoftonline.com/"),
+				Optional.of("da795842-fa15-4fd4-b556-f371ac9bafed"));
 			client.getAccessToken(Scope.STORAGE)
 				.subscribe()
 				.withSubscriber(UniAssertSubscriber.create())