Merge branch 'main' into ami-test-proxy

common/smoke-tests/pom.xml

@@ -130,7 +130,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-security-keyvault-secrets</artifactId>
-      <version>4.6.0</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;dependency} -->
+      <version>4.6.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;dependency} -->
     </dependency>
 
     <dependency>

eng/code-quality-reports/src/main/resources/revapi/revapi.json

@@ -191,10 +191,26 @@
           "justification": "support configuration of Service Bus domain name."
         },
         {
-          "code": "java.class.nowFinal",
-          "old:": "class com.azure.resourcemanager.resources.models.Identity",
-          "new": "class com.azure.resourcemanager.resources.models.Identity",
-          "justification": "Make the class final. User is unlikely to inherit from this class."
+          "code": "java.method.removed",
+          "old": "method com.azure.resourcemanager.compute.models.VirtualMachineScaleSetIpConfiguration com.azure.resourcemanager.compute.models.VirtualMachineScaleSetIpConfiguration::withId(java.lang.String)",
+          "justification": "Break by service. 'id' is previously not used in runtime."
+        },
+        {
+          "code": "java.class.noLongerInheritsFromClass",
+          "old": "class com.azure.resourcemanager.compute.models.VirtualMachineScaleSetIpConfiguration",
+          "new": "class com.azure.resourcemanager.compute.models.VirtualMachineScaleSetIpConfiguration",
+          "justification": "Break by service. 'id' is previously not used in runtime. And customer unlikely to use this class as subclass of 'SubResource'."
+        },
+        {
+          "code": "java.method.removed",
+          "old": "method com.azure.resourcemanager.compute.models.VirtualMachineScaleSetNetworkConfiguration com.azure.resourcemanager.compute.models.VirtualMachineScaleSetNetworkConfiguration::withId(java.lang.String)",
+          "justification": "Break by service. 'id' is previously not used in runtime."
+        },
+        {
+          "code": "java.class.noLongerInheritsFromClass",
+          "old": "class com.azure.resourcemanager.compute.models.VirtualMachineScaleSetNetworkConfiguration",
+          "new": "class com.azure.resourcemanager.compute.models.VirtualMachineScaleSetNetworkConfiguration",
+          "justification": "Break by service. 'id' is previously not used in runtime. And customer unlikely to use this class as subclass of 'SubResource'."
         },
         {
           "ignore": true,

eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml

@@ -2593,8 +2593,15 @@
   <!-- Exception is ignored in a loop waiting for an http endpoint -->
   <Match>
     <Class name="com.azure.core.test.utils.TestProxyManager"/>
-    <Method name="startProxy"/>
+    <Method name="checkAlive"/>
     <Bug pattern="DE_MIGHT_IGNORE"/>
   </Match>
 
+  <!-- Suppress URF_UNREAD_FIELD, the fields are read but during serialization -->
+  <Match>
+    <Class name="com.azure.core.test.models.RecordFilePayload"/>
+    <Field name="recordingFile"/>
+    <Bug pattern="URF_UNREAD_FIELD"/>
+  </Match>
+
 </FindBugsFilter>

eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml

@@ -30,7 +30,7 @@ parameters:
   default: azsdk-pool-mms-ubuntu-2204-general
 - name: OsVmImage
   type: string
-  default: MMSUbuntu22.04
+  default: ubuntu-22.04
 # This parameter is only necessary if there are multiple invocations of this template within the SAME STAGE.
 # When that occurs, provide a name other than the default value.
 - name: GenerateJobName

eng/common/pipelines/templates/jobs/prepare-pipelines.yml

@@ -21,7 +21,7 @@ jobs:
 - job: PreparePipelines
   pool:
     name: azsdk-pool-mms-ubuntu-2204-general
-    vmImage: MMSUbuntu22.04
+    vmImage: ubuntu-22.04
   steps:
     - template: /eng/common/pipelines/templates/steps/install-pipeline-generation.yml
     - template: /eng/common/pipelines/templates/steps/set-default-branch.yml

eng/common/pipelines/templates/stages/archetype-sdk-tool-pwsh.yml

@@ -26,7 +26,7 @@ stages:
               Image: windows-2022
             Linux:
               Pool: azsdk-pool-mms-ubuntu-2204-general
-              Image: MMSUbuntu22.04
+              Image: ubuntu-22.04
             Mac:
               Pool: Azure Pipelines
               Image: macos-11

eng/common/scripts/TypeSpec-Project-Sync.ps1

@@ -105,8 +105,8 @@ if ( $configuration["repo"] -and $configuration["commit"]) {
     try {
         if (!(Test-Path ".git")) {
             InitializeSparseGitClone $gitRemoteValue
-            UpdateSparseCheckoutFile $specSubDirectory $configuration["additionalDirectories"]
         }
+        UpdateSparseCheckoutFile $specSubDirectory $configuration["additionalDirectories"]
         git checkout $configuration["commit"]
         if ($LASTEXITCODE) { exit $LASTEXITCODE }
     }

eng/common/scripts/stress-testing/stress-test-deployment-lib.ps1

@@ -4,6 +4,7 @@ $ErrorActionPreference = 'Stop'
 $FailedCommands = New-Object Collections.Generic.List[hashtable]
 
 . (Join-Path $PSScriptRoot "../Helpers" PSModule-Helpers.ps1)
+. (Join-Path $PSScriptRoot "../SemVer.ps1")
 
 $limitRangeSpec = @"
 apiVersion: v1
@@ -18,6 +19,8 @@ spec:
     type: Container
 "@
 
+$MIN_HELM_VERSION = "3.11.0"
+
 # Powershell does not (at time of writing) treat exit codes from external binaries
 # as cause for stopping execution, so do this via a wrapper function.
 # See https://github.com/PowerShell/PowerShell-RFC/pull/277
@@ -376,18 +379,26 @@ function CheckDependencies()
         }
     }
 
+    # helm version example: v3.11.2+g912ebc1
+    $helmVersionString = (helm version --short).substring(1) -replace '\+.*',''
+    $helmVersion = [AzureEngSemanticVersion]::new($helmVersionString)
+    $minHelmVersion = [AzureEngSemanticVersion]::new($MIN_HELM_VERSION)
+    if ($helmVersion.CompareTo($minHelmVersion) -lt 0) {
+        throw "Please update helm to version >= $MIN_HELM_VERSION (current version: $helmVersionString)`nAdditional information for updating helm version can be found here: https://helm.sh/docs/intro/install/"
+    }
+
     if ($shouldError) {
         exit 1
     }
 
 }
 
 function generateRetryTestsHelmValues ($pkg, $releaseName, $generatedHelmValues) {
+
     $podOutput = RunOrExitOnFailure kubectl get pods -n $pkg.namespace -o json
     $pods = $podOutput | ConvertFrom-Json
 
     # Get all jobs within this helm release
-
     $helmStatusOutput = RunOrExitOnFailure helm status -n $pkg.Namespace $pkg.ReleaseName --show-resources
     # -----Example output-----
     # NAME: <Release Name>

eng/common/testproxy/target_version.txt

@@ -1 +1 @@
-1.0.0-dev.20230322.1
+1.0.0-dev.20230417.1

eng/jacoco-test-coverage/pom.xml

@@ -263,7 +263,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-messaging-servicebus</artifactId>
-      <version>7.13.4</version> <!-- {x-version-update;com.azure:azure-messaging-servicebus;current} -->
+      <version>7.14.0-beta.1</version> <!-- {x-version-update;com.azure:azure-messaging-servicebus;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
@@ -389,87 +389,87 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager</artifactId>
-      <version>2.26.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager;current} -->
+      <version>2.27.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-appplatform</artifactId>
-      <version>2.26.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-appplatform;current} -->
+      <version>2.27.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-appplatform;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-appservice</artifactId>
-      <version>2.26.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-appservice;current} -->
+      <version>2.27.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-appservice;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-authorization</artifactId>
-      <version>2.26.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-authorization;current} -->
+      <version>2.27.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-authorization;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-compute</artifactId>
-      <version>2.26.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-compute;current} -->
+      <version>2.27.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-compute;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-containerinstance</artifactId>
-      <version>2.26.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerinstance;current} -->
+      <version>2.27.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerinstance;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-containerregistry</artifactId>
-      <version>2.26.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerregistry;current} -->
+      <version>2.27.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerregistry;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-containerservice</artifactId>
-      <version>2.26.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerservice;current} -->
+      <version>2.27.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerservice;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-cosmos</artifactId>
-      <version>2.26.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-cosmos;current} -->
+      <version>2.27.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-cosmos;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-dns</artifactId>
-      <version>2.26.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-dns;current} -->
+      <version>2.27.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-dns;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-keyvault</artifactId>
-      <version>2.26.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-keyvault;current} -->
+      <version>2.27.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-keyvault;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-monitor</artifactId>
-      <version>2.26.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-monitor;current} -->
+      <version>2.27.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-monitor;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-msi</artifactId>
-      <version>2.26.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-msi;current} -->
+      <version>2.27.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-msi;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-network</artifactId>
-      <version>2.26.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-network;current} -->
+      <version>2.27.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-network;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-resources</artifactId>
-      <version>2.26.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;current} -->
+      <version>2.27.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-sql</artifactId>
-      <version>2.26.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-sql;current} -->
+      <version>2.27.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-sql;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-storage</artifactId>
-      <version>2.26.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-storage;current} -->
+      <version>2.27.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-storage;current} -->
     </dependency>
 
     <dependency>
@@ -595,7 +595,7 @@
 	  <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-digitaltwins-core</artifactId>
-      <version>1.4.0-beta.1</version> <!-- {x-version-update;com.azure:azure-digitaltwins-core;current} -->
+      <version>1.3.8</version> <!-- {x-version-update;com.azure:azure-digitaltwins-core;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>

eng/mgmt/automation/api-specs.yaml

@@ -71,6 +71,8 @@ newrelic:
   service: newrelicobservability
 operationalinsights:
   service: loganalytics
+paloaltonetworks:
+  suffix: ngfw
 postgresql:
   service: postgresqlflexibleserver
 privatedns:

eng/mgmt/automation/generate_utils.py

@@ -141,7 +141,7 @@ def update_changelog(changelog_file, changelog):
     first_version_part = old_changelog[:first_version.end() +
                                        second_version.start()]
     # remove text starting from the first '###' (usually the block '### Features Added')
-    first_version_part = re.sub('\n###.*', '\n', first_version_part, re.S)
+    first_version_part = re.sub('\n###.*', '\n', first_version_part, flags=re.S)
     first_version_part = re.sub('\s+$', '', first_version_part)
 
     first_version_part += '\n\n'

eng/pipelines/partner-release.yml

@@ -16,7 +16,7 @@ resources:
     - repository: azure-sdk-build-tools
       type: git
       name: internal/azure-sdk-build-tools
-      ref: refs/tags/azure-sdk-build-tools_20230406.1
+      ref: refs/tags/azure-sdk-build-tools_20230421.1
 
 variables:
   BuildToolScripts: $(Pipeline.Workspace)/azure-sdk-build-tools/scripts

eng/pipelines/templates/jobs/ci.tests.yml

@@ -74,7 +74,7 @@ jobs:
 
       - template: /eng/common/testproxy/test-proxy-tool.yml
         parameters:
-          runProxy: false
+          runProxy: true
 
       - template: ../steps/install-reporting-tools.yml
         parameters:

eng/pipelines/templates/stages/archetype-sdk-client-patch.yml

@@ -3,7 +3,7 @@ resources:
     - repository: azure-sdk-build-tools
       type: git
       name: internal/azure-sdk-build-tools
-      ref: refs/tags/azure-sdk-build-tools_20230406.1
+      ref: refs/tags/azure-sdk-build-tools_20230421.1
 
 parameters:
 - name: Artifacts

eng/pipelines/templates/stages/archetype-sdk-client.yml

@@ -3,7 +3,7 @@ resources:
     - repository: azure-sdk-build-tools
       type: git
       name: internal/azure-sdk-build-tools
-      ref: refs/tags/azure-sdk-build-tools_20230406.1
+      ref: refs/tags/azure-sdk-build-tools_20230421.1
 
 parameters:
 - name: Artifacts

eng/pipelines/templates/stages/archetype-sdk-pom-only.yml

@@ -3,7 +3,7 @@ resources:
     - repository: azure-sdk-build-tools
       type: git
       name: internal/azure-sdk-build-tools
-      ref: refs/tags/azure-sdk-build-tools_20230406.1
+      ref: refs/tags/azure-sdk-build-tools_20230421.1
 
 parameters:
 - name: Artifacts

eng/pipelines/templates/stages/cosmos-sdk-client.yml

@@ -3,7 +3,7 @@ resources:
     - repository: azure-sdk-build-tools
       type: git
       name: internal/azure-sdk-build-tools
-      ref: refs/tags/azure-sdk-build-tools_20230406.1
+      ref: refs/tags/azure-sdk-build-tools_20230421.1
 
 parameters:
 - name: Artifacts

eng/pipelines/templates/steps/build-and-test.yml

@@ -52,6 +52,28 @@ steps:
       AZURE_VERSION_OVERRIDE_TESTS: ${{ parameters.TestVersionSupport }}
     condition: and(succeeded(), ne(variables['TestFromSource'], 'true'))
 
+  - task: PythonScript@0
+    displayName: 'Update external dependency versions'
+    inputs:
+      scriptPath: 'eng/versioning/update_versions.py'
+      arguments: '--update-type external_dependency --build-type client --sr --vo $(VersionOverrides)'
+    condition: and(succeeded(), eq(variables['TestVersionSupport'], 'true'))
+
+  - task: Maven@3
+    displayName: 'Re-build for version override run'
+    inputs:
+      mavenPomFile: pom.xml
+      options: $(DefaultOptions) -DskipTests $(DefaultSkipOptions) -Djacoco.skip=true -T ${{ parameters.BuildParallelization }} -pl $(ProjectList)
+      mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
+      javaHomeOption: 'JDKVersion'
+      jdkVersionOption: $(JavaTestVersion)
+      jdkArchitectureOption: 'x64'
+      publishJUnitResults: false
+      goals: 'install'
+    env:
+      AZURE_VERSION_OVERRIDE_TESTS: ${{ parameters.TestVersionSupport }}
+    condition: and(succeeded(), eq(variables['TestVersionSupport'], 'true'))
+
   - task: Maven@3
     displayName: 'Run tests'
     inputs:

eng/pipelines/templates/steps/initialize-test-environment.yml

@@ -49,13 +49,6 @@ steps:
       arguments: '--update-type library --build-type client --sr'
     condition: and(succeeded(), eq(variables['TestFromSource'], 'true'))
 
-  - task: PythonScript@0
-    displayName: 'Update external dependency versions'
-    inputs:
-      scriptPath: 'eng/versioning/update_versions.py'
-      arguments: '--update-type external_dependency --build-type client --sr --vo $(VersionOverrides)'
-    condition: and(succeeded(), eq(variables['TestVersionSupport'], 'true'))
-
   - template: /eng/pipelines/templates/steps/generate-project-list-and-cache-maven-repository.yml
     parameters:
       Artifacts: ${{ parameters.Artifacts }}

eng/versioning/external_dependencies.txt

@@ -193,7 +193,7 @@ com.microsoft.azure:azure-mgmt-resources;1.3.0
 com.microsoft.azure:azure-mgmt-search;1.24.1
 com.microsoft.azure:azure-mgmt-storage;1.3.0
 com.microsoft.azure:azure-storage;8.0.0
-com.microsoft.azure:msal4j;1.13.7
+com.microsoft.azure:msal4j;1.13.8
 com.microsoft.azure:msal4j-persistence-extension;1.1.0
 com.sun.activation:jakarta.activation;1.2.2
 io.opentelemetry:opentelemetry-api;1.23.0