From 1b8a9cd0ca662f39ecf3e613efee0d9876492c76 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 11 Mar 2022 15:52:38 -0600 Subject: [PATCH 1/4] fix for 3.0 beta errors --- ..._topic_event_subscription_resource_test.go | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/internal/services/eventgrid/eventgrid_system_topic_event_subscription_resource_test.go b/internal/services/eventgrid/eventgrid_system_topic_event_subscription_resource_test.go index 9e5c3ab5d92d..84f1e8fea403 100644 --- a/internal/services/eventgrid/eventgrid_system_topic_event_subscription_resource_test.go +++ b/internal/services/eventgrid/eventgrid_system_topic_event_subscription_resource_test.go @@ -800,7 +800,7 @@ resource "azurerm_eventhub_namespace" "test" { resource "azurerm_eventhub" "test" { name = "acctesteventhub-%[1]d" - namespace_name = azurerm_eventhub_namespace.test.name + namespace_id = azurerm_eventhub_namespace.test.id resource_group_name = azurerm_resource_group.test.name partition_count = 2 message_retention = 1 @@ -847,7 +847,7 @@ resource "azurerm_servicebus_namespace" "example" { resource "azurerm_servicebus_queue" "test" { name = "acctestservicebusqueue-%[1]d" resource_group_name = azurerm_resource_group.test.name - namespace_name = azurerm_servicebus_namespace.example.name + namespace_id = azurerm_servicebus_namespace.example.id enable_partitioning = true } @@ -890,8 +890,7 @@ resource "azurerm_servicebus_namespace" "example" { resource "azurerm_servicebus_topic" "test" { name = "acctestservicebustopic-%[1]d" - resource_group_name = azurerm_resource_group.test.name - namespace_name = azurerm_servicebus_namespace.example.name + namespace_id = azurerm_servicebus_namespace.example.id enable_partitioning = true } @@ -1442,8 +1441,7 @@ resource "azurerm_servicebus_namespace" "example" { resource "azurerm_servicebus_topic" "test" { name = "acctestservicebustopic-%[1]d" - resource_group_name = azurerm_resource_group.test.name - namespace_name = azurerm_servicebus_namespace.example.name + namespace_id = azurerm_servicebus_namespace.example.id enable_partitioning = true } @@ -1506,8 +1504,7 @@ resource "azurerm_servicebus_namespace" "example" { resource "azurerm_servicebus_topic" "test" { name = "acctestservicebustopic-%[1]d" - resource_group_name = azurerm_resource_group.test.name - namespace_name = azurerm_servicebus_namespace.example.name + namespace_id = azurerm_servicebus_namespace.example.id enable_partitioning = true } @@ -1562,8 +1559,7 @@ resource "azurerm_servicebus_namespace" "example" { resource "azurerm_servicebus_topic" "test" { name = "acctestservicebustopic-%[1]d" - resource_group_name = azurerm_resource_group.test.name - namespace_name = azurerm_servicebus_namespace.example.name + namespace_id = azurerm_servicebus_namespace.example.id enable_partitioning = true } @@ -1631,8 +1627,7 @@ resource "azurerm_servicebus_namespace" "example" { resource "azurerm_servicebus_topic" "test" { name = "acctestservicebustopic-%[1]d" - resource_group_name = azurerm_resource_group.test.name - namespace_name = azurerm_servicebus_namespace.example.name + namespace_id = azurerm_servicebus_namespace.example.id enable_partitioning = true } @@ -1700,7 +1695,7 @@ resource "azurerm_eventhub_namespace" "test" { resource "azurerm_eventhub" "test" { name = "acctesteventhub-%[1]d" - namespace_name = azurerm_eventhub_namespace.test.name + namespace_id = azurerm_eventhub_namespace.test.id resource_group_name = azurerm_resource_group.test.name partition_count = 2 message_retention = 1 From a724d644f063f078f60fe8e9f9fbf028125f97af Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 11 Mar 2022 15:55:48 -0600 Subject: [PATCH 2/4] terrafmt changes --- ...tem_topic_event_subscription_resource_test.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/services/eventgrid/eventgrid_system_topic_event_subscription_resource_test.go b/internal/services/eventgrid/eventgrid_system_topic_event_subscription_resource_test.go index 84f1e8fea403..576996972af0 100644 --- a/internal/services/eventgrid/eventgrid_system_topic_event_subscription_resource_test.go +++ b/internal/services/eventgrid/eventgrid_system_topic_event_subscription_resource_test.go @@ -800,7 +800,7 @@ resource "azurerm_eventhub_namespace" "test" { resource "azurerm_eventhub" "test" { name = "acctesteventhub-%[1]d" - namespace_id = azurerm_eventhub_namespace.test.id + namespace_id = azurerm_eventhub_namespace.test.id resource_group_name = azurerm_resource_group.test.name partition_count = 2 message_retention = 1 @@ -847,7 +847,7 @@ resource "azurerm_servicebus_namespace" "example" { resource "azurerm_servicebus_queue" "test" { name = "acctestservicebusqueue-%[1]d" resource_group_name = azurerm_resource_group.test.name - namespace_id = azurerm_servicebus_namespace.example.id + namespace_id = azurerm_servicebus_namespace.example.id enable_partitioning = true } @@ -890,7 +890,7 @@ resource "azurerm_servicebus_namespace" "example" { resource "azurerm_servicebus_topic" "test" { name = "acctestservicebustopic-%[1]d" - namespace_id = azurerm_servicebus_namespace.example.id + namespace_id = azurerm_servicebus_namespace.example.id enable_partitioning = true } @@ -1441,7 +1441,7 @@ resource "azurerm_servicebus_namespace" "example" { resource "azurerm_servicebus_topic" "test" { name = "acctestservicebustopic-%[1]d" - namespace_id = azurerm_servicebus_namespace.example.id + namespace_id = azurerm_servicebus_namespace.example.id enable_partitioning = true } @@ -1504,7 +1504,7 @@ resource "azurerm_servicebus_namespace" "example" { resource "azurerm_servicebus_topic" "test" { name = "acctestservicebustopic-%[1]d" - namespace_id = azurerm_servicebus_namespace.example.id + namespace_id = azurerm_servicebus_namespace.example.id enable_partitioning = true } @@ -1559,7 +1559,7 @@ resource "azurerm_servicebus_namespace" "example" { resource "azurerm_servicebus_topic" "test" { name = "acctestservicebustopic-%[1]d" - namespace_id = azurerm_servicebus_namespace.example.id + namespace_id = azurerm_servicebus_namespace.example.id enable_partitioning = true } @@ -1627,7 +1627,7 @@ resource "azurerm_servicebus_namespace" "example" { resource "azurerm_servicebus_topic" "test" { name = "acctestservicebustopic-%[1]d" - namespace_id = azurerm_servicebus_namespace.example.id + namespace_id = azurerm_servicebus_namespace.example.id enable_partitioning = true } @@ -1695,7 +1695,7 @@ resource "azurerm_eventhub_namespace" "test" { resource "azurerm_eventhub" "test" { name = "acctesteventhub-%[1]d" - namespace_id = azurerm_eventhub_namespace.test.id + namespace_id = azurerm_eventhub_namespace.test.id resource_group_name = azurerm_resource_group.test.name partition_count = 2 message_retention = 1 From f0f53ecac907b6b27f1478a796c1fd09c0f44f67 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 11 Mar 2022 16:41:12 -0600 Subject: [PATCH 3/4] rm rgname --- .../eventgrid_system_topic_event_subscription_resource_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/services/eventgrid/eventgrid_system_topic_event_subscription_resource_test.go b/internal/services/eventgrid/eventgrid_system_topic_event_subscription_resource_test.go index 576996972af0..f18b0e6d0ed3 100644 --- a/internal/services/eventgrid/eventgrid_system_topic_event_subscription_resource_test.go +++ b/internal/services/eventgrid/eventgrid_system_topic_event_subscription_resource_test.go @@ -846,7 +846,6 @@ resource "azurerm_servicebus_namespace" "example" { resource "azurerm_servicebus_queue" "test" { name = "acctestservicebusqueue-%[1]d" - resource_group_name = azurerm_resource_group.test.name namespace_id = azurerm_servicebus_namespace.example.id enable_partitioning = true } From bb4c30abacf471873bc1000ba03f2fdc56185929 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 11 Mar 2022 16:43:08 -0600 Subject: [PATCH 4/4] eventhub still uses namespace_name --- ...eventgrid_system_topic_event_subscription_resource_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/services/eventgrid/eventgrid_system_topic_event_subscription_resource_test.go b/internal/services/eventgrid/eventgrid_system_topic_event_subscription_resource_test.go index f18b0e6d0ed3..9ad600cc98e5 100644 --- a/internal/services/eventgrid/eventgrid_system_topic_event_subscription_resource_test.go +++ b/internal/services/eventgrid/eventgrid_system_topic_event_subscription_resource_test.go @@ -800,7 +800,7 @@ resource "azurerm_eventhub_namespace" "test" { resource "azurerm_eventhub" "test" { name = "acctesteventhub-%[1]d" - namespace_id = azurerm_eventhub_namespace.test.id + namespace_name = azurerm_eventhub_namespace.test.name resource_group_name = azurerm_resource_group.test.name partition_count = 2 message_retention = 1 @@ -1694,7 +1694,7 @@ resource "azurerm_eventhub_namespace" "test" { resource "azurerm_eventhub" "test" { name = "acctesteventhub-%[1]d" - namespace_id = azurerm_eventhub_namespace.test.id + namespace_name = azurerm_eventhub_namespace.test.name resource_group_name = azurerm_resource_group.test.name partition_count = 2 message_retention = 1