Merge branch 'main' of https://github.com/Azure/azure-sdk-for-java in…

…to update-identity-live-tests

.vscode/cspell.json

@@ -61,7 +61,6 @@
     "**/resourcemanager/**",
     "**/azure-resourcemanager*/**",
     "**/microsoft-azure-*/**",
-    "**/azure-core-jackson-tests/**",
     "**/src/test/**",
     "**src/**/samples/**/*.json",
     "**/src/**/samples/**/*.ipynb",
@@ -116,28 +115,14 @@
     "sdk/confidentialledger/azure-security-confidentialledger/**",
     "sdk/core/.idea/**",
     "sdk/containerregistry/azure-containers-containerregistry/**",
-    "sdk/core/azure-core-experimental/**",
-    "sdk/core/azure-core-http-jdk-httpclient/**",
-    "sdk/core/azure-core-http-netty/**",
-    "sdk/core/azure-core-http-okhttp/**",
-    "sdk/core/azure-core-serializer-avro-jackson/**",
-    "sdk/core/azure-core-metrics-opentelemetry/**",
-    "sdk/core/azure-core-serializer-avro-apache/**",
-    "sdk/core/azure-core-http-vertx/**",
-    "sdk/core/azure-core-serializer-json-gson/**",
-    "sdk/core/azure-core-serializer-json-jackson/**",
-    "sdk/core/azure-core-management/**",
     "sdk/cosmos/azure-cosmos-dotnet-benchmark/**",
-    "sdk/core/azure-core-tracing-opentelemetry/**",
-    "sdk/core/azure-core-tracing-opentelemetry-samples/**",
     "sdk/cosmos/azure-cosmos-benchmark/**",
     "sdk/cosmos/azure-cosmos-spark_3-1_2-12/**",
     "sdk/cosmos/azure-cosmos-spark_3-2_2-12/**",
     "sdk/cosmos/azure-cosmos-spark_3-3_2-12/**",
     "sdk/cosmos/azure-cosmos-spark_3-4_2-12/**",
     "sdk/cosmos/azure-cosmos-spark_3-5_2-12/**",
     "sdk/cosmos/azure-cosmos-spark-account-data-resolver-sample/**",
-    "sdk/core/azure-core-test/**",
     "sdk/cosmos/azure-cosmos-encryption/**",
     "sdk/cosmos/azure-cosmos-spark_3_2-12/**",
     "sdk/spring/azure-spring-data-cosmos/**",
@@ -163,7 +148,6 @@
     "sdk/keyvault/test-resources/test-resources.json",
     "sdk/keyvault/test-resources-jca/test-resources.json",
     "sdk/formrecognizer/azure-ai-formrecognizer/**",
-    "sdk/core/azure-core/**",
     "sdk/documentintelligence/azure-ai-documentintelligence/**",
     "sdk/maps/azure-maps-render/**",
     "sdk/maps/azure-maps-route/**",
@@ -423,6 +407,7 @@
     "ssis",
     "substringof",
     "Sybase",
+    "tcnative",
     "testdb",
     "TFVC",
     "timeframe",
@@ -1152,7 +1137,6 @@
         "staxex",
         "stree",
         "sybasease",
-        "tcnative",
         "tekton",
         "testng",
         "tidb",
@@ -1301,6 +1285,61 @@
         "upserted",
         "raud"
       ]
+    },
+    {
+      "filename": "sdk/core/**",
+      "words": [
+        "reta",
+        "tozsvath",
+        "ueisele",
+        "Thowable",
+        "Dtest",
+        "azyncoperation",
+        "Referer",
+        "limolkova",
+        "sess",
+        "cnonce",
+        "mvnrepository",
+        "IMDS",
+        "Doesnt",
+        "xffffffffffff",
+        "imgur",
+        "Bufs",
+        "Unpooled",
+        "okio",
+        "usgovcloudapi",
+        "southcentralus",
+        "centralus",
+        "northcentralus",
+        "uksouth",
+        "ukwest",
+        "usgovvirginia",
+        "usgoviowa",
+        "usgovarizona",
+        "usgovtexas",
+        "usdodeast",
+        "usdodcentral",
+        "junitextensions",
+        "urllistofbytes",
+        "urllistoflistofbytes",
+        "urlmapofbytes",
+        "inproc",
+        "otel",
+        "tmpdir",
+        "aarch",
+        "CNCF"
+        ]
+    },
+    {
+      "filename": "sdk/translation/azure-ai-translation-document/**",
+      "words": [
+        "cancelacurrentlyprocessingorqueuedtranslation",
+        "returnsalistofbatchrequestssubmittedandthestatusforeachrequest",
+        "returnsalistofsupporteddocumentformats",
+        "returnsthestatusofasingledocumentinabatchtranslationrequest",
+        "submitadocumenttranslationrequesttothedocumenttranslationservice",
+        "translateasingledocument"
+      ]
     }
   ],
   "allowCompoundWords": true

common/perf-test-core/pom.xml

@@ -53,8 +53,6 @@
           <rules>
             <bannedDependencies>
               <includes combine.children="append">
-                <include>com.fasterxml.jackson.core:jackson-databind:[2.17.2]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
-
                 <!-- Special allowance for performance libraries as they aren't shipped. -->
                 <include>com.beust:jcommander:[1.82]</include> <!-- {x-include-update;com.beust:jcommander;external_dependency} -->
 

common/smoke-tests/smoke-test-dependencies.yml

@@ -2,98 +2,52 @@ jobs:
   - template: ./smoke-test-job.yml
     parameters:
       TestTask:
-        task: Maven@4
-        displayName: 'Run Smoke Tests'
+        task: AzurePowerShell@5
+        displayName: 'Run Smoke Test Samples'
         inputs:
-          mavenPomFile: $(PomFile)
-          goals: 'exec:java'
-          options: '$(DefaultOptions) -Dexec.mainClass="com.azure.smoketest.App"'
-          javaHomeOption: 'JDKVersion'
-          jdkVersionOption: $(JavaTestVersion)
-          jdkArchitectureOption: 'x64'
-          publishJUnitResults: false
+          azureSubscription: azure-sdk-tests-public
+          azurePowerShellVersion: LatestVersion
+          pwsh: true
+          ScriptType: InlineScript
+          Inline: |
+            mvn --% -f $(PomFile) $(DefaultOptions) -Dexec.mainClass=com.azure.smoketest.App exec:java
+            exit $LASTEXITCODE
         env:
+          # Enable samples tests that use DefaultAzureCredential to load the federated pipeline credential
+          AZURE_POD_IDENTITY_AUTHORITY_HOST: 'https://FakeAuthorityHost'
           AZURE_LOG_LEVEL: 2
 
       Matrix:
         Java 8 Windows (AzureCloud):
           JavaTestVersion: '1.8'
           Pool: "azsdk-pool-mms-win-2022-general"
           OSVmImage: "windows-2022"
-          SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
-          ArmTemplateParameters: $(azureCloudArmParameters)
           PomFile: common/smoke-tests/pom.xml
           ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
         Java LTS Windows (AzureCloud):
           Pool: "azsdk-pool-mms-win-2022-general"
           OSVmImage: "windows-2022"
-          SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
-          ArmTemplateParameters: $(azureCloudArmParameters)
           PomFile: common/smoke-tests/pom.xml
           ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
         Java 8 Linux (AzureCloud):
           Pool: "azsdk-pool-mms-ubuntu-2004-general"
           OSVmImage: "MMSUbuntu20.04"
-          SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
-          ArmTemplateParameters: $(azureCloudArmParameters)
           PomFile: common/smoke-tests/pom.xml
           ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
         Java LTS Linux (AzureCloud):
           Pool: "azsdk-pool-mms-ubuntu-2004-general"
           OSVmImage: "MMSUbuntu20.04"
-          SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
-          ArmTemplateParameters: $(azureCloudArmParameters)
-          PomFile: common/smoke-tests/pom.xml
-          ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
-        Java LTS Linux (AzureCloud Canary):
-          Pool: "azsdk-pool-mms-ubuntu-2004-general"
-          OSVmImage: "MMSUbuntu20.04"
-          SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
-          ArmTemplateParameters: $(azureCloudArmParameters)
-          Location: 'eastus2euap'
           PomFile: common/smoke-tests/pom.xml
           ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
         Java 8 MacOS (AzureCloud):
           JavaTestVersion: '1.8'
           Pool: Azure Pipelines
           OSVmImage: macos-latest
-          SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
-          ArmTemplateParameters: $(azureCloudArmParameters)
           PomFile: common/smoke-tests/pom.xml
           ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
         Java LTS MacOS (AzureCloud):
           JavaTestVersion: '1.11'
           Pool: Azure Pipelines
           OSVmImage: macos-latest
-          SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
-          ArmTemplateParameters: $(azureCloudArmParameters)
-          PomFile: common/smoke-tests/pom.xml
-          ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
-        Java 8 Windows (AzureUSGovernment):
-          Pool: "azsdk-pool-mms-win-2022-general"
-          OSVmImage: "windows-2022"
-          SubscriptionConfiguration: $(sub-config-gov-test-resources)
-          ArmTemplateParameters: $(azureUSGovernmentArmParameters)
-          PomFile: common/smoke-tests/pom.xml
-          ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
-        Java LTS Windows (AzureUSGovernment):
-          Pool: "azsdk-pool-mms-win-2022-general"
-          OSVmImage: "windows-2022"
-          SubscriptionConfiguration: $(sub-config-gov-test-resources)
-          ArmTemplateParameters: $(azureUSGovernmentArmParameters)
-          PomFile: common/smoke-tests/pom.xml
-          ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
-        Java 8 Windows (AzureChinaCloud):
-          Pool: "azsdk-pool-mms-win-2022-general"
-          OSVmImage: "windows-2022"
-          SubscriptionConfiguration: $(sub-config-cn-test-resources)
-          ArmTemplateParameters: $(azureChinaCloudArmParameters)
-          PomFile: common/smoke-tests/pom.xml
-          ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
-        Java LTS Windows (AzureChinaCloud):
-          Pool: "azsdk-pool-mms-win-2022-general"
-          OSVmImage: "windows-2022"
-          SubscriptionConfiguration: $(sub-config-cn-test-resources)
-          ArmTemplateParameters: $(azureChinaCloudArmParameters)
           PomFile: common/smoke-tests/pom.xml
           ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'

common/smoke-tests/smoke-test-job.yml

@@ -10,7 +10,6 @@ parameters:
     type: number
     default: 90
 
-
 jobs:
   - job: SmokeTest
     timeoutInMinutes: ${{ parameters.Timeout }}
@@ -23,12 +22,6 @@ jobs:
       name: $(Pool)
       vmImage: $(OSVmImage)
 
-    variables:
-      azureCloudArmParameters: "@{ storageEndpointSuffix = 'core.windows.net'; azureCloud = 'AzureCloud'; }"
-      azureUSGovernmentArmParameters: "@{ storageEndpointSuffix = 'core.usgovcloudapi.net'; azureCloud = 'AzureUSGovernment'; }"
-      azureChinaCloudArmParameters: "@{ storageEndpointSuffix = 'core.chinacloudapi.cn'; azureCloud = 'AzureChinaCloud'; }"
-
-
     steps:
       - template: /eng/common/pipelines/templates/steps/verify-agent-os.yml
         parameters:
@@ -85,12 +78,11 @@ jobs:
       - template: /eng/common/TestResources/deploy-test-resources.yml
         parameters:
           ServiceDirectory: $(ServiceDirectory)
-          ArmTemplateParameters: $(ArmTemplateParameters)
-          SubscriptionConfiguration: $(SubscriptionConfiguration)
+          ServiceConnection: azure-sdk-tests-public
 
       - ${{ parameters.TestTask }}
 
       - template: /eng/common/TestResources/remove-test-resources.yml
         parameters:
           ServiceDirectory: '$(Build.SourcesDirectory)/common/smoke-tests/'
-          SubscriptionConfiguration: $(SubscriptionConfiguration)
+          ServiceConnection: azure-sdk-tests-public

common/smoke-tests/smoke-test-samples.yml

@@ -5,25 +5,25 @@ jobs:
       MaxParallel: 2
 
       TestTask:
-        task: Maven@4
+        task: AzurePowerShell@5
         displayName: 'Run Smoke Test Samples'
         inputs:
-          mavenPomFile: $(PomFile)
-          goals: 'test'
-          options: '$(DefaultOptions) -Dtest=**/*Example.java,**/*Sample.java'
-          javaHomeOption: 'JDKVersion'
-          jdkVersionOption: $(JavaTestVersion)
-          jdkArchitectureOption: 'x64'
-          publishJUnitResults: false
+          azureSubscription: azure-sdk-tests-public
+          azurePowerShellVersion: LatestVersion
+          pwsh: true
+          ScriptType: InlineScript
+          Inline: |
+            mvn --% -f $(PomFile) $(DefaultOptions) -Dtest=**/*Example.java,**/*Sample.java' test
+            exit $LASTEXITCODE
         env:
+          # Enable samples tests that use DefaultAzureCredential to load the federated pipeline credential
+          AZURE_POD_IDENTITY_AUTHORITY_HOST: 'FakeAuthorityHost'
           AZURE_LOG_LEVEL: 2
 
       Matrix:
         Service Bus:
           JavaTestVersion: '1.8'
           Pool: "azsdk-pool-mms-win-2022-general"
           OSVmImage: "windows-2022"
-          SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
-          ArmTemplateParameters: $(azureCloudArmParameters)
           PomFile: sdk/servicebus/azure-messaging-servicebus/pom.xml
           ServiceDirectory: '$(Build.SourcesDirectory)/sdk/servicebus/'

common/smoke-tests/test-resources.json

@@ -12,20 +12,19 @@
         "testApplicationId": {
             "type": "string"
         },
-        "testApplicationSecret": {
-            "type": "string"
-        },
         "testApplicationOid": {
             "type": "string"
         },
         "tenantId": {
             "type": "string"
         },
         "storageEndpointSuffix": {
-            "type": "string"
+            "type": "string",
+            "defaultValue": "core.windows.net"
         },
         "azureCloud": {
-            "type": "string"
+            "type": "string",
+            "defaultValue": "AzureCloud"
         }
     },
     "variables": {
@@ -245,10 +244,6 @@
             "type": "string",
             "value": "[parameters('testApplicationId')]"
         },
-        "AZURE_CLIENT_SECRET": {
-            "type": "string",
-            "value": "[parameters('testApplicationSecret')]"
-        },
         "AZURE_CLOUD": {
             "type": "string",
             "value": "[parameters('azureCloud')]"
@@ -266,4 +261,4 @@
             "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('storageAccountName'), ';AccountKey=', listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName')), '2019-06-01').keys[0].value, ';EndpointSuffix=', parameters('storageEndpointSuffix'))]"
         }
     }
-}
+}

eng/common/pipelines/templates/archetype-typespec-emitter.yml

@@ -43,7 +43,7 @@ parameters:
   default: false
 
 # Whether to regenerate sdk clients using the new emitter.
-- name: ShouldRegenrate
+- name: ShouldRegenerate
   type: boolean
   default: false
 
@@ -210,7 +210,7 @@ extends:
 
     # Regenerate stage
     # Responsible for regenerating the SDK code using the emitter package and the generation matrix.
-    - ${{ if and(parameters.ShouldPublish, parameters.ShouldRegenrate) }}:
+    - ${{ if and(parameters.ShouldPublish, parameters.ShouldRegenerate) }}:
       - stage: Regenerate
         dependsOn:
         - Build

eng/common/pipelines/templates/steps/create-apireview.yml

@@ -23,14 +23,14 @@ steps:
         filePath: ${{ parameters.SourceRootPath }}/eng/common/scripts/Create-APIReview.ps1
         arguments: >
           -ArtifactList ('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object Name)
-          -ArtifactPath ${{parameters.ArtifactPath}}
+          -ArtifactPath '${{parameters.ArtifactPath}}'
           -ArtifactName ${{ parameters.ArtifactName }}
-          -APIKey $(azuresdk-apiview-apikey)
+          -APIKey '$(azuresdk-apiview-apikey)'
           -PackageName '${{parameters.PackageName}}'
-          -SourceBranch $(Build.SourceBranchName)
-          -DefaultBranch $(DefaultBranch)
+          -SourceBranch '$(Build.SourceBranchName)'
+          -DefaultBranch '$(DefaultBranch)'
           -ConfigFileDir '${{parameters.ConfigFileDir}}'
-          -BuildId $(Build.BuildId)
+          -BuildId '$(Build.BuildId)'
           -RepoName '$(Build.Repository.Name)'    
           -MarkPackageAsShipped $${{parameters.MarkPackageAsShipped}}
         pwsh: true