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 - support for theinterval_in_minutes property #5851

Merged
merged 6 commits into from
Mar 9, 2020
Merged

azurerm_network_watcher_flow_log - support for theinterval_in_minutes property #5851

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dd452b3
Expose `interval` for flow log
magodo Feb 24, 2020
3cee88a
terrafmt testcode
magodo Feb 24, 2020
55496f3
Update website/docs/r/network_watcher_flow_log.html.markdown
magodo Mar 9, 2020
596c10b
Update azurerm/internal/services/network/resource_arm_network_watcher…
magodo Mar 9, 2020
d65238c
Modify per review
magodo Mar 9, 2020
41263f9
fix tests
katbyte Mar 9, 2020
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
20 changes: 16 additions & 4 deletions azurerm/internal/services/network/resource_arm_network_watcher_flow_log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,13 @@ func resourceArmNetworkWatcherFlowLog() *schema.Resource {
Required: true,
ValidateFunc: azure.ValidateResourceIDOrEmpty,
},

"interval_in_minutes": {
Type: schema.TypeInt,
Optional: true,
ValidateFunc: validation.IntInSlice([]int{10, 60}),
Default: 60,
},
},
},
},
Expand Down Expand Up @@ -386,6 +393,9 @@ func flattenAzureRmNetworkWatcherFlowLogTrafficAnalytics(input *network.TrafficA
if cfg.WorkspaceResourceID != nil {
result["workspace_resource_id"] = *cfg.WorkspaceResourceID
}
if cfg.TrafficAnalyticsInterval != nil {
result["interval_in_minutes"] = int(*cfg.TrafficAnalyticsInterval)
}
}

return []interface{}{result}
Expand All @@ -399,13 +409,15 @@ func expandAzureRmNetworkWatcherFlowLogTrafficAnalytics(d *schema.ResourceData)
workspaceID := v["workspace_id"].(string)
workspaceRegion := v["workspace_region"].(string)
workspaceResourceID := v["workspace_resource_id"].(string)
interval := v["interval_in_minutes"].(int)

return &network.TrafficAnalyticsProperties{
NetworkWatcherFlowAnalyticsConfiguration: &network.TrafficAnalyticsConfigurationProperties{
Enabled: utils.Bool(enabled),
WorkspaceID: utils.String(workspaceID),
WorkspaceRegion: utils.String(workspaceRegion),
WorkspaceResourceID: utils.String(workspaceResourceID),
Enabled: utils.Bool(enabled),
WorkspaceID: utils.String(workspaceID),
WorkspaceRegion: utils.String(workspaceRegion),
WorkspaceResourceID: utils.String(workspaceResourceID),
TrafficAnalyticsInterval: utils.Int32(int32(interval)),
},
}
}
58 changes: 58 additions & 0 deletions azurerm/internal/services/network/tests/resource_arm_network_watcher_flow_log_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ func testAccAzureRMNetworkWatcherFlowLog_trafficAnalytics(t *testing.T) {
resource.TestCheckResourceAttr(data.ResourceName, "enabled", "true"),
),
},
data.ImportStep(),
{
Config: testAccAzureRMNetworkWatcherFlowLog_TrafficAnalyticsEnabledConfig(data),
Check: resource.ComposeTestCheckFunc(
Expand All @@ -242,6 +243,28 @@ func testAccAzureRMNetworkWatcherFlowLog_trafficAnalytics(t *testing.T) {
resource.TestCheckResourceAttr(data.ResourceName, "enabled", "true"),
resource.TestCheckResourceAttr(data.ResourceName, "traffic_analytics.#", "1"),
resource.TestCheckResourceAttr(data.ResourceName, "traffic_analytics.0.enabled", "true"),
resource.TestCheckResourceAttr(data.ResourceName, "traffic_analytics.0.interval", "60"),
resource.TestCheckResourceAttrSet(data.ResourceName, "traffic_analytics.0.workspace_id"),
resource.TestCheckResourceAttrSet(data.ResourceName, "traffic_analytics.0.workspace_region"),
resource.TestCheckResourceAttrSet(data.ResourceName, "traffic_analytics.0.workspace_resource_id"),
),
},
data.ImportStep(),
{
Config: testAccAzureRMNetworkWatcherFlowLog_TrafficAnalyticsUpdateInterval(data),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMNetworkWatcherFlowLogExists(data.ResourceName),
resource.TestCheckResourceAttrSet(data.ResourceName, "network_watcher_name"),
resource.TestCheckResourceAttrSet(data.ResourceName, "resource_group_name"),
resource.TestCheckResourceAttrSet(data.ResourceName, "network_security_group_id"),
resource.TestCheckResourceAttrSet(data.ResourceName, "storage_account_id"),
resource.TestCheckResourceAttr(data.ResourceName, "retention_policy.#", "1"),
resource.TestCheckResourceAttr(data.ResourceName, "retention_policy.0.enabled", "true"),
resource.TestCheckResourceAttr(data.ResourceName, "retention_policy.0.days", "7"),
resource.TestCheckResourceAttr(data.ResourceName, "enabled", "true"),
resource.TestCheckResourceAttr(data.ResourceName, "traffic_analytics.#", "1"),
resource.TestCheckResourceAttr(data.ResourceName, "traffic_analytics.0.enabled", "true"),
resource.TestCheckResourceAttr(data.ResourceName, "traffic_analytics.0.interval", "10"),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

THis check will fail?

resource.TestCheckResourceAttrSet(data.ResourceName, "traffic_analytics.0.workspace_id"),
resource.TestCheckResourceAttrSet(data.ResourceName, "traffic_analytics.0.workspace_region"),
resource.TestCheckResourceAttrSet(data.ResourceName, "traffic_analytics.0.workspace_resource_id"),
Expand Down Expand Up @@ -488,6 +511,41 @@ resource "azurerm_network_watcher_flow_log" "test" {
`, testAccAzureRMNetworkWatcherFlowLog_prerequisites(data), data.RandomInteger)
}

func testAccAzureRMNetworkWatcherFlowLog_TrafficAnalyticsUpdateInterval(data acceptance.TestData) string {
return fmt.Sprintf(`
%s

resource "azurerm_log_analytics_workspace" "test" {
name = "acctestLAW-%d"
location = "${azurerm_resource_group.test.location}"
resource_group_name = "${azurerm_resource_group.test.name}"
sku = "PerGB2018"
}

resource "azurerm_network_watcher_flow_log" "test" {
network_watcher_name = "${azurerm_network_watcher.test.name}"
resource_group_name = "${azurerm_resource_group.test.name}"

network_security_group_id = "${azurerm_network_security_group.test.id}"
storage_account_id = "${azurerm_storage_account.test.id}"
enabled = true

retention_policy {
enabled = true
days = 7
}

traffic_analytics {
enabled = true
workspace_id = "${azurerm_log_analytics_workspace.test.workspace_id}"
workspace_region = "${azurerm_log_analytics_workspace.test.location}"
workspace_resource_id = "${azurerm_log_analytics_workspace.test.id}"
interval = 10
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test will fail as this should be

Suggested change
interval = 10
interval_in_minutes = 10

}
}
`, testAccAzureRMNetworkWatcherFlowLog_prerequisites(data), data.RandomInteger)
}

func testAccAzureRMNetworkWatcherFlowLog_TrafficAnalyticsDisabledConfig(data acceptance.TestData) string {
return fmt.Sprintf(`
%s
Expand Down
3 changes: 3 additions & 0 deletions website/docs/r/network_watcher_flow_log.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ resource "azurerm_storage_account" "test" {
location = azurerm_resource_group.test.location

account_tier = "Standard"
account_kind = "StorageV2"
account_replication_type = "LRS"
enable_https_traffic_only = true
}
Expand Down Expand Up @@ -66,6 +67,7 @@ resource "azurerm_network_watcher_flow_log" "test" {
workspace_id = azurerm_log_analytics_workspace.test.workspace_id
workspace_region = azurerm_log_analytics_workspace.test.location
workspace_resource_id = azurerm_log_analytics_workspace.test.id
interval_in_minutes = 10
}
}
```
Expand Down Expand Up @@ -105,6 +107,7 @@ The following arguments are supported:
* `workspace_id` - (Required) The resource guid of the attached workspace.
* `workspace_region` - (Required) The location of the attached workspace.
* `workspace_resource_id` - (Required) The resource ID of the attached workspace.
* `interval_in_minutes` - (Optional) How frequently service should do flow analytics in minutes.

## Attributes Reference

Expand Down