Merge remote-tracking branch 'upstream/main' into feat/windows-vm-write-only-admin_password

Author: hqhqhqhqhqhqhqhqhqhqhq

.gitattributes

@@ -0,0 +1 @@
+*.go eol=lf

.github/labeler-pull-request-triage-type.yml

@@ -5,4 +5,7 @@ enhancement:
  - '- \[\s?(x|X)\s?\] Enhancement'
 
 breaking-change:
- - '- \[\s?(x|X)\s?\] Breaking Change'
+ - '- \[\s?(x|X)\s?\] Breaking Change'
+
+ai-assisted:
+  - '- \[\s?(x|X)\s?\] AI Assisted.*'

.github/pull_request_template.md

@@ -46,7 +46,7 @@ For state migrations please test the changes locally and provide details here, s
 
 ## Change Log
 
-Below please provide what should go into the changelog (if anything) conforming to the [Changelog Format documented here](../blob/main/contributing/topics/maintainer-changelog.md).
+Below please provide what should go into the changelog (if anything) conforming to the [Changelog Format documented here](../blob/main/contributing/topics/maintainer-merging.md).
 
 <!-- Replace the changelog example below with your entry. One resource per line. -->
 
@@ -63,8 +63,26 @@ This is a (please select all that apply):
 
 
 ## Related Issue(s)
+
 Fixes #0000
 
+
+## AI Assistance Disclosure
+
+<!-- 
+IMPORTANT!
+
+If you are using any kind of AI/LLM assistance to contribute to the AzureRM provider, this must be disclosed in the pull request.
+
+If this is the case, please check the box below, and include the extent to which AI was used. (e.g. documentation only, code generation, etc.)
+
+If responses to this pull request are/will be generated using AI, disclose this as well.
+-->
+
+- [ ] AI Assisted - This contribution was made by, or with the assistance of, AI/LLMs
+
+<!-- extent of AI usage can be described here -->
+
 <!-- heimdall_github_prtemplate:grc-pci_dss-2024-01-05 -->
 
 ## Rollback Plan

.github/workflows/golint.yaml

@@ -24,13 +24,15 @@ jobs:
       - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
           go-version-file: ./.go-version
-      - uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2
+      - uses: golangci/golangci-lint-action@9fae48acfc02a90574d7c304a1758ef9895495fa # v7.0.1
         with:
-          version: 'v1.64.6'
+          version: 'v2.4.0'
           args: -v ./internal/...
   save-artifacts-on-fail:
-    if: ${{ needs.golint.result }} == 'failure'
+    needs: golint
+    if: ${{ failure() }}
     uses: ./.github/workflows/save-artifacts.yaml
   comment-on-fail:
-    if: ${{ needs.depscheck.result }} == 'failure'
+    needs: golint
+    if: ${{ failure() }}
     uses: ./.github/workflows/comment-failure.yaml

.github/workflows/provider-release.yml

@@ -34,7 +34,7 @@ on:
         default: "staging"
 
 env:
-  slack_channel: "C7T8GB62H" # #tech-azure
+  slack_channel: "C09KX8BCGA2" # #tech-azure
   product_name: "terraform-provider-azurerm"
   repo_name: "terraform-provider-azurerm"
   deployment_environment_name: "terraform-azure-repos-oss"

.github/workflows/teamcity-test.yaml

@@ -27,7 +27,7 @@ jobs:
           distribution: zulu
           java-version: 17
           java-package: jdk
-      - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+      - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.golangci.yml

@@ -1,95 +1,85 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
 
+version: "2"
 run:
-  timeout: 60m
-  go: "1.24"
   modules-download-mode: vendor
-
+linters:
+  default: none
+  enable:
+    - asasalint
+    - asciicheck
+    - bidichk
+    - decorder
+    - dupword
+    - durationcheck
+    - errcheck
+    - gocritic
+    - govet
+    - ineffassign
+    - misspell
+    - nilerr
+    - prealloc
+    - predeclared
+    - reassign
+    - staticcheck
+    - tagalign
+    - unconvert
+    - unparam
+    - unused
+    - wastedassign
+    - whitespace
+  settings:
+    errcheck:
+      exclude-functions:
+        - (*github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema.ResourceDiff).ForceNew
+        - (*github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema.ResourceDiff).SetNew
+        - (*github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema.ResourceDiff).SetNewComputed
+        - (*github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema.ResourceData).Set
+        - io.Close
+    misspell:
+      ignore-rules:
+        - hdinsight
+        - exportfs
+    nakedret:
+      max-func-lines: 30
+    predeclared:
+      ignore:
+        - new
+        - min
+        - max
+    tagalign:
+      sort: true
+      order:
+        - json
+        - tfschema
+        - computed
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - internal/services/.*/.*_gen.go$
+      - /sdk/
+      - third_party$
+      - builtin$
+      - examples$
 issues:
   max-issues-per-linter: 0
   max-same-issues: 0
-  exclude-dirs:
-    - /sdk/ # Excluding sdk folders as these are externally generated
-  exclude-files:
-    - "internal/services/.*/.*_gen.go$"
-
-linters:
-  disable-all: true
+formatters:
   enable:
-    - asasalint # check for pass []any as any in variadic func(...any)
-    - asciicheck # ensure code does not contain non-ASCII identifiers
-    - bidichk # checks for dangerous unicode character sequences
-    - decorder # check declaration order and count of types, constants, variables and functions.
-    - durationcheck # check for common mistakes when working with time.Duration
-    - dupword # check for duplicated words in comments
-    - errcheck # checking for unchecked errors
-    - gocritic # linter for Go source code that specializes in simplifying code
-    - gofmt # checks whether code was gofmt-ed
-    - gofumpt # checks whether code was gofumpt-ed, a stricter gofmt
-    - goimports # check import statements are formatted according to the 'goimport' command
-    - gosimple # linter for Go source code that specializes in simplifying code.
-    - govet # reports suspicious constructs. It is roughly the same as 'go vet' (replaced vet and vetshadow)
-    - ineffassign # detects when assignments to existing variables are not used
-    - misspell # finds commonly misspelled English words.
-    - nilerr # Finds code that returns nil after it checks that the error is not nil.
-    - prealloc # finds slice declarations that could potentially be pre-allocated.
-    - predeclared # find code that shadows one of Go's predeclared identifiers.
-    - reassign # checks that package variables are not reassigned.
-    - tenv #detects using os.Setenv instead of t.Setenv since Go1.17.
-    - tagalign #  checks struct tags that do not align with the specified column in struct definitions.
-    - staticcheck # checks rules from staticcheck. It's not the same thing as the staticcheck binary.
-    - unused # checks Go code for unused constants, variables, functions and types.
-    - unconvert # checks for unnecessary type conversions.
-    - unparam # reports unused function parameters.
-    - wastedassign # finds wasted assignment statements
-    - whitespace # checks for unnecessary newlines at the start and end of functions, if, for, etc. (
-
-    ##### need to confirm these are valid and adding t.Parallel() to unit tests would be beneficial / integration tests would not be affected
-    #- paralleltest # detects missing usage of t.Parallel() method in your Go test.
-    #- tparallel # Tparallel detects inappropriate usage of t.Parallel() method in your Go test codes.
-
-    ###### DISABLED because : the number of possible integer overflow conversions from int -> int32. it's not an incorrect callout?
-    # - gosec # Gosec is a security linter for Go source code
-
-    ##### DISABLED as it (correctly) flags fmt.Errorf("constant") to be replaced with errors.New("constant") and there are ~1500 instances of this in the codebase
-    #- perfsprint # Checks that fmt.Sprintf can be replaced with a faster alternative.
-
-    #### DISABLED but valid as relying on output variable names is less than idea, have a lot of these in the codebase to switch over
-    #- nakedret # Checks that functions with naked returns are not longer than a maximum size
-
-    #### bunch of hits, need to confirm if errors or not #####
-    #- copyloopvar #Detects range loop variables that are overwritten in the loop body
-
-    #### DISABLED till %+v -> %w #####
-    #- err113 #Go linter to check the errors handling expressions. - disabled as it suggests (correctly?) to use %w in fmt.Errorf instead of %+v (1000s of usages in the codebase)
-    #- errorlint #### DISABLED till %+v -> %w ##### #Errorlint is a linter for that can be used to find code that will cause problems with the error wrapping scheme used in the github.com/pkg/errors package.
-
-    # disabled as it may be useful but there are a lot of switch statements in the codebase with unhandled inputs
-    #- exhaustive #Check for missing cases in select statements
-
-    ###### DISABLED because golang will put the space back into `//nolint: linter` -> `// nolint: linter` ######
-    #- nolintlint  #Reports ill-formed or insufficient nolint directives.
-
-linters-settings:
-  errcheck:
-    exclude-functions:
-      - (*github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema.ResourceDiff).ForceNew
-      - (*github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema.ResourceDiff).SetNew
-      - (*github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema.ResourceDiff).SetNewComputed
-      - (*github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema.ResourceData).Set
-      - io.Close
-  misspell:
-    ignore-words:
-      - hdinsight
-      - exportfs
-  nakedret:
-    max-func-lines: 30
-  tagalign:
-    sort: true
-    order:
-      - json
-      - tfschema
-      - computed
-  predeclared:
-    ignore: new,min,max # should we use newer, minimum, and maximum instead?
+    - gofmt
+    - gofumpt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - internal/services/.*/.*_gen.go$
+      - /sdk/
+      - third_party$
+      - builtin$
+      - examples$

.release/ci.hcl

@@ -12,13 +12,13 @@ project "terraform-provider-azurerm" {
   team = "_UNUSED_"
 
   slack {
-    notification_channel = "C7T8GB62H" // #tech-azure
+    notification_channel = "C09KX8BCGA2" // #tech-azure
   }
 
   github {
     organization     = "hashicorp"
     repository       = "terraform-provider-azurerm"
-    release_branches = ["main"]
+    release_branches = ["main", "release/**"]
   }
 }
 

.release/provider-schema.json

@@ -90,7 +90,7 @@ var serviceTestConfigurationOverrides = mapOf(
         "datafactory" to testConfiguration(daysOfWeek = "2,4,6", locationOverride = LocationConfiguration("westeurope", "southeastasia", "westus2", false)),
 
         // Dev Center only available in some regions / has a quota of 5
-        "devcenter" to testConfiguration(parallelism = 4, locationOverride = LocationConfiguration("westeurope", "uksouth", "canadacentral", false)),
+        "devcenter" to testConfiguration(parallelism = 2, locationOverride = LocationConfiguration("westeurope", "uksouth", "canadacentral", true)),
 
         // "hdinsight" is super expensive - G class VM's are not available in westus2, quota only available in westeurope currently
         "hdinsight" to testConfiguration(daysOfWeek = "2,4,6", locationOverride = LocationConfiguration("westeurope", "southeastasia", "eastus2", false)),