You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2023/12/19 10:23:27 UTC
(camel) 06/06: CAMEL-18590 - Camel-Azure components: Define a unique configuration for authentication - Azure Storage Queue
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch CAMEL-18590-azure-storage-queue
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0dd96ffb9620ff520e223e44aa5ad633e66c700c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Dec 19 11:17:05 2023 +0100
CAMEL-18590 - Camel-Azure components: Define a unique configuration for authentication - Azure Storage Queue
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../azure/storage/queue/QueueComponent.java | 8 --------
.../azure/storage/queue/QueueComponentTest.java | 23 ++++++++++++++++++++++
2 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/components/camel-azure/camel-azure-storage-queue/src/main/java/org/apache/camel/component/azure/storage/queue/QueueComponent.java b/components/camel-azure/camel-azure-storage-queue/src/main/java/org/apache/camel/component/azure/storage/queue/QueueComponent.java
index 4c561f53833..04cc812ce7e 100644
--- a/components/camel-azure/camel-azure-storage-queue/src/main/java/org/apache/camel/component/azure/storage/queue/QueueComponent.java
+++ b/components/camel-azure/camel-azure-storage-queue/src/main/java/org/apache/camel/component/azure/storage/queue/QueueComponent.java
@@ -66,7 +66,6 @@ public class QueueComponent extends HealthCheckComponent {
setProperties(endpoint, parameters);
checkCredentials(configuration);
- validateConfigurations(configuration);
return endpoint;
}
@@ -94,11 +93,4 @@ public class QueueComponent extends HealthCheckComponent {
}
}
}
-
- private void validateConfigurations(final QueueConfiguration configuration) {
- if (configuration.getServiceClient() == null && configuration.getAccessKey() == null
- && configuration.getCredentials() == null) {
- throw new IllegalArgumentException("Azure Storage accessKey or QueueServiceClient must be specified.");
- }
- }
}
diff --git a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueComponentTest.java b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueComponentTest.java
index 544a3dbec86..0b04e44183a 100644
--- a/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueComponentTest.java
+++ b/components/camel-azure/camel-azure-storage-queue/src/test/java/org/apache/camel/component/azure/storage/queue/QueueComponentTest.java
@@ -61,6 +61,16 @@ class QueueComponentTest extends CamelTestSupport {
doTestCreateEndpointWithMinConfig(endpoint, false);
}
+ @Test
+ public void testCreateEndpointWithMinConfigForAzIdentity() {
+
+ final QueueEndpoint endpoint
+ = (QueueEndpoint) context
+ .getEndpoint("azure-storage-queue://camelazure/testqueue?credentialType=AZURE_IDENTITY");
+
+ doTestCreateEndpointWithMinConfigForAzIdentity(endpoint);
+ }
+
private void doTestCreateEndpointWithMinConfig(final QueueEndpoint endpoint, boolean clientExpected) {
assertEquals("camelazure", endpoint.getConfiguration().getAccountName());
assertEquals("testqueue", endpoint.getConfiguration().getQueueName());
@@ -78,6 +88,19 @@ class QueueComponentTest extends CamelTestSupport {
assertEquals(1, endpoint.getConfiguration().getMaxMessages());
}
+ private void doTestCreateEndpointWithMinConfigForAzIdentity(final QueueEndpoint endpoint) {
+ assertEquals("camelazure", endpoint.getConfiguration().getAccountName());
+ assertEquals("testqueue", endpoint.getConfiguration().getQueueName());
+ assertNull(endpoint.getConfiguration().getServiceClient());
+ assertNull(endpoint.getConfiguration().getCredentials());
+ assertEquals(QueueOperationDefinition.sendMessage, endpoint.getConfiguration().getOperation());
+
+ assertNull(endpoint.getConfiguration().getVisibilityTimeout());
+ assertNull(endpoint.getConfiguration().getTimeToLive());
+ assertEquals(1, endpoint.getConfiguration().getMaxMessages());
+ assertEquals(CredentialType.AZURE_IDENTITY, endpoint.getConfiguration().getCredentialType());
+ }
+
@Test
public void testCreateEndpointWithMaxConfig() {
context.getRegistry().bind("creds", new StorageSharedKeyCredential("fake", "fake"));