Skip to content

Commit

Permalink
deps: upgrade eventgrid to 2020-10-15-preview
Browse files Browse the repository at this point in the history
Which inherently introduces `Microsoft.PolicyInsights.PolicyStates`
system topic type.

```
$ TF_ACC=1 go test -v ./azurerm/internal/services/eventgrid -timeout=1000m -run 'TestAccEventGridSystemTopic_policyStates'
2021/05/17 14:03:50 [DEBUG] not using binary driver name, it's no longer needed
2021/05/17 14:03:50 [DEBUG] not using binary driver name, it's no longer needed
=== RUN   TestAccEventGridSystemTopic_policyStates
=== PAUSE TestAccEventGridSystemTopic_policyStates
=== CONT  TestAccEventGridSystemTopic_policyStates
--- PASS: TestAccEventGridSystemTopic_policyStates (141.65s)
PASS
ok  	github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/eventgrid	143.004s
```

Fixes: hashicorp#11523
  • Loading branch information
favoretti committed May 26, 2021
1 parent 7d9b30a commit 70f5bb6
Show file tree
Hide file tree
Showing 32 changed files with 2,836 additions and 281 deletions.
2 changes: 1 addition & 1 deletion azurerm/internal/services/eventgrid/client/client.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package client

import (
"github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2020-04-01-preview/eventgrid"
"github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2020-10-15-preview/eventgrid"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
)

Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/eventgrid/event_subscription.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"regexp"
"time"

"github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2020-04-01-preview/eventgrid"
"github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2020-10-15-preview/eventgrid"
"github.com/Azure/go-autorest/autorest/date"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/eventgrid/eventgrid.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package eventgrid

import (
"github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2020-04-01-preview/eventgrid"
"github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2020-10-15-preview/eventgrid"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"regexp"
"time"

"github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2020-04-01-preview/eventgrid"
"github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2020-10-15-preview/eventgrid"
"github.com/hashicorp/go-azure-helpers/response"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"time"

"github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2020-04-01-preview/eventgrid"
"github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2020-10-15-preview/eventgrid"
"github.com/hashicorp/go-azure-helpers/response"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"time"

"github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2020-04-01-preview/eventgrid"
"github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2020-10-15-preview/eventgrid"
"github.com/hashicorp/go-azure-helpers/response"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"regexp"
"time"

"github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2020-04-01-preview/eventgrid"
"github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2020-10-15-preview/eventgrid"
"github.com/hashicorp/go-azure-helpers/response"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,24 @@ func TestAccEventGridSystemTopic_basic(t *testing.T) {
})
}

func TestAccEventGridSystemTopic_policyStates(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_eventgrid_system_topic", "test")
r := EventGridSystemTopicResource{}

data.ResourceTest(t, r, []resource.TestStep{
{
Config: r.policyStates(data),
Check: resource.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
check.That(data.ResourceName).Key("source_arm_resource_id").Exists(),
check.That(data.ResourceName).Key("topic_type").Exists(),
check.That(data.ResourceName).Key("metric_arm_resource_id").Exists(),
),
},
data.ImportStep(),
})
}

func TestAccEventGridSystemTopic_requiresImport(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_eventgrid_system_topic", "test")
r := EventGridSystemTopicResource{}
Expand Down Expand Up @@ -162,3 +180,30 @@ resource "azurerm_eventgrid_system_topic" "test" {
}
`, data.RandomInteger, data.Locations.Primary, data.RandomIntOfLength(12), data.RandomIntOfLength(10))
}

func (EventGridSystemTopicResource) policyStates(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
features {}
}
data "azurerm_subscription" "current" {}
resource "azurerm_resource_group" "test" {
name = "acctestRG-eg-%d"
location = "%s"
}
resource "azurerm_eventgrid_system_topic" "test" {
name = "acctestEGST%d"
location = "Global"
resource_group_name = azurerm_resource_group.test.name
source_arm_resource_id = format("/subscriptions/%%s", data.azurerm_subscription.current.subscription_id)
topic_type = "Microsoft.PolicyInsights.PolicyStates"
tags = {
"Foo" = "Bar"
}
}
`, data.RandomInteger, data.Locations.Primary, data.RandomIntOfLength(10))
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"regexp"
"time"

"github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2020-04-01-preview/eventgrid"
"github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2020-10-15-preview/eventgrid"
"github.com/hashicorp/go-azure-helpers/response"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 70f5bb6

Please sign in to comment.