Skip to content

Commit bbb28dd

Browse files
committed
azurerm_eventgrid_namespace - fix on route_topic_id validation to accept namespace topics
1 parent 8e83eb4 commit bbb28dd

22 files changed

Lines changed: 1224 additions & 3 deletions

internal/services/eventgrid/eventgrid_namespace_resource.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
1616
"github.com/hashicorp/go-azure-sdk/resource-manager/eventgrid/2022-06-15/topics"
1717
"github.com/hashicorp/go-azure-sdk/resource-manager/eventgrid/2023-12-15-preview/namespaces"
18+
"github.com/hashicorp/go-azure-sdk/resource-manager/eventgrid/2023-12-15-preview/namespacetopics"
1819
"github.com/hashicorp/terraform-provider-azurerm/helpers/validate"
1920
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
2021
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
@@ -149,9 +150,12 @@ func (r EventGridNamespaceResource) Arguments() map[string]*pluginsdk.Schema {
149150
},
150151

151152
"route_topic_id": {
152-
Type: pluginsdk.TypeString,
153-
Optional: true,
154-
ValidateFunc: topics.ValidateTopicID,
153+
Type: pluginsdk.TypeString,
154+
Optional: true,
155+
ValidateFunc: validation.Any(
156+
topics.ValidateTopicID,
157+
namespacetopics.ValidateNamespaceTopicID,
158+
),
155159
},
156160

157161
"dynamic_routing_enrichment": {

vendor/github.com/hashicorp/go-azure-sdk/resource-manager/eventgrid/2023-12-15-preview/namespacetopics/README.md

Lines changed: 132 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/hashicorp/go-azure-sdk/resource-manager/eventgrid/2023-12-15-preview/namespacetopics/client.go

Lines changed: 26 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/hashicorp/go-azure-sdk/resource-manager/eventgrid/2023-12-15-preview/namespacetopics/constants.go

Lines changed: 151 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)