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

Jump to bottom

azurerm_network_watcher_flow_log destroy fails #7154

Merged
merged 4 commits into from Jun 16, 2020
Merged

azurerm_network_watcher_flow_log destroy fails #7154

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0fe1251
update
May 28, 2020
d1e4f0d
remove useless
May 29, 2020
00050b5
Merge branch 'master' of https://github.com/terraform-providers/terra…
Jun 9, 2020
fa3bb0e
revert test
Jun 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 18 additions & 6 deletions azurerm/internal/services/network/network_watcher_flow_log_resource.go
View file
Open in desktop
Expand Up @@ -310,30 +310,42 @@ func resourceArmNetworkWatcherFlowLogDelete(d *schema.ResourceData, meta interfa
}
future, err := client.GetFlowLogStatus(ctx, id.ResourceGroup, id.NetworkWatcherName, statusParameters)
if err != nil {
return fmt.Errorf("Error getting Flow Log Configuration for target %q (Network Watcher %q / Resource Group %q): %+v", id.NetworkSecurityGroupID, id.NetworkWatcherName, id.ResourceGroup, err)
return fmt.Errorf("getting Flow Log Configuration for target %q (Network Watcher %q / Resource Group %q): %+v", id.NetworkSecurityGroupID, id.NetworkWatcherName, id.ResourceGroup, err)
}

if err = future.WaitForCompletionRef(ctx, client.Client); err != nil {
return fmt.Errorf("Error waiting for retrieval of Flow Log Configuration for target %q (Network Watcher %q / Resource Group %q): %+v", id.NetworkSecurityGroupID, id.NetworkWatcherName, id.ResourceGroup, err)
return fmt.Errorf("waiting for retrieval of Flow Log Configuration for target %q (Network Watcher %q / Resource Group %q): %+v", id.NetworkSecurityGroupID, id.NetworkWatcherName, id.ResourceGroup, err)
}

fli, err := future.Result(*client)
if err != nil {
return fmt.Errorf("Error retrieving Flow Log Configuration for target %q (Network Watcher %q / Resource Group %q): %+v", id.NetworkSecurityGroupID, id.NetworkWatcherName, id.ResourceGroup, err)
return fmt.Errorf("retrieving Flow Log Configuration for target %q (Network Watcher %q / Resource Group %q): %+v", id.NetworkSecurityGroupID, id.NetworkWatcherName, id.ResourceGroup, err)
}

// There is no delete in Azure API. Disabling flow log is effectively a delete in Terraform.
if props := fli.FlowLogProperties; props != nil {
if props.Enabled != nil && *props.Enabled {
props.Enabled = utils.Bool(false)

setFuture, err := client.SetFlowLogConfiguration(ctx, id.ResourceGroup, id.NetworkWatcherName, fli)
param := network.FlowLogInformation{
TargetResourceID: &id.NetworkSecurityGroupID,
FlowLogProperties: &network.FlowLogProperties{
StorageID: utils.String(*fli.StorageID),
Enabled: utils.Bool(false),
},
FlowAnalyticsConfiguration: &network.TrafficAnalyticsProperties{
NetworkWatcherFlowAnalyticsConfiguration: &network.TrafficAnalyticsConfigurationProperties{
Enabled: utils.Bool(false),
},
},
}
setFuture, err := client.SetFlowLogConfiguration(ctx, id.ResourceGroup, id.NetworkWatcherName, param)
if err != nil {
return fmt.Errorf("Error disabling Flow Log Configuration for target %q (Network Watcher %q / Resource Group %q): %+v", id.NetworkSecurityGroupID, id.NetworkWatcherName, id.ResourceGroup, err)
return fmt.Errorf("disabling Flow Log Configuration for target %q (Network Watcher %q / Resource Group %q): %+v", id.NetworkSecurityGroupID, id.NetworkWatcherName, id.ResourceGroup, err)
}

if err = setFuture.WaitForCompletionRef(ctx, client.Client); err != nil {
return fmt.Errorf("Error waiting for completion of disabling Flow Log Configuration for target %q (Network Watcher %q / Resource Group %q): %+v", id.NetworkSecurityGroupID, id.NetworkWatcherName, id.ResourceGroup, err)
return fmt.Errorf("waiting for completion of disabling Flow Log Configuration for target %q (Network Watcher %q / Resource Group %q): %+v", id.NetworkSecurityGroupID, id.NetworkWatcherName, id.ResourceGroup, err)
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions azurerm/internal/services/network/tests/network_watcher_flow_log_resource_test.go
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@ import (
nw "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network"
)

func testAccAzureRMNetworkWatcherFlowLog_basic(t *testing.T) {
func TestAccAzureRMNetworkWatcherFlowLog_basic(t *testing.T) {
yupwei68 marked this conversation as resolved.
Show resolved Hide resolved
data := acceptance.BuildTestData(t, "azurerm_network_watcher_flow_log", "test")

resource.Test(t, resource.TestCase{
Expand All @@ -39,7 +39,7 @@ func testAccAzureRMNetworkWatcherFlowLog_basic(t *testing.T) {
})
}

func testAccAzureRMNetworkWatcherFlowLog_disabled(t *testing.T) {
func TestAccAzureRMNetworkWatcherFlowLog_disabled(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_network_watcher_flow_log", "test")

resource.Test(t, resource.TestCase{
Expand All @@ -66,7 +66,7 @@ func testAccAzureRMNetworkWatcherFlowLog_disabled(t *testing.T) {
})
}

func testAccAzureRMNetworkWatcherFlowLog_reenabled(t *testing.T) {
func TestAccAzureRMNetworkWatcherFlowLog_reenabled(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_network_watcher_flow_log", "test")

resource.Test(t, resource.TestCase{
Expand Down Expand Up @@ -107,7 +107,7 @@ func testAccAzureRMNetworkWatcherFlowLog_reenabled(t *testing.T) {
})
}

func testAccAzureRMNetworkWatcherFlowLog_retentionPolicy(t *testing.T) {
func TestAccAzureRMNetworkWatcherFlowLog_retentionPolicy(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_network_watcher_flow_log", "test")

resource.Test(t, resource.TestCase{
Expand Down Expand Up @@ -149,7 +149,7 @@ func testAccAzureRMNetworkWatcherFlowLog_retentionPolicy(t *testing.T) {
})
}

func testAccAzureRMNetworkWatcherFlowLog_updateStorageAccount(t *testing.T) {
func TestAccAzureRMNetworkWatcherFlowLog_updateStorageAccount(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_network_watcher_flow_log", "test")

resource.Test(t, resource.TestCase{
Expand Down Expand Up @@ -191,7 +191,7 @@ func testAccAzureRMNetworkWatcherFlowLog_updateStorageAccount(t *testing.T) {
})
}

func testAccAzureRMNetworkWatcherFlowLog_trafficAnalytics(t *testing.T) {
func TestAccAzureRMNetworkWatcherFlowLog_trafficAnalytics(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_network_watcher_flow_log", "test")

resource.Test(t, resource.TestCase{
Expand Down Expand Up @@ -290,7 +290,7 @@ func testAccAzureRMNetworkWatcherFlowLog_trafficAnalytics(t *testing.T) {
})
}

func testAccAzureRMNetworkWatcherFlowLog_version(t *testing.T) {
func TestAccAzureRMNetworkWatcherFlowLog_version(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_network_watcher_flow_log", "test")

resource.Test(t, resource.TestCase{
Expand Down
14 changes: 7 additions & 7 deletions azurerm/internal/services/network/tests/network_watcher_resource_test.go
View file
Open in desktop
Expand Up @@ -54,13 +54,13 @@ func TestAccAzureRMNetworkWatcher(t *testing.T) {
"requiresImport": testAccAzureRMNetworkPacketCapture_requiresImport,
},
"FlowLog": {
"basic": testAccAzureRMNetworkWatcherFlowLog_basic,
"disabled": testAccAzureRMNetworkWatcherFlowLog_disabled,
"reenabled": testAccAzureRMNetworkWatcherFlowLog_reenabled,
"retentionPolicy": testAccAzureRMNetworkWatcherFlowLog_retentionPolicy,
"updateStorageAccount": testAccAzureRMNetworkWatcherFlowLog_updateStorageAccount,
"trafficAnalytics": testAccAzureRMNetworkWatcherFlowLog_trafficAnalytics,
"version": testAccAzureRMNetworkWatcherFlowLog_version,
"basic": TestAccAzureRMNetworkWatcherFlowLog_basic,
"disabled": TestAccAzureRMNetworkWatcherFlowLog_disabled,
"reenabled": TestAccAzureRMNetworkWatcherFlowLog_reenabled,
"retentionPolicy": TestAccAzureRMNetworkWatcherFlowLog_retentionPolicy,
"updateStorageAccount": TestAccAzureRMNetworkWatcherFlowLog_updateStorageAccount,
"trafficAnalytics": TestAccAzureRMNetworkWatcherFlowLog_trafficAnalytics,
"version": TestAccAzureRMNetworkWatcherFlowLog_version,
},
}

Expand Down