diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/src/test/java/com/azure/spring/sample/eventhubs/binder/EventHubBinderApplicationIT.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/src/test/java/com/azure/spring/sample/eventhubs/binder/EventHubBinderApplicationIT.java index 99497841caa7..fc77a45e5f02 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/src/test/java/com/azure/spring/sample/eventhubs/binder/EventHubBinderApplicationIT.java +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/src/test/java/com/azure/spring/sample/eventhubs/binder/EventHubBinderApplicationIT.java @@ -3,15 +3,15 @@ package com.azure.spring.sample.eventhubs.binder; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.system.OutputCaptureRule; +import org.springframework.boot.test.system.CapturedOutput; +import org.springframework.boot.test.system.OutputCaptureExtension; import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; import java.util.UUID; @@ -21,19 +21,17 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@RunWith(SpringRunner.class) @SpringBootTest(classes = EventHubBinderApplication.class) @AutoConfigureMockMvc @ActiveProfiles("manual") +@ExtendWith({OutputCaptureExtension.class, MockitoExtension.class}) public class EventHubBinderApplicationIT { - @Rule - public OutputCaptureRule capture = new OutputCaptureRule(); @Autowired private MockMvc mvc; @Test - public void testSendAndReceiveMessage() throws Exception { + public void testSendAndReceiveMessage(CapturedOutput capturedOutput) throws Exception { Thread.sleep(10000); String message = UUID.randomUUID().toString(); mvc.perform(post("/messages?message=" + message)).andExpect(status().isOk()) @@ -43,7 +41,7 @@ public void testSendAndReceiveMessage() throws Exception { boolean messageReceived = false; boolean messageCheckpointed = false; for (int i = 0; i < 100; i++) { - String output = capture.toString(); + String output = capturedOutput.toString(); if (!messageReceived && output.contains(messageReceivedLog)) { messageReceived = true; } diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/src/test/resources/application.yaml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/src/test/resources/application.yaml index 49490b5e5a2a..30ab0141c5f5 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/src/test/resources/application.yaml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/src/test/resources/application.yaml @@ -4,19 +4,19 @@ spring: cloud: azure: eventhub: - connection-string: ${EVENTHUB_CONNECTION_STRING_BINDER} - checkpoint-storage-account: ${STORAGE_ACCOUNT_BINDER} - checkpoint-access-key: ${STORAGE_ACCOUNT_KEY_BINDER} - checkpoint-container: binder-test + connection-string: ${EVENTHUB_CONNECTION_STRING_SAMPLE_EVENTHUBS_BINDER} + checkpoint-storage-account: ${STORAGE_ACCOUNT_SAMPLE_EVENTHUBS_BINDER} + checkpoint-access-key: ${STORAGE_ACCOUNT_KEY_SAMPLE_EVENTHUBS_BINDER} + checkpoint-container: sample-eventhubs-binder stream: function: definition: consume;supply bindings: consume-in-0: - destination: binder-test + destination: sample-eventhubs-binder group: $Default supply-out-0: - destination: binder-test + destination: sample-eventhubs-binder eventhub: bindings: consume-in-0: diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/test-resources.json b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/test-resources.json index 0927ad363c26..3e89f5725dce 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/test-resources.json +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/test-resources.json @@ -13,9 +13,9 @@ }, "functions": [], "variables": { - "eventHubsNamespaceName": "[concat(parameters('baseName'),'-binder-eventhub')]", + "eventHubsNamespaceName": "[concat(parameters('baseName'),'-sample-eventhubs-binder')]", "eventHubsNamespaceKeyName": "RootManageSharedAccessKey", - "storageAccountName": "[concat(substring(toLower(concat(parameters('storageNamePrefix'), uniqueString(resourceGroup().id), 'binder')), 0, 18), 'binder')]", + "storageAccountName": "[substring(toLower(concat(parameters('storageNamePrefix'), uniqueString(resourceGroup().id))), 0, 24)]", "location": "[resourceGroup().location]" }, "resources": [ @@ -55,7 +55,7 @@ { "type": "Microsoft.EventHub/namespaces/eventhubs", "apiVersion": "2017-04-01", - "name": "[concat(variables('eventHubsNamespaceName'), '/binder-test')]", + "name": "[concat(variables('eventHubsNamespaceName'), '/sample-eventhubs-binder')]", "location": "[variables('location')]", "dependsOn": [ "[resourceId('Microsoft.EventHub/namespaces', variables('eventHubsNamespaceName'))]" @@ -83,10 +83,10 @@ { "type": "Microsoft.EventHub/namespaces/eventhubs/consumergroups", "apiVersion": "2017-04-01", - "name": "[concat(variables('eventHubsNamespaceName'), '/binder-test/$Default')]", + "name": "[concat(variables('eventHubsNamespaceName'), '/sample-eventhubs-binder/$Default')]", "location": "[variables('location')]", "dependsOn": [ - "[resourceId('Microsoft.EventHub/namespaces/eventhubs', variables('eventHubsNamespaceName'), 'binder-test')]", + "[resourceId('Microsoft.EventHub/namespaces/eventhubs', variables('eventHubsNamespaceName'), 'sample-eventhubs-binder')]", "[resourceId('Microsoft.EventHub/namespaces', variables('eventHubsNamespaceName'))]" ], "properties": {} @@ -165,7 +165,7 @@ { "type": "Microsoft.Storage/storageAccounts/blobServices/containers", "apiVersion": "2019-06-01", - "name": "[concat(variables('storageAccountName'), '/default/binder-test')]", + "name": "[concat(variables('storageAccountName'), '/default/sample-eventhubs-binder')]", "dependsOn": [ "[resourceId('Microsoft.Storage/storageAccounts/blobServices', variables('storageAccountName'), 'default')]", "[resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName'))]" @@ -176,15 +176,15 @@ } ], "outputs": { - "STORAGE_ACCOUNT_BINDER": { + "STORAGE_ACCOUNT_SAMPLE_EVENTHUBS_BINDER": { "type": "string", "value": "[variables('storageAccountName')]" }, - "STORAGE_ACCOUNT_KEY_BINDER": { + "STORAGE_ACCOUNT_KEY_SAMPLE_EVENTHUBS_BINDER": { "type": "string", "value": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName')), '2019-06-01').keys[0].value]" }, - "EVENTHUB_CONNECTION_STRING_BINDER": { + "EVENTHUB_CONNECTION_STRING_SAMPLE_EVENTHUBS_BINDER": { "type": "string", "value": "[listKeys(resourceId('Microsoft.EventHub/namespaces/authorizationRules', variables('eventHubsNamespaceName'), variables('eventHubsNamespaceKeyName')), '2017-04-01').primaryConnectionString]" } diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/src/main/resources/application.yaml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/src/main/resources/application.yaml index e471a598fea7..497dd3c65bb2 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/src/main/resources/application.yaml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/src/main/resources/application.yaml @@ -1,18 +1,19 @@ spring: cloud: azure: - client-id: [service-principal-id] - client-secret: [service-principal-secret] - tenant-id: [tenant-id] - resource-group: [resource-group] + client-id: ${SPRING_CLIENT_ID} + client-secret: ${SPRING_CLIENT_SECRET} + tenant-id: ${SPRING_TENANT_ID} + resource-group: ${SPRING_RESOURCE_GROUP} + subscription-id: ${SPRING_SUBSCRIPTION_ID} eventhub: - namespace: [eventhub-namespace] + namespace: ${EVENTHUB_NAMESPACE_NAME_SAMPLE_EVENTHUBS_KAFKA} stream: function: definition: consume;supply bindings: consume-in-0: - destination: [eventhub-name] - group: [consumer-group] + destination: sample-eventhubs-kafka + group: $Default supply-out-0: - destination: [the-same-eventhub-name-as-above] \ No newline at end of file + destination: sample-eventhubs-kafka \ No newline at end of file diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/src/test/java/com/azure/spring/sample/eventhubs/kafka/EventHubKafkaBinderApplicationIT.java b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/src/test/java/com/azure/spring/sample/eventhubs/kafka/EventHubKafkaBinderApplicationIT.java index 807df8b83199..98315518044a 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/src/test/java/com/azure/spring/sample/eventhubs/kafka/EventHubKafkaBinderApplicationIT.java +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/src/test/java/com/azure/spring/sample/eventhubs/kafka/EventHubKafkaBinderApplicationIT.java @@ -3,14 +3,14 @@ package com.azure.spring.sample.eventhubs.kafka; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.system.OutputCaptureRule; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.boot.test.system.CapturedOutput; +import org.springframework.boot.test.system.OutputCaptureExtension; import org.springframework.test.web.servlet.MockMvc; import java.util.UUID; @@ -20,18 +20,16 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@RunWith(SpringRunner.class) @SpringBootTest(classes = EventHubKafkaBinderApplication.class) @AutoConfigureMockMvc +@ExtendWith({ OutputCaptureExtension.class, MockitoExtension.class}) public class EventHubKafkaBinderApplicationIT { - @Rule - public OutputCaptureRule capture = new OutputCaptureRule(); @Autowired private MockMvc mvc; @Test - public void testSendAndReceiveMessage() throws Exception { + public void testSendAndReceiveMessage(CapturedOutput capturedOutput) throws Exception { Thread.sleep(10000); String message = UUID.randomUUID().toString(); mvc.perform(post("/messages?message=" + message)).andExpect(status().isOk()) @@ -40,7 +38,7 @@ public void testSendAndReceiveMessage() throws Exception { boolean messageReceived = false; for (int i = 0; i < 100; i++) { - String output = capture.toString(); + String output = capturedOutput.toString(); if (output.contains(messageReceivedLog)) { messageReceived = true; break; diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/src/test/resources/application.yaml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/src/test/resources/application.yaml index 55dfdaf9d9a4..d07e4f574d07 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/src/test/resources/application.yaml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/src/test/resources/application.yaml @@ -3,19 +3,19 @@ spring: banner-mode: off cloud: azure: - client-id: ${SPRING_CLIENT_ID_KAFKA} - client-secret: ${SPRING_CLIENT_SECRET_KAFKA} - tenant-id: ${SPRING_TENANT_ID_KAFKA} - resource-group: ${SPRING_RESOURCE_GROUP_KAFKA} - subscription-id: ${SPRING_SUBSCRIPTION_ID_KAFKA} + client-id: ${SPRING_CLIENT_ID} + client-secret: ${SPRING_CLIENT_SECRET} + tenant-id: ${SPRING_TENANT_ID} + resource-group: ${SPRING_RESOURCE_GROUP} + subscription-id: ${SPRING_SUBSCRIPTION_ID} eventhub: - namespace: ${EVENTHUB_NAMESPACE_NAME_KAFKA} + namespace: ${EVENTHUB_NAMESPACE_NAME_SAMPLE_EVENTHUBS_KAFKA} stream: function: definition: consume;supply bindings: consume-in-0: - destination: kafka-test + destination: sample-eventhubs-kafka group: $Default supply-out-0: - destination: kafka-test + destination: sample-eventhubs-kafka diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/test-resources.json b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/test-resources.json index 473df14b7e09..72defdbdcee0 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/test-resources.json +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/test-resources.json @@ -18,7 +18,7 @@ }, "functions": [], "variables": { - "eventHubsNamespaceName": "[concat(parameters('baseName'),'-kafka-eventhub')]", + "eventHubsNamespaceName": "[concat(parameters('baseName'),'-sample-eventhubs-kafka')]", "eventHubsNamespaceKeyName": "RootManageSharedAccessKey", "location": "[resourceGroup().location]" }, @@ -43,7 +43,7 @@ { "type": "Microsoft.EventHub/namespaces/eventhubs", "apiVersion": "2017-04-01", - "name": "[concat(variables('eventHubsNamespaceName'), '/kafka-test')]", + "name": "[concat(variables('eventHubsNamespaceName'), '/sample-eventhubs-kafka')]", "location": "[variables('location')]", "dependsOn": [ "[resourceId('Microsoft.EventHub/namespaces', variables('eventHubsNamespaceName'))]" @@ -71,37 +71,37 @@ { "type": "Microsoft.EventHub/namespaces/eventhubs/consumergroups", "apiVersion": "2017-04-01", - "name": "[concat(variables('eventHubsNamespaceName'), '/kafka-test/$Default')]", + "name": "[concat(variables('eventHubsNamespaceName'), '/sample-eventhubs-kafka/$Default')]", "location": "[variables('location')]", "dependsOn": [ - "[resourceId('Microsoft.EventHub/namespaces/eventhubs', variables('eventHubsNamespaceName'), 'kafka-test')]", + "[resourceId('Microsoft.EventHub/namespaces/eventhubs', variables('eventHubsNamespaceName'), 'sample-eventhubs-kafka')]", "[resourceId('Microsoft.EventHub/namespaces', variables('eventHubsNamespaceName'))]" ], "properties": {} } ], "outputs": { - "EVENTHUB_NAMESPACE_NAME_KAFKA": { + "EVENTHUB_NAMESPACE_NAME_SAMPLE_EVENTHUBS_KAFKA": { "type": "string", "value": "[variables('eventHubsNamespaceName')]" }, - "SPRING_TENANT_ID_KAFKA": { + "SPRING_TENANT_ID": { "type": "string", "value": "[parameters('tenantId')]" }, - "SPRING_CLIENT_ID_KAFKA": { + "SPRING_CLIENT_ID": { "type": "string", "value": "[parameters('testApplicationId')]" }, - "SPRING_CLIENT_SECRET_KAFKA": { + "SPRING_CLIENT_SECRET": { "type": "string", "value": "[parameters('testApplicationSecret')]" }, - "SPRING_RESOURCE_GROUP_KAFKA": { + "SPRING_RESOURCE_GROUP": { "type": "string", "value": "[resourceGroup().name]" }, - "SPRING_SUBSCRIPTION_ID_KAFKA": { + "SPRING_SUBSCRIPTION_ID": { "type": "string", "value": "[subscription().subscriptionId]" } diff --git a/sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml b/sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml index 6aaf283c4139..a2aa995fc1b3 100644 --- a/sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml +++ b/sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml @@ -58,6 +58,18 @@ azure-spring-cloud-stream-binder-test 2.5.0-beta.1 + + org.junit.jupiter + junit-jupiter-engine + 5.7.1 + test + + + org.junit.vintage + junit-vintage-engine + 5.7.1 + test + diff --git a/sdk/spring/azure-spring-cloud-test-eventhubs/src/test/java/com/azure/spring/test/eventhubs/EventHubBinderConsumeErrorIT.java b/sdk/spring/azure-spring-cloud-test-eventhubs/src/test/java/com/azure/spring/test/eventhubs/EventHubBinderConsumeErrorIT.java index b0d249d3e18a..e64d69a99a35 100644 --- a/sdk/spring/azure-spring-cloud-test-eventhubs/src/test/java/com/azure/spring/test/eventhubs/EventHubBinderConsumeErrorIT.java +++ b/sdk/spring/azure-spring-cloud-test-eventhubs/src/test/java/com/azure/spring/test/eventhubs/EventHubBinderConsumeErrorIT.java @@ -28,9 +28,9 @@ @SpringBootTest(classes = EventHubBinderConsumeErrorIT.TestConfig.class) @TestPropertySource(properties = { - "spring.cloud.stream.bindings.consume-in-0.destination=test-eventhub", - "spring.cloud.stream.bindings.supply-out-0.destination=test-eventhub", - "spring.cloud.azure.eventhub.checkpoint-container=test-eventhub" + "spring.cloud.stream.bindings.consume-in-0.destination=test-eventhub-message", + "spring.cloud.stream.bindings.supply-out-0.destination=test-eventhub-message", + "spring.cloud.azure.eventhub.checkpoint-container=test-eventhub-message" }) public class EventHubBinderConsumeErrorIT { @@ -73,7 +73,7 @@ public Consumer> consume() { }; } - @ServiceActivator(inputChannel = "test-eventhub.$Default.errors") + @ServiceActivator(inputChannel = "test-eventhub-message.$Default.errors") public void consumeError(Message message) throws InterruptedException { EXCHANGER.exchange("ERROR!"); } diff --git a/sdk/spring/azure-spring-cloud-test-eventhubs/src/test/java/com/azure/spring/test/eventhubs/stream/binder/health/EventHubBinderHealthIT.java b/sdk/spring/azure-spring-cloud-test-eventhubs/src/test/java/com/azure/spring/test/eventhubs/stream/binder/health/EventHubBinderHealthIT.java index 020dfa244823..3954b8894170 100644 --- a/sdk/spring/azure-spring-cloud-test-eventhubs/src/test/java/com/azure/spring/test/eventhubs/stream/binder/health/EventHubBinderHealthIT.java +++ b/sdk/spring/azure-spring-cloud-test-eventhubs/src/test/java/com/azure/spring/test/eventhubs/stream/binder/health/EventHubBinderHealthIT.java @@ -4,7 +4,7 @@ package com.azure.spring.test.eventhubs.stream.binder.health; import com.azure.spring.test.AppRunner; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -12,8 +12,11 @@ import org.springframework.context.annotation.Bean; import org.springframework.messaging.Message; import org.springframework.web.client.RestTemplate; +import reactor.core.publisher.Mono; +import reactor.core.publisher.Sinks; import java.util.function.Consumer; +import java.util.function.Supplier; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -27,11 +30,12 @@ public class EventHubBinderHealthIT { @Test public void testSpringBootActuatorHealth() { LOGGER.info("testSpringBootActuatorHealth begin."); + String resourceName = "test-eventhub-health"; try (AppRunner app = new AppRunner(Application.class)) { - app.property("spring.cloud.azure.eventhub.checkpoint-container", "container-name"); - app.property("spring.cloud.stream.bindings.consume-in-0.destination", "event-hub-name"); - app.property("spring.cloud.stream.bindings.supply-out-0.destination", "event-hub-name"); + app.property("spring.cloud.azure.eventhub.checkpoint-container", resourceName); + app.property("spring.cloud.stream.bindings.consume-in-0.destination", resourceName); + app.property("spring.cloud.stream.bindings.supply-out-0.destination", resourceName); app.property("management.endpoint.health.show-details", "always"); app.property("management.endpoints.web.exposure.include", "*"); @@ -53,6 +57,18 @@ public static class Application { private static final Logger LOGGER = LoggerFactory.getLogger(Application.class); + @Bean + public Sinks.One> one() { + return Sinks.one(); + } + + @Bean + public Supplier>> supply(Sinks.One> one) { + return () -> one.asMono() + .doOnNext(m -> LOGGER.info("Sending message {}", m)) + .doOnError(t -> LOGGER.error("Error encountered", t)); + } + @Bean public Consumer> consume() { return message -> { diff --git a/sdk/spring/azure-spring-cloud-test-eventhubs/src/test/resources/application.yaml b/sdk/spring/azure-spring-cloud-test-eventhubs/src/test/resources/application.yaml index ce258d2e48b9..9cf804fe0b44 100644 --- a/sdk/spring/azure-spring-cloud-test-eventhubs/src/test/resources/application.yaml +++ b/sdk/spring/azure-spring-cloud-test-eventhubs/src/test/resources/application.yaml @@ -2,9 +2,9 @@ spring: cloud: azure: eventhub: - connection-string: ${EVENTHUB_CONNECTION_STRING_TEST_EVENTHUBS} - checkpoint-storage-account: ${STORAGE_ACCOUNT_TEST_EVENTHUBS} - checkpoint-access-key: ${STORAGE_ACCOUNT_KEY_TEST_EVENTHUBS} + connection-string: ${EVENTHUB_CONNECTION_STRING_TEST_EVENTHUB} + checkpoint-storage-account: ${STORAGE_ACCOUNT_TEST_EVENTHUB} + checkpoint-access-key: ${STORAGE_ACCOUNT_KEY_TEST_EVENTHUB} stream: function: definition: consume;supply diff --git a/sdk/spring/azure-spring-cloud-test-eventhubs/test-resources.json b/sdk/spring/azure-spring-cloud-test-eventhubs/test-resources.json index 41445e5cc01f..791f46d98aff 100644 --- a/sdk/spring/azure-spring-cloud-test-eventhubs/test-resources.json +++ b/sdk/spring/azure-spring-cloud-test-eventhubs/test-resources.json @@ -15,7 +15,7 @@ "variables": { "eventHubsNamespaceName": "[concat(parameters('baseName'),'-test-eventhub')]", "eventHubsNamespaceKeyName": "RootManageSharedAccessKey", - "storageAccountName": "[concat(substring(toLower(concat(parameters('storageNamePrefix'), uniqueString(resourceGroup().id))), 0, 20), 'test')]", + "storageAccountName": "[substring(toLower(concat(parameters('storageNamePrefix'), uniqueString(resourceGroup().id))), 0, 24)]", "location": "[resourceGroup().location]" }, "resources": [ @@ -55,7 +55,7 @@ { "type": "Microsoft.EventHub/namespaces/eventhubs", "apiVersion": "2017-04-01", - "name": "[concat(variables('eventHubsNamespaceName'), '/test-eventhub')]", + "name": "[concat(variables('eventHubsNamespaceName'), '/test-eventhub-message')]", "location": "[variables('location')]", "dependsOn": [ "[resourceId('Microsoft.EventHub/namespaces', variables('eventHubsNamespaceName'))]" @@ -136,13 +136,27 @@ "status": "Active" } }, + { + "type": "Microsoft.EventHub/namespaces/eventhubs", + "apiVersion": "2017-04-01", + "name": "[concat(variables('eventHubsNamespaceName'), '/test-eventhub-health')]", + "location": "[variables('location')]", + "dependsOn": [ + "[resourceId('Microsoft.EventHub/namespaces', variables('eventHubsNamespaceName'))]" + ], + "properties": { + "messageRetentionInDays": 1, + "partitionCount": 1, + "status": "Active" + } + }, { "type": "Microsoft.EventHub/namespaces/eventhubs/consumergroups", "apiVersion": "2017-04-01", - "name": "[concat(variables('eventHubsNamespaceName'), '/test-eventhub/$Default')]", + "name": "[concat(variables('eventHubsNamespaceName'), '/test-eventhub-message/$Default')]", "location": "[variables('location')]", "dependsOn": [ - "[resourceId('Microsoft.EventHub/namespaces/eventhubs', variables('eventHubsNamespaceName'), 'test-eventhub')]", + "[resourceId('Microsoft.EventHub/namespaces/eventhubs', variables('eventHubsNamespaceName'), 'test-eventhub-message')]", "[resourceId('Microsoft.EventHub/namespaces', variables('eventHubsNamespaceName'))]" ], "properties": {} @@ -153,7 +167,7 @@ "name": "[concat(variables('eventHubsNamespaceName'), '/test-eventhub-batch/$Default')]", "location": "[variables('location')]", "dependsOn": [ - "[resourceId('Microsoft.EventHub/namespaces/eventhubs', variables('eventHubsNamespaceName'), 'test-eventhub')]", + "[resourceId('Microsoft.EventHub/namespaces/eventhubs', variables('eventHubsNamespaceName'), 'test-eventhub-batch')]", "[resourceId('Microsoft.EventHub/namespaces', variables('eventHubsNamespaceName'))]" ], "properties": {} @@ -164,7 +178,7 @@ "name": "[concat(variables('eventHubsNamespaceName'), '/test-eventhub-manual/$Default')]", "location": "[variables('location')]", "dependsOn": [ - "[resourceId('Microsoft.EventHub/namespaces/eventhubs', variables('eventHubsNamespaceName'), 'test-eventhub')]", + "[resourceId('Microsoft.EventHub/namespaces/eventhubs', variables('eventHubsNamespaceName'), 'test-eventhub-manual')]", "[resourceId('Microsoft.EventHub/namespaces', variables('eventHubsNamespaceName'))]" ], "properties": {} @@ -175,7 +189,7 @@ "name": "[concat(variables('eventHubsNamespaceName'), '/test-eventhub-record/$Default')]", "location": "[variables('location')]", "dependsOn": [ - "[resourceId('Microsoft.EventHub/namespaces/eventhubs', variables('eventHubsNamespaceName'), 'test-eventhub')]", + "[resourceId('Microsoft.EventHub/namespaces/eventhubs', variables('eventHubsNamespaceName'), 'test-eventhub-record')]", "[resourceId('Microsoft.EventHub/namespaces', variables('eventHubsNamespaceName'))]" ], "properties": {} @@ -186,7 +200,18 @@ "name": "[concat(variables('eventHubsNamespaceName'), '/test-eventhub-sync/$Default')]", "location": "[variables('location')]", "dependsOn": [ - "[resourceId('Microsoft.EventHub/namespaces/eventhubs', variables('eventHubsNamespaceName'), 'test-eventhub')]", + "[resourceId('Microsoft.EventHub/namespaces/eventhubs', variables('eventHubsNamespaceName'), 'test-eventhub-sync')]", + "[resourceId('Microsoft.EventHub/namespaces', variables('eventHubsNamespaceName'))]" + ], + "properties": {} + }, + { + "type": "Microsoft.EventHub/namespaces/eventhubs/consumergroups", + "apiVersion": "2017-04-01", + "name": "[concat(variables('eventHubsNamespaceName'), '/test-eventhub-health/$Default')]", + "location": "[variables('location')]", + "dependsOn": [ + "[resourceId('Microsoft.EventHub/namespaces/eventhubs', variables('eventHubsNamespaceName'), 'test-eventhub-health')]", "[resourceId('Microsoft.EventHub/namespaces', variables('eventHubsNamespaceName'))]" ], "properties": {} @@ -265,7 +290,7 @@ { "type": "Microsoft.Storage/storageAccounts/blobServices/containers", "apiVersion": "2019-06-01", - "name": "[concat(variables('storageAccountName'), '/default/test-eventhub')]", + "name": "[concat(variables('storageAccountName'), '/default/test-eventhub-message')]", "dependsOn": [ "[resourceId('Microsoft.Storage/storageAccounts/blobServices', variables('storageAccountName'), 'default')]", "[resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName'))]" @@ -321,18 +346,30 @@ "properties": { "publicAccess": "None" } + }, + { + "type": "Microsoft.Storage/storageAccounts/blobServices/containers", + "apiVersion": "2019-06-01", + "name": "[concat(variables('storageAccountName'), '/default/test-eventhub-health')]", + "dependsOn": [ + "[resourceId('Microsoft.Storage/storageAccounts/blobServices', variables('storageAccountName'), 'default')]", + "[resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName'))]" + ], + "properties": { + "publicAccess": "None" + } } ], "outputs": { - "STORAGE_ACCOUNT_TEST_EVENTHUBS": { + "STORAGE_ACCOUNT_TEST_EVENTHUB": { "type": "string", "value": "[variables('storageAccountName')]" }, - "STORAGE_ACCOUNT_KEY_TEST_EVENTHUBS": { + "STORAGE_ACCOUNT_KEY_TEST_EVENTHUB": { "type": "string", "value": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName')), '2019-06-01').keys[0].value]" }, - "EVENTHUB_CONNECTION_STRING_TEST_EVENTHUBS": { + "EVENTHUB_CONNECTION_STRING_TEST_EVENTHUB": { "type": "string", "value": "[listKeys(resourceId('Microsoft.EventHub/namespaces/authorizationRules', variables('eventHubsNamespaceName'), variables('eventHubsNamespaceKeyName')), '2017-04-01').primaryConnectionString]" }