Merge remote-tracking branch 'refs/remotes/origin/main' into introduc…

…e-adbs-data-resource

.github/workflows/automation-open-pull-request-go-sdk.yaml

@@ -12,7 +12,7 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: "open a pull request"
         id: open-pr

.github/workflows/automation-open-pull-request-pandora.yaml

@@ -13,7 +13,7 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: "open a pull request"
         id: open-pr

.github/workflows/breaking-change-detection.yaml

@@ -22,7 +22,7 @@ jobs:
   detect:
     runs-on: custom-linux-small
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
           go-version-file: ./.go-version

.github/workflows/depscheck.yaml

@@ -16,7 +16,7 @@ jobs:
   depscheck:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
           go-version-file: ./.go-version

.github/workflows/document-lint.yaml

@@ -18,7 +18,7 @@ jobs:
   document-lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
           go-version-file: ./.go-version

.github/workflows/gencheck.yaml

@@ -19,7 +19,7 @@ jobs:
   gencheck:
     runs-on: custom-linux-large
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
           go-version-file: ./.go-version

.github/workflows/golint.yaml

@@ -20,7 +20,7 @@ jobs:
   golint:
     runs-on: custom-linux-large
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
           go-version-file: ./.go-version

.github/workflows/gradually-deprecated.yaml

@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           fetch-depth: 0
       - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2

.github/workflows/increment-milestone.yaml

@@ -14,7 +14,7 @@ jobs:
   increment-milestone:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           fetch-depth: 0
       - name: "Increment Milestone"

.github/workflows/issue-opened.yaml

@@ -12,7 +12,7 @@ jobs:
   issue_triage:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+    - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
     - uses: github/issue-labeler@c1b0f9f52a63158c4adc09425e858e87b32e9685 # v3.4
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/mkdocs.yaml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Publish
         uses: mhausenblas/mkdocs-deploy-gh-pages@d77dd03172e96abbcdb081d8c948224762033653 # 1.26

.github/workflows/provider-test.yaml

@@ -36,7 +36,7 @@ jobs:
     if: needs.secrets-check.outputs.available == 'true'
     steps:
       - name: Checkout
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Install Go
         uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2

.github/workflows/pull-request-reviewed.yaml

@@ -30,7 +30,7 @@ jobs:
           echo ${{ github.repository }} > wr_actions/ghrepo.txt
           echo ${{ github.event.pull_request.number }} > wr_actions/prnumber.txt
           echo "remove-waiting-response" > wr_actions/action.txt                
-      - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+      - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
           name: artifact
           path: wr_actions

.github/workflows/release.yaml

@@ -15,18 +15,18 @@ jobs:
     outputs:
       version: ${{ steps.go-version.outputs.version }}
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - id: go-version
         run: echo "version=$(cat ./.go-version)" >>${GITHUB_OUTPUT}
   release-notes:
     runs-on: custom-linux-xl
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           fetch-depth: 0
       - name: Generate Release Notes
         run: sed -n -e "1{/# /d;}" -e "2{/^$/d;}" -e "/# $(git describe --abbrev=0 --exclude="$(git describe --abbrev=0 --match='v*.*.*' --tags)" --match='v*.*.*' --tags | tr -d v)/q;p" CHANGELOG.md > release-notes.txt
-      - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+      - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
           name: release-notes
           path: release-notes.txt

.github/workflows/save-artifacts.yaml

@@ -14,7 +14,7 @@ jobs:
           echo ${{ github.repository_owner }} > wr_actions/ghowner.txt
           echo ${{ github.event.repository.name }} > wr_actions/ghrepo.txt
           echo ${{ github.event.pull_request.number }} > wr_actions/prnumber.txt
-      - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+      - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
           name: artifact
           path: wr_actions

.github/workflows/static-analysis.yaml

@@ -21,7 +21,7 @@ jobs:
   detect:
     runs-on: custom-linux-small
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
           go-version-file: ./.go-version

.github/workflows/teamcity-test.yaml

@@ -21,13 +21,13 @@ jobs:
   teamcity-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
         with:
           distribution: zulu
           java-version: 17
           java-package: jdk
-      - uses: actions/cache@2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2 # v4.1.0
+      - uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/tflint.yaml

@@ -20,7 +20,7 @@ jobs:
   tflint:
     runs-on: custom-linux-medium
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
           go-version-file: ./.go-version

.github/workflows/thirty-two-bit.yaml

@@ -21,7 +21,7 @@ jobs:
   compatibility-32bit-test:
     runs-on: custom-linux-small
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
           go-version-file: ./.go-version

.github/workflows/unit-test.yaml

@@ -21,7 +21,7 @@ jobs:
   test:
     runs-on: custom-linux-large
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
           go-version-file: ./.go-version

.github/workflows/validate-examples.yaml

@@ -20,7 +20,7 @@ jobs:
   website-lint:
     runs-on: custom-linux-small
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
           go-version-file: ./.go-version

.github/workflows/website-lint.yaml

@@ -16,7 +16,7 @@ jobs:
   website-lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
           go-version-file: ./.go-version

CHANGELOG.md

@@ -1,30 +1,36 @@
-## 4.6.0 (Unrelerased)
+## 4.7.0 (Unreleased)
+
+BUG FIXES:
+
+* `azurerm_mssql_database` - updating short term retention policy now works as expected [GH-27714]
+
+## 4.6.0 (October 18, 2024)
 
 FEATURES:
 
-* **New Resource**: `azurerm_dev_center_attached_network` [GH-27638]
-* **New Resource**: `azurerm_oracle_cloud_vm_cluster` [GH-27678]
-* **New Resource**: `azurerm_oracle_exadata_infrastructure` [GH-27678]
-* **New Data Source**: `azurerm_oracle_cloud_vm_cluster` [GH-27678]
-* **New Data Source**: `azurerm_oracle_db_servers` [GH-27678]
-* **New Data Source**: `azurerm_oracle_exadata_infrastructure` [GH-27678]
+* **New Resource**: `azurerm_dev_center_attached_network` ([#27638](https://github.com/hashicorp/terraform-provider-azurerm/issues/27638))
+* **New Resource**: `azurerm_oracle_cloud_vm_cluster` ([#27678](https://github.com/hashicorp/terraform-provider-azurerm/issues/27678))
+* **New Resource**: `azurerm_oracle_exadata_infrastructure` ([#27678](https://github.com/hashicorp/terraform-provider-azurerm/issues/27678))
+* **New Data Source**: `azurerm_oracle_cloud_vm_cluster` ([#27678](https://github.com/hashicorp/terraform-provider-azurerm/issues/27678))
+* **New Data Source**: `azurerm_oracle_db_servers` ([#27678](https://github.com/hashicorp/terraform-provider-azurerm/issues/27678))
+* **New Data Source**: `azurerm_oracle_exadata_infrastructure` ([#27678](https://github.com/hashicorp/terraform-provider-azurerm/issues/27678))
 
 ENHANCEMENTS:
 
-* `redisenterprise` - upgrade api version to `2024-06-01-preview`  [GH-27597]
-* `azurerm_app_configuration` - support for premium sku [GH-27674]
-* `azurerm_container_app` - support for the `max_inactive_revisions` property [GH-27598]
-* `azurerm_kubernetes_cluster` - remove lock on subnets [GH-27583]
-* `azurerm_nginx_deployment` - allow updates for `sku` [GH-27604]
-* `azurerm_fluid_relay_server` - support for the `customer_managed_key` property [GH-27581]
-* `azurerm_linux_virtual_machine` - support the `UBUNTU_PRO` value for the `license_type` property [GH-27534]
+* `redisenterprise` - upgrade api version to `2024-06-01-preview`  ([#27597](https://github.com/hashicorp/terraform-provider-azurerm/issues/27597))
+* `azurerm_app_configuration` - support for premium sku ([#27674](https://github.com/hashicorp/terraform-provider-azurerm/issues/27674))
+* `azurerm_container_app` - support for the `max_inactive_revisions` property ([#27598](https://github.com/hashicorp/terraform-provider-azurerm/issues/27598))
+* `azurerm_kubernetes_cluster` - remove lock on subnets ([#27583](https://github.com/hashicorp/terraform-provider-azurerm/issues/27583))
+* `azurerm_nginx_deployment` - allow updates for `sku` ([#27604](https://github.com/hashicorp/terraform-provider-azurerm/issues/27604))
+* `azurerm_fluid_relay_server` - support for the `customer_managed_key` property ([#27581](https://github.com/hashicorp/terraform-provider-azurerm/issues/27581))
+* `azurerm_linux_virtual_machine` - support the `UBUNTU_PRO` value for the `license_type` property ([#27534](https://github.com/hashicorp/terraform-provider-azurerm/issues/27534))
 
 
 BUGS:
 
-* `azurerm_api_management_api_diagnostic` - do not set `OperationNameFormat` when the `identifier` property is `azuremonitor` [GH-27456]
-* `azurerm_api_management` - prevent a panic [GH-27649]
-* `azurerm_mssql_database` - make `short_term_retention_policy.backup_interval_in_hours` computed [GH-27656]
+* `azurerm_api_management_api_diagnostic` - do not set `OperationNameFormat` when the `identifier` property is `azuremonitor` ([#27456](https://github.com/hashicorp/terraform-provider-azurerm/issues/27456))
+* `azurerm_api_management` - prevent a panic ([#27649](https://github.com/hashicorp/terraform-provider-azurerm/issues/27649))
+* `azurerm_mssql_database` - make `short_term_retention_policy.backup_interval_in_hours` computed ([#27656](https://github.com/hashicorp/terraform-provider-azurerm/issues/27656))
 
 ## 4.5.0 (October 10, 2024)
 

internal/services/firewall/firewall_policy_resource_test.go

@@ -590,7 +590,7 @@ resource "azurerm_key_vault_certificate" "test" {
 
   depends_on = [azurerm_key_vault_access_policy.test, azurerm_key_vault_access_policy.test2]
 }
-`, data.RandomInteger, "westeurope", data.RandomInteger, data.RandomInteger)
+`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger)
 }
 
 func (FirewallPolicyResource) defaultWorkspaceOnly(data acceptance.TestData) string {

internal/services/firewall/firewall_policy_rule_collection_group_resource_test.go

@@ -748,6 +748,7 @@ resource "azurerm_firewall_policy" "test" {
   name                = "acctest-fwpolicy-RCG-%[1]d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
+  sku                 = "Premium"
   dns {
     proxy_enabled = true
   }

internal/services/firewall/firewall_resource_test.go

@@ -215,26 +215,16 @@ func TestAccFirewall_withTags(t *testing.T) {
 func TestAccFirewall_withZones(t *testing.T) {
 	data := acceptance.BuildTestData(t, "azurerm_firewall", "test")
 	r := FirewallResource{}
-	zones := []string{"1"}
-	zonesUpdate := []string{"1", "2", "3"}
 
 	data.ResourceTest(t, r, []acceptance.TestStep{
 		{
-			Config: r.withZones(data, zones),
+			Config: r.withZones(data, []string{"1"}),
 			Check: acceptance.ComposeTestCheckFunc(
 				check.That(data.ResourceName).ExistsInAzure(r),
 				check.That(data.ResourceName).Key("zones.#").HasValue("1"),
 				check.That(data.ResourceName).Key("zones.0").HasValue("1"),
 			),
 		},
-		{
-			Config: r.withZones(data, zonesUpdate),
-			Check: acceptance.ComposeTestCheckFunc(
-
-				check.That(data.ResourceName).ExistsInAzure(r),
-				check.That(data.ResourceName).Key("zones.#").HasValue("3"),
-			),
-		},
 	})
 }
 
@@ -531,7 +521,7 @@ provider "azurerm" {
 }
 
 resource "azurerm_resource_group" "test" {
-  name     = "acctestRG-%d"
+  name     = "acctestRG-fw-%d"
   location = "%s"
 }
 

internal/services/graphservices/graph_services_account_resource.go

@@ -20,61 +20,12 @@ import (
 )
 
 var (
-	_ sdk.Resource           = ServicesAccountResource{}
-	_ sdk.ResourceWithUpdate = ServicesAccountResource{}
+	_ sdk.Resource           = AccountResource{}
+	_ sdk.ResourceWithUpdate = AccountResource{}
 )
 
-type ServicesAccountResource struct{}
-
-func (r ServicesAccountResource) ModelObject() interface{} {
-	return &AccountResourceSchema{}
-}
-
-func (r ServicesAccountResource) IDValidationFunc() pluginsdk.SchemaValidateFunc {
-	return graphservicesprods.ValidateAccountID
-}
-
-func (r ServicesAccountResource) ResourceType() string {
-	return "azurerm_graph_services_account"
-}
-
-func (r ServicesAccountResource) Arguments() map[string]*pluginsdk.Schema {
-	return AccountResource{}.Arguments()
-}
-
-func (r ServicesAccountResource) Attributes() map[string]*pluginsdk.Schema {
-	return AccountResource{}.Attributes()
-}
-
-func (r ServicesAccountResource) Create() sdk.ResourceFunc {
-	return AccountResource{}.Create()
-}
-
-func (r ServicesAccountResource) Read() sdk.ResourceFunc {
-	return AccountResource{}.Read()
-}
-
-func (r ServicesAccountResource) Delete() sdk.ResourceFunc {
-	return AccountResource{}.Delete()
-}
-
-func (r ServicesAccountResource) Update() sdk.ResourceFunc {
-	return AccountResource{}.Update()
-}
-
-var (
-	_ sdk.Resource                          = AccountResource{}
-	_ sdk.ResourceWithUpdate                = AccountResource{}
-	_ sdk.ResourceWithDeprecationReplacedBy = AccountResource{}
-)
-
-// AccountResource remove this in 4.0, the resource is renamed
 type AccountResource struct{}
 
-func (r AccountResource) DeprecatedInFavourOfResource() string {
-	return "azurerm_graph_services_account"
-}
-
 func (r AccountResource) ModelObject() interface{} {
 	return &AccountResourceSchema{}
 }
@@ -92,7 +43,7 @@ func (r AccountResource) IDValidationFunc() pluginsdk.SchemaValidateFunc {
 }
 
 func (r AccountResource) ResourceType() string {
-	return "azurerm_graph_account"
+	return "azurerm_graph_services_account"
 }
 
 func (r AccountResource) Arguments() map[string]*pluginsdk.Schema {