From 1386417341ae7f526c0c9fcfa36316220c8ee4f2 Mon Sep 17 00:00:00 2001
From: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>
Date: Fri, 1 Jul 2022 18:51:08 +0000
Subject: [PATCH] Do not hardcode specific testTopicName

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>
---
 .../conformance/azure/conf-test-azure-eventhubs.bicep       | 6 +++---
 tests/config/pubsub/tests.yml                               | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/infrastructure/conformance/azure/conf-test-azure-eventhubs.bicep b/.github/infrastructure/conformance/azure/conf-test-azure-eventhubs.bicep
index 712b8ba737..9a86cc2b5c 100644
--- a/.github/infrastructure/conformance/azure/conf-test-azure-eventhubs.bicep
+++ b/.github/infrastructure/conformance/azure/conf-test-azure-eventhubs.bicep
@@ -16,11 +16,11 @@ param rgLocation string = resourceGroup().location
 param confTestTags object = {}
 
 var eventHubsNamespacePolicy = '${eventHubsNamespaceName}-namespace-policy'
-var eventHubBindingsName = '${eventHubsNamespaceName}-bindings-topic'
+var eventHubBindingsName = 'eventhubs-bindings-topic'
 var eventHubBindingsPolicyName = '${eventHubBindingsName}-policy'
 var eventHubBindingsConsumerGroupName = '${eventHubBindingsName}-cg'
 
-var eventHubPubsubName = '${eventHubsNamespaceName}-pubsub-topic'
+var eventHubPubsubName = 'eventhubs-pubsub-topic'
 var eventHubPubsubPolicyName = '${eventHubPubsubName}-policy'
 var eventHubPubsubConsumerGroupName = '${eventHubPubsubName}-cg'
 
@@ -182,4 +182,4 @@ output certificationEventHubPubsubTopicActivePolicyName string = eventHubsNamesp
 output certificationEventHubPubsubTopicMulti1Name string = eventHubsNamespace::certificationEventHubPubsubTopicMulti1.name
 output certificationEventHubPubsubTopicMulti2Name string = eventHubsNamespace::certificationEventHubPubsubTopicMulti2.name
 output certificationEventHubPubsubTopicMulti1PolicyName string = eventHubsNamespace::certificationEventHubPubsubTopicMulti1::certificationEventHubPubsubTopicMulti1Policy.name 
-output certificationEventHubPubsubTopicMulti2PolicyName string = eventHubsNamespace::certificationEventHubPubsubTopicMulti2::certificationEventHubPubsubTopicMulti2Policy.name 
\ No newline at end of file
+output certificationEventHubPubsubTopicMulti2PolicyName string = eventHubsNamespace::certificationEventHubPubsubTopicMulti2::certificationEventHubPubsubTopicMulti2Policy.name 
diff --git a/tests/config/pubsub/tests.yml b/tests/config/pubsub/tests.yml
index 363090c9d8..0cb09926d3 100644
--- a/tests/config/pubsub/tests.yml
+++ b/tests/config/pubsub/tests.yml
@@ -13,7 +13,7 @@ components:
     allOperations: true
     config:
       pubsubName: azure-eventhubs
-      testTopicName: dapr3-conf-test-eventhubs-pubsub-topic
+      testTopicName: eventhubs-pubsub-topic
       testMultiTopic1Name: certification-pubsub-multi-topic1
       testMultiTopic2Name: certification-pubsub-multi-topic2
       ## with partition key set, inorder processing is guaranteed.