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

azurerm_kubernetes_cluster - add support for Defender Profile #16218

Merged
merged 8 commits into from
Apr 20, 2022
Merged

azurerm_kubernetes_cluster - add support for Defender Profile #16218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cb5821a
remove ThreePointOh flags from addons
stephybun Mar 31, 2022
aef032c
add microsoft_defender block and clean up ThreePointOh flags
stephybun Mar 31, 2022
8e96769
add microsoft_defender to data source
stephybun Mar 31, 2022
5f75a14
send nil for security profile if azure defender has not been enabled …
stephybun Apr 1, 2022
4842e40
strip securityProfile from request body for subsequent updates after …
stephybun Apr 1, 2022
6d29ad4
remove alt subscription from testing
stephybun Apr 1, 2022
be2d204
fmt
stephybun Apr 7, 2022
4a47d41
terrafmt
stephybun Apr 7, 2022
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
672 changes: 0 additions & 672 deletions internal/services/containers/kubernetes_addons.go
View file
Open in desktop

Large diffs are not rendered by default.

1,245 changes: 164 additions & 1,081 deletions internal/services/containers/kubernetes_cluster_addons_resource_test.go
View file
Open in desktop

Large diffs are not rendered by default.

547 changes: 35 additions & 512 deletions internal/services/containers/kubernetes_cluster_data_source.go
View file
Open in desktop

Large diffs are not rendered by default.

462 changes: 140 additions & 322 deletions internal/services/containers/kubernetes_cluster_data_source_test.go
View file
Open in desktop

Large diffs are not rendered by default.

95 changes: 95 additions & 0 deletions internal/services/containers/kubernetes_cluster_other_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,28 @@ func TestAccKubernetesCluster_osSku(t *testing.T) {
})
}

func TestAccKubernetesCluster_microsoftDefender(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_kubernetes_cluster", "test")
r := KubernetesClusterResource{}

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

func TestAccKubernetesCluster_oidcIssuer(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_kubernetes_cluster", "test")
r := KubernetesClusterResource{}
Expand Down Expand Up @@ -1852,21 +1874,25 @@ func (KubernetesClusterResource) osSku(data acceptance.TestData) string {
provider "azurerm" {
features {}
}

resource "azurerm_resource_group" "test" {
name = "acctestRG-aks-%d"
location = "%s"
}

resource "azurerm_kubernetes_cluster" "test" {
name = "acctestaks%d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
dns_prefix = "acctestaks%d"

default_node_pool {
name = "default"
node_count = 1
vm_size = "Standard_D2s_v3"
os_sku = "Ubuntu"
}

identity {
type = "SystemAssigned"
}
Expand Down Expand Up @@ -1901,3 +1927,72 @@ resource "azurerm_kubernetes_cluster" "test" {
}
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, enabled)
}

func (KubernetesClusterResource) microsoftDefender(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
features {}
}
resource "azurerm_resource_group" "test" {
name = "acctestRG-aks-%d"
location = "%s"
}
resource "azurerm_log_analytics_workspace" "test" {
name = "acctest-%d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
sku = "PerGB2018"
}
resource "azurerm_kubernetes_cluster" "test" {
name = "acctestaks%d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
dns_prefix = "acctestaks%d"
role_based_access_control_enabled = true
default_node_pool {
name = "default"
node_count = 1
vm_size = "Standard_DS2_v2"
}
identity {
type = "SystemAssigned"
}
microsoft_defender {
log_analytics_workspace_id = azurerm_log_analytics_workspace.test.id
}
}
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger)
}

func (KubernetesClusterResource) microsoftDefenderDisabled(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
features {}
}
resource "azurerm_resource_group" "test" {
name = "acctestRG-aks-%d"
location = "%s"
}
resource "azurerm_log_analytics_workspace" "test" {
name = "acctest-%d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
sku = "PerGB2018"
}
resource "azurerm_kubernetes_cluster" "test" {
name = "acctestaks%d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
dns_prefix = "acctestaks%d"
role_based_access_control_enabled = true
default_node_pool {
name = "default"
node_count = 1
vm_size = "Standard_DS2_v2"
}
identity {
type = "SystemAssigned"
}
}
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger)
}
Loading