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.

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_maintenance_configuration - set reboot AlwaysReboot to Always #24376

Merged
merged 4 commits into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"fmt"
"log"
"regexp"
"strings"
"time"

"github.com/hashicorp/go-azure-helpers/lang/pointer"
Expand Down Expand Up @@ -446,7 +447,12 @@ func flattenMaintenanceConfigurationInstallPatches(input *maintenanceconfigurati
output := make(map[string]interface{})

if rebootSetting := v.RebootSetting; rebootSetting != nil {
output["reboot"] = *rebootSetting
// https://github.com/Azure/azure-rest-api-specs/issues/27222
if strings.EqualFold(string(*rebootSetting), "AlwaysReboot") {
output["reboot"] = "Always"
} else {
output["reboot"] = *rebootSetting
}
}

if windowsParameters := v.WindowsParameters; windowsParameters != nil {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,21 @@ func TestAccMaintenanceConfiguration_basic(t *testing.T) {
})
}

func TestAccMaintenanceConfiguration_basicWithAlwaysReboot(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_maintenance_configuration", "test")
r := MaintenanceConfigurationResource{}

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

func TestAccMaintenanceConfiguration_basicWithInGuestPatch(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_maintenance_configuration", "test")
r := MaintenanceConfigurationResource{}
Expand Down Expand Up @@ -192,6 +207,57 @@ resource "azurerm_maintenance_configuration" "test" {
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger)
}

func (MaintenanceConfigurationResource) basic_withAlwaysReboot(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
features {}
}

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

resource "azurerm_maintenance_configuration" "test" {
name = "acctest-MC%d"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
scope = "InGuestPatch"
in_guest_user_patch_mode = "User"
install_patches {
reboot = "Always"
linux {
classifications_to_include = [
"Critical",
"Security",
]
package_names_mask_to_exclude = []
package_names_mask_to_include = []
}

windows {
classifications_to_include = [
"Critical",
"Security",
"UpdateRollup",
"Definition",
"Updates",
]
kb_numbers_to_exclude = []
kb_numbers_to_include = []
}
}

window {
duration = "02:00"
recur_every = "Day"
start_date_time = "2025-02-01 11:00"
time_zone = "Central Standard Time"
}
}
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger)
}

func (MaintenanceConfigurationResource) basic_withInGuestPatch(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
Expand Down
Loading