Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deprecating azurerm_eventhub_namespace_disaster_recovery_config.alternate_name #11013

Merged
merged 2 commits into from
Mar 18, 2021
Merged

deprecating azurerm_eventhub_namespace_disaster_recovery_config.alternate_name #11013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c44afed
deprecating azurerm_eventhub_namespace_disaster_recovery_config.alter…
katbyte Mar 18, 2021
0809025
make fmt
katbyte Mar 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions azurerm/internal/services/eventhub/eventhub_namespace_disaster_recovery_config_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,12 @@ func resourceEventHubNamespaceDisasterRecoveryConfig() *schema.Resource {
ValidateFunc: azure.ValidateResourceIDOrEmpty,
},

// this property is broken and should not be reimplemented after 3.0 until this is addressed: https://github.com/Azure/azure-sdk-for-go/issues/5893
"alternate_name": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validate.ValidateEventHubNamespaceName(),
Deprecated: "This property has been deprecated and will be removed in v3.0 of the provider as any DRC created with an alternate name cannot be deleted and the service is not going to change this. Please see: https://github.com/Azure/azure-sdk-for-go/issues/5893",
},
},
}
Expand Down
56 changes: 0 additions & 56 deletions ...m/internal/services/eventhub/eventhub_namespace_disaster_recovery_config_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,26 +32,6 @@ func TestAccEventHubNamespaceDisasterRecoveryConfig_basic(t *testing.T) {
})
}

func TestAccEventHubNamespaceDisasterRecoveryConfig_complete(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_eventhub_namespace_disaster_recovery_config", "test")

// skipping due to there being no way to delete a DRC once an alternate name has been set
// sdk bug: https://github.com/Azure/azure-sdk-for-go/issues/5893
t.Skip()

r := EventHubNamespaceDisasterRecoveryConfigResource{}

data.ResourceTest(t, r, []resource.TestStep{
{
Config: r.complete(data),
Check: resource.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
})
}

func TestAccEventHubNamespaceDisasterRecoveryConfig_update(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_eventhub_namespace_disaster_recovery_config", "test")
r := EventHubNamespaceDisasterRecoveryConfigResource{}
Expand Down Expand Up @@ -128,42 +108,6 @@ resource "azurerm_eventhub_namespace_disaster_recovery_config" "test" {
`, data.RandomInteger, data.Locations.Primary, data.Locations.Secondary)
}

// nolint unused - mistakenly marked as unused
func (EventHubNamespaceDisasterRecoveryConfigResource) complete(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
features {}
}

resource "azurerm_resource_group" "test" {
name = "acctestRG-eventhub-%[1]d"
location = "%[2]s"
}

resource "azurerm_eventhub_namespace" "testa" {
name = "acctest-EHN-%[1]d-a"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
sku = "Standard"
}

resource "azurerm_eventhub_namespace" "testb" {
name = "acctest-EHN-%[1]d-b"
location = "%[3]s"
resource_group_name = azurerm_resource_group.test.name
sku = "Standard"
}

resource "azurerm_eventhub_namespace_disaster_recovery_config" "test" {
name = "${azurerm_eventhub_namespace.testa.name}-111"
resource_group_name = azurerm_resource_group.test.name
namespace_name = azurerm_eventhub_namespace.testa.name
partner_namespace_id = azurerm_eventhub_namespace.testb.id
alternate_name = "acctest-EHN-DRC-%[1]d-alt"
}
`, data.RandomInteger, data.Locations.Primary, data.Locations.Secondary)
}

func (EventHubNamespaceDisasterRecoveryConfigResource) updated(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
Expand Down
2 changes: 0 additions & 2 deletions website/docs/r/eventhub_namespace_disaster_recovery_config.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ The following arguments are supported:

* `partner_namespace_id` - (Optional) The ID of the EventHub Namespace to replicate to.

* `alternate_name` - (Optional) An alternate name to use when the Disaster Recovery Config's name is the same as the replicated namespace's name.

* `wait_for_replication` - (Optional) Should the resource wait for replication upon creation? Defaults to `false`.

## Attributes Reference
Expand Down