Merge branch 'hashicorp:main' into 25803

.github/labeler-issue-triage.yml

@@ -46,7 +46,7 @@ service/automation:
   - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_automation_((.|\n)*)###'
 
 service/azure-stack-hci:
-  - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_stack_hci_cluster((.|\n)*)###'
+  - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_stack_hci_((.|\n)*)###'
 
 service/batch:
   - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_batch_((.|\n)*)###'

CHANGELOG.md

@@ -1,16 +1,27 @@
 ## 3.114.0 (Unreleased)
 
+FEATURES:
+
+* **New Resource:** `azurerm_stack_hci_logical_network` [GH-26473]
+
 ENHANCEMENTS:
 
 * dependencies: updating `go-azure-helpers` to `v0.70.1` [GH-26757]
+* `arckubernetes` - updating to use version `2024-01-01` [GH-26761]
 * `data.azurerm_storage_account` - the `enable_https_traffic_only` property has been superseded by `https_traffic_only_enabled` [GH-26740]
 * `azurerm_storage_account` - the `enable_https_traffic_only` property has been superseded by `https_traffic_only_enabled` [GH-26740]
 
 BUG FIXES:
 
 * `azurerm_dns_cname_record` - split create and update function to fix lifecycle - ignore [GH-26610]
 * `azurerm_dns_srv_record` - split create and update function to fix lifecycle - ignore [GH-26627]
-* `azurerm_management_group_policy_remediation` -  fix panic in deprecated schema change for 4.0 [GH-26767]
+* `azurerm_linux_web_app` - correctly set `site_config.always_on` as configured during Update [GH-25753]
+* `azurerm_linux_web_app_slot` - correctly set `site_config.always_on` as configured during Update [GH-25753]
+* `azurerm_management_group_policy_remediation` - fix panic in deprecated schema change for 4.0 [GH-26767]
+
+DEPRECATIONS:
+* `azurerm_redis_cache` - `enable_non_ssl_port` has been superseded by `non_ssl_port_enabled` and `redis_configuration. enable_authentication` has been superseded by `redis_configuration.authentication_enabled` [GH-26608]
+
 
 ## 3.113.0 (July 18, 2024)
 

internal/acceptance/testcase.go

@@ -41,21 +41,14 @@ func (td TestData) DataSourceTestInSequence(t *testing.T, steps []TestStep) {
 	td.runAcceptanceSequentialTest(t, testCase)
 }
 
-var refreshStep = TestStep{
-	RefreshState: true,
-}
-
 func (td TestData) ResourceTest(t *testing.T, testResource types.TestResource, steps []TestStep) {
-	newSteps := make([]TestStep, 0)
-	for _, step := range steps {
-		if !step.ImportState {
-			newSteps = append(newSteps, step)
-		} else {
-			newSteps = append(newSteps, refreshStep)
-			newSteps = append(newSteps, step)
+	// Testing framework as of 1.6.0 no longer auto-refreshes state, so adding it back in here for all steps that update
+	// the config rather than having to modify 1000's of tests individually to add a refresh-only step
+	for index, step := range steps {
+		if !step.ImportState && index != 0 {
+			step.RefreshState = true
 		}
 	}
-	steps = newSteps
 
 	testCase := resource.TestCase{
 		PreCheck: func() { PreCheck(t) },

internal/services/advisor/advisor_recommendations_data_source_test.go

@@ -84,12 +84,12 @@ resource "azurerm_resource_group" "test" {
 }
 
 resource "azurerm_storage_account" "test" {
-  name                      = "accteststr%s"
-  resource_group_name       = azurerm_resource_group.test.name
-  location                  = azurerm_resource_group.test.location
-  enable_https_traffic_only = false
-  account_tier              = "Standard"
-  account_replication_type  = "LRS"
+  name                       = "accteststr%s"
+  resource_group_name        = azurerm_resource_group.test.name
+  location                   = azurerm_resource_group.test.location
+  https_traffic_only_enabled = false
+  account_tier               = "Standard"
+  account_replication_type   = "LRS"
 }
 
 data "azurerm_advisor_recommendations" "test" {

internal/services/apimanagement/api_management_certificate_resource_test.go

@@ -285,10 +285,6 @@ resource "azurerm_key_vault" "test" {
   tenant_id = data.azurerm_client_config.test.tenant_id
 
   sku_name = "standard"
-
-  lifecycle {
-    ignore_changes = [access_policy]
-  }
 }
 
 resource "azurerm_key_vault_access_policy" "sptest" {

internal/services/apimanagement/api_management_named_value_resource_test.go

@@ -241,10 +241,6 @@ resource "azurerm_key_vault" "test" {
   resource_group_name = azurerm_resource_group.test.name
   tenant_id           = data.azurerm_client_config.current.tenant_id
   sku_name            = "standard"
-
-  lifecycle {
-    ignore_changes = [access_policy]
-  }
 }
 
 resource "azurerm_key_vault_access_policy" "test" {
@@ -422,10 +418,6 @@ resource "azurerm_key_vault" "test" {
   resource_group_name = azurerm_resource_group.test.name
   tenant_id           = data.azurerm_client_config.current.tenant_id
   sku_name            = "standard"
-
-  lifecycle {
-    ignore_changes = [access_policy]
-  }
 }
 
 resource "azurerm_key_vault_access_policy" "test" {

internal/services/apimanagement/api_management_resource_test.go

@@ -1029,10 +1029,6 @@ resource "azurerm_virtual_network" "test" {
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
   address_space       = ["192.168.0.0/24"]
-
-  lifecycle {
-    ignore_changes = [subnet]
-  }
 }
 
 resource "azurerm_subnet" "test" {
@@ -1123,10 +1119,6 @@ resource "azurerm_virtual_network" "test2" {
   resource_group_name = azurerm_resource_group.test2.name
   location            = azurerm_resource_group.test2.location
   address_space       = ["192.168.1.0/24"]
-
-  lifecycle {
-    ignore_changes = [subnet]
-  }
 }
 
 resource "azurerm_subnet" "test2" {
@@ -1753,10 +1745,6 @@ resource "azurerm_virtual_network" "test" {
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
   address_space       = ["10.0.0.0/16"]
-
-  lifecycle {
-    ignore_changes = [subnet]
-  }
 }
 
 resource "azurerm_subnet" "test" {
@@ -1871,10 +1859,6 @@ resource "azurerm_virtual_network" "test2" {
   location            = azurerm_resource_group.test2.location
   resource_group_name = azurerm_resource_group.test2.name
   address_space       = ["10.1.0.0/16"]
-
-  lifecycle {
-    ignore_changes = [subnet]
-  }
 }
 
 resource "azurerm_subnet" "test2" {
@@ -2144,10 +2128,6 @@ resource "azurerm_key_vault" "test" {
   resource_group_name = azurerm_resource_group.test.name
   tenant_id           = data.azurerm_client_config.current.tenant_id
   sku_name            = "standard"
-
-  lifecycle {
-    ignore_changes = [access_policy]
-  }
 }
 
 resource "azurerm_key_vault_access_policy" "test" {
@@ -2334,10 +2314,6 @@ resource "azurerm_key_vault" "test" {
   resource_group_name = azurerm_resource_group.test.name
   tenant_id           = data.azurerm_client_config.current.tenant_id
   sku_name            = "standard"
-
-  lifecycle {
-    ignore_changes = [access_policy]
-  }
 }
 
 resource "azurerm_key_vault_access_policy" "test" {

internal/services/appconfiguration/app_configuration_resource_test.go

@@ -630,10 +630,6 @@ resource "azurerm_key_vault" "test" {
   sku_name                   = "standard"
   soft_delete_retention_days = 7
   purge_protection_enabled   = true
-
-  lifecycle {
-    ignore_changes = [access_policy]
-  }
 }
 
 resource "azurerm_key_vault_access_policy" "server" {
@@ -816,10 +812,6 @@ resource "azurerm_key_vault" "test" {
   sku_name                   = "standard"
   soft_delete_retention_days = 7
   purge_protection_enabled   = true
-
-  lifecycle {
-    ignore_changes = [access_policy]
-  }
 }
 
 resource "azurerm_key_vault_access_policy" "server" {
@@ -928,10 +920,6 @@ resource "azurerm_key_vault" "test" {
   sku_name                   = "standard"
   soft_delete_retention_days = 7
   purge_protection_enabled   = true
-
-  lifecycle {
-    ignore_changes = [access_policy]
-  }
 }
 
 resource "azurerm_key_vault_access_policy" "server" {

internal/services/appservice/app_service_environment_v3_data_source_test.go

@@ -24,7 +24,6 @@ func TestAccAppServiceEnvironmentV3DataSource_basic(t *testing.T) {
 				check.That(data.ResourceName).Key("dns_suffix").HasValue(fmt.Sprintf("acctest-ase-%d.appserviceenvironment.net", data.RandomInteger)),
 				check.That(data.ResourceName).Key("ip_ssl_address_count").HasValue("0"),
 				check.That(data.ResourceName).Key("inbound_network_dependencies.#").HasValue("3"),
-				check.That(data.ResourceName).Key("linux_outbound_ip_addresses.#").HasValue("2"),
 				check.That(data.ResourceName).Key("location").HasValue(data.Locations.Primary),
 				check.That(data.ResourceName).Key("windows_outbound_ip_addresses.#").HasValue("2"),
 			),

internal/services/appservice/app_service_environment_v3_resource_test.go

@@ -60,7 +60,6 @@ func TestAccAppServiceEnvironmentV3_complete(t *testing.T) {
 				check.That(data.ResourceName).Key("cluster_setting.#").HasValue("3"),
 				check.That(data.ResourceName).Key("dns_suffix").HasValue(fmt.Sprintf("acctest-ase-%d.appserviceenvironment.net", data.RandomInteger)),
 				check.That(data.ResourceName).Key("inbound_network_dependencies.#").HasValue("3"),
-				check.That(data.ResourceName).Key("linux_outbound_ip_addresses.#").HasValue("2"),
 				check.That(data.ResourceName).Key("location").HasValue(data.Locations.Primary),
 				check.That(data.ResourceName).Key("windows_outbound_ip_addresses.#").HasValue("2"),
 			),
@@ -257,10 +256,6 @@ resource "azurerm_virtual_network" "test2" {
   location            = azurerm_resource_group.test2.location
   resource_group_name = azurerm_resource_group.test2.name
   address_space       = ["20.0.0.0/16"]
-
-  lifecycle {
-    ignore_changes = [subnet]
-  }
 }
 
 resource "azurerm_subnet" "test2" {
@@ -345,10 +340,6 @@ resource "azurerm_virtual_network" "test" {
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
   address_space       = ["10.0.0.0/16"]
-
-  lifecycle {
-    ignore_changes = [subnet]
-  }
 }
 
 resource "azurerm_subnet" "test" {

internal/services/appservice/helpers/linux_web_app_schema.go

@@ -1018,6 +1018,7 @@ func (s *SiteConfigLinux) ExpandForCreate(appSettings map[string]string) (*webap
 func (s *SiteConfigLinux) ExpandForUpdate(metadata sdk.ResourceMetaData, existing *webapps.SiteConfig, appSettings map[string]string) (*webapps.SiteConfig, error) {
 	expanded := *existing
 
+	expanded.AlwaysOn = pointer.To(s.AlwaysOn)
 	expanded.AcrUseManagedIdentityCreds = pointer.To(s.UseManagedIdentityACR)
 	expanded.AutoHealEnabled = pointer.To(s.AutoHeal)
 	expanded.HTTP20Enabled = pointer.To(s.Http2Enabled)

internal/services/appservice/helpers/web_app_slot_schema.go

@@ -707,6 +707,7 @@ func (s *SiteConfigLinuxWebAppSlot) ExpandForCreate(appSettings map[string]strin
 func (s *SiteConfigLinuxWebAppSlot) ExpandForUpdate(metadata sdk.ResourceMetaData, existing *webapps.SiteConfig, appSettings map[string]string) (*webapps.SiteConfig, error) {
 	expanded := *existing
 
+	expanded.AlwaysOn = pointer.To(s.AlwaysOn)
 	expanded.AcrUseManagedIdentityCreds = pointer.To(s.UseManagedIdentityACR)
 	expanded.AutoHealEnabled = pointer.To(s.AutoHeal)
 	expanded.HTTP20Enabled = pointer.To(s.Http2Enabled)
@@ -956,7 +957,7 @@ func (s *SiteConfigLinuxWebAppSlot) DecodeDockerAppStack(input map[string]string
 
 	registryHost := trimURLScheme(applicationStack.DockerRegistryUrl)
 	dockerString := strings.TrimPrefix(s.LinuxFxVersion, "DOCKER|")
-	applicationStack.DockerImageName = strings.TrimPrefix(dockerString, registryHost)
+	applicationStack.DockerImageName = strings.TrimPrefix(dockerString, registryHost+"/")
 
 	s.ApplicationStack = []ApplicationStackLinux{applicationStack}
 }
@@ -1470,7 +1471,7 @@ func (s *SiteConfigWindowsWebAppSlot) DecodeDockerAppStack(input map[string]stri
 
 	registryHost := trimURLScheme(applicationStack.DockerRegistryUrl)
 	dockerString := strings.TrimPrefix(s.WindowsFxVersion, "DOCKER|")
-	applicationStack.DockerImageName = strings.TrimPrefix(dockerString, registryHost)
+	applicationStack.DockerImageName = strings.TrimPrefix(dockerString, registryHost+"/")
 
 	s.ApplicationStack = []ApplicationStackWindows{applicationStack}
 }

internal/services/appservice/helpers/windows_web_app_schema.go

@@ -957,7 +957,7 @@ func (s *SiteConfigWindows) DecodeDockerAppStack(input map[string]string) {
 
 	registryHost := trimURLScheme(applicationStack.DockerRegistryUrl)
 	dockerString := strings.TrimPrefix(s.WindowsFxVersion, "DOCKER|")
-	applicationStack.DockerImageName = strings.TrimPrefix(dockerString, registryHost)
+	applicationStack.DockerImageName = strings.TrimPrefix(dockerString, registryHost+"/")
 
 	s.ApplicationStack = []ApplicationStackWindows{applicationStack}
 }

internal/services/appservice/linux_function_app_resource_authv2_test.go

@@ -976,11 +976,12 @@ resource "azurerm_linux_function_app" "test" {
       }
     }
 
-    use_32_bit_worker  = true
-    websockets_enabled = true
-    ftps_state         = "FtpsOnly"
-    health_check_path  = "/health-check"
-    worker_count       = 3
+    use_32_bit_worker                 = true
+    websockets_enabled                = true
+    ftps_state                        = "FtpsOnly"
+    health_check_path                 = "/health-check"
+    health_check_eviction_time_in_min = 5
+    worker_count                      = 3
 
     minimum_tls_version     = "1.1"
     scm_minimum_tls_version = "1.1"

internal/services/appservice/linux_function_app_resource_test.go

@@ -3082,6 +3082,8 @@ resource "azurerm_linux_function_app" "test" {
     ftps_state         = "FtpsOnly"
     health_check_path  = "/health-check"
 
+    health_check_eviction_time_in_min = 7
+
     application_stack {
       python_version = "3.9"
     }

internal/services/appservice/linux_function_app_slot_resource_test.go

@@ -2482,10 +2482,6 @@ resource "azurerm_virtual_network" "test" {
   address_space       = ["10.0.0.0/16"]
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
-
-  lifecycle {
-    ignore_changes = [subnet]
-  }
 }
 
 resource "azurerm_subnet" "test" {
@@ -3189,10 +3185,6 @@ resource "azurerm_virtual_network" "test" {
   address_space       = ["10.0.0.0/16"]
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
-
-  lifecycle {
-    ignore_changes = [subnet]
-  }
 }
 
 resource "azurerm_subnet" "test1" {
@@ -3252,10 +3244,6 @@ resource "azurerm_virtual_network" "test" {
   address_space       = ["10.0.0.0/16"]
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
-
-  lifecycle {
-    ignore_changes = [subnet]
-  }
 }
 
 resource "azurerm_subnet" "test1" {
@@ -3315,10 +3303,6 @@ resource "azurerm_virtual_network" "test" {
   address_space       = ["10.0.0.0/16"]
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
-
-  lifecycle {
-    ignore_changes = [subnet]
-  }
 }
 
 resource "azurerm_subnet" "test1" {