Merge branch 'main' into addThroughputBucketSupport

Author: annie-mac

.github/CODEOWNERS

@@ -15,8 +15,8 @@
 ###########
 
 # Catch all
-/**                                                  @joshfree @srnagar @anuchandy @conniey @lmolkova @jonathangiles
-/sdk/                                                @joshfree @srnagar @anuchandy @conniey @lmolkova @jonathangiles
+/**                                                  @Azure/azure-java-sdk
+/sdk/                                                @Azure/azure-java-sdk
 
 # BOM
 
@@ -321,6 +321,12 @@
 # ServiceLabel: %Compute - VMSS
 # ServiceOwners:                                     @Drewm3 @avirishuv
 
+# PRLabel: %Confidential Ledger
+/sdk/confidentialledger/                             @amruthashree18 @musabbir
+
+# ServiceLabel: %Confidential Ledger
+# ServiceOwners:                                     @amruthashree18 @musabbir
+
 # ServiceLabel: %Connected Kubernetes
 # ServiceOwners:                                     @akashkeshari
 

.github/workflows/copilot-setup-steps.yml

@@ -0,0 +1,20 @@
+name: Copilot Setup Steps
+
+on: workflow_dispatch
+
+jobs:
+  copilot-setup-steps:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install azsdk mcp server
+        shell: pwsh
+        run: |
+          ./eng/common/mcp/azure-sdk-mcp.ps1 -InstallDirectory $HOME/bin
+

eng/common/mcp/azure-sdk-mcp.ps1

@@ -1,4 +1,7 @@
-#!/bin/env pwsh
+#!/usr/bin/env pwsh
+
+#Requires -Version 7.0
+#Requires -PSEdition Core
 
 param(
     [string]$FileName = 'Azure.Sdk.Tools.Cli',
@@ -9,21 +12,13 @@ param(
     [string]$RunDirectory = (Resolve-Path (Join-Path $PSScriptRoot .. .. ..)),
     [switch]$Run,
     [switch]$UpdateVsCodeConfig,
-    [switch]$Clean
+    [switch]$UpdatePathInProfile
 )
 
 $ErrorActionPreference = "Stop"
-
-if (-not $InstallDirectory)
-{
-    $homeDir = if ($env:HOME) { $env:HOME } else { $env:USERPROFILE }
-    $InstallDirectory = (Join-Path $homeDir ".azure-sdk-mcp" "azsdk")
-}
 . (Join-Path $PSScriptRoot '..' 'scripts' 'Helpers' 'AzSdkTool-Helpers.ps1')
 
-if ($Clean) {
-    Clear-Directory -Path $InstallDirectory
-}
+$toolInstallDirectory = $InstallDirectory ? $InstallDirectory : (Get-CommonInstallDirectory)
 
 if ($UpdateVsCodeConfig) {
     $vscodeConfigPath = Join-Path $PSScriptRoot ".." ".." ".." ".vscode" "mcp.json"
@@ -54,13 +49,33 @@ if ($UpdateVsCodeConfig) {
     $vscodeConfig | ConvertTo-Json -Depth 10 | Set-Content -Path $vscodeConfigPath -Force
 }
 
-$exe = Install-Standalone-Tool `
+# Install to a temp directory first so we don't dump out all the other
+# release zip contents to one of the users bin directories.
+$tmp = $env:TEMP ? $env:TEMP : [System.IO.Path]::GetTempPath()
+$guid = [System.Guid]::NewGuid()
+$tempInstallDirectory = Join-Path $tmp "azsdk-install-$($guid)"
+$tempExe = Install-Standalone-Tool `
     -Version $Version `
     -FileName $FileName `
     -Package $Package `
-    -Directory $InstallDirectory `
+    -Directory $tempInstallDirectory `
     -Repository $Repository
 
+if (-not (Test-Path $toolInstallDirectory)) {
+    New-Item -ItemType Directory -Path $toolInstallDirectory -Force | Out-Null
+}
+$exeName = Split-Path $tempExe -Leaf
+$exeDestination = Join-Path $toolInstallDirectory $exeName
+Copy-Item -Path $tempExe -Destination $exeDestination -Force
+
+Write-Host "Package $package is installed at $exeDestination"
+if (!$UpdatePathInProfile) {
+    Write-Warning "To add the tool to PATH for new shell sessions, re-run with -UpdatePathInProfile to modify the shell profile file."
+} else {
+    Add-InstallDirectoryToPathInProfile -InstallDirectory $toolInstallDirectory
+    Write-Warning "'$exeName' will be available in PATH for new shell sessions."
+}
+
 if ($Run) {
-    Start-Process -WorkingDirectory $RunDirectory -FilePath $exe -ArgumentList 'start' -NoNewWindow -Wait
+    Start-Process -WorkingDirectory $RunDirectory -FilePath $exeDestination -ArgumentList 'start' -NoNewWindow -Wait
 }

eng/common/scripts/Helpers/AzSdkTool-Helpers.ps1

@@ -192,3 +192,61 @@ function Install-Standalone-Tool (
 
     return $executable_path
 }
+
+function Get-CommonInstallDirectory {
+    $installDirectory = Join-Path $HOME "bin"
+    if (-not (Test-Path $installDirectory)) {
+        New-Item -ItemType Directory -Path $installDirectory -Force | Out-Null
+    }
+
+    # Update PATH in current session
+    if (-not ($env:PATH -like "*$InstallDirectory*")) {
+        $env:PATH += ";$InstallDirectory"
+    }
+
+    return $installDirectory
+}
+
+function Add-InstallDirectoryToPathInProfile(
+    [Parameter()]
+    [string]$InstallDirectory = (Get-CommonInstallDirectory)
+) {
+    $powershellProfilePath = $PROFILE
+    $bashrcPath = Join-Path $HOME ".bashrc"
+    $zshrcPath = Join-Path $HOME ".zshrc"
+    $markerComment = "  # azsdk install path"
+    $pathCommand = ""
+    $configFile = ""
+
+    if ($IsWindows) {  # expect powershell for windows, cmd.exe path update is not currently supported
+        $configFile = $powershellProfilePath
+        $pathCommand = "if (-not (`$env:PATH -like `'*$InstallDirectory*`')) { `$env:PATH += ';$InstallDirectory`' }" + $markerComment
+    }
+    elseif ($IsLinux) {  # handle bash or zsh shells for linux
+        if (Test-Path $zshrcPath) {
+            $configFile = $zshrcPath
+        }
+        else {
+            $configFile = $bashrcPath
+        }
+        $pathCommand = "export PATH=`"`$PATH:$InstallDirectory`"" + $markerComment
+    }
+    elseif ($IsMacOS) {  # mac os should use zsh by default
+        $configFile = $zshrcPath
+        $pathCommand = "export PATH=`"`$PATH:$InstallDirectory`"" + $markerComment
+    }
+    else {
+        throw "Unsupported platform"
+    }
+
+    if (-not (Test-Path $configFile)) {
+        New-Item -ItemType File -Path $configFile -Force | Out-Null
+    }
+
+    $configContent = Get-Content $configFile -Raw
+
+    if (!$configContent -or !$configContent.Contains($markerComment)) {
+        Write-Host "Adding installation to PATH in shell profile at '$configFile'"
+        Add-Content -Path $configFile -Value ([Environment]::NewLine + $pathCommand)
+    }
+}

eng/versioning/external_dependencies.txt

@@ -317,29 +317,29 @@ storage_com.microsoft.azure:azure-storage;8.6.6
 
 # sdk\spring\pom.xml modules
 springboot3_com.diffplug.spotless:spotless-maven-plugin;2.30.0
-springboot3_com.fasterxml.jackson.core:jackson-annotations;2.19.1
-springboot3_com.fasterxml.jackson.core:jackson-core;2.19.1
-springboot3_com.fasterxml.jackson.core:jackson-databind;2.19.1
-springboot3_com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.19.1
-springboot3_com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.19.1
-springboot3_com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.19.1
-springboot3_com.fasterxml.jackson.module:jackson-module-afterburner;2.19.1
-springboot3_com.fasterxml.jackson.module:jackson-module-parameter-names;2.19.1
+springboot3_com.fasterxml.jackson.core:jackson-annotations;2.19.2
+springboot3_com.fasterxml.jackson.core:jackson-core;2.19.2
+springboot3_com.fasterxml.jackson.core:jackson-databind;2.19.2
+springboot3_com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.19.2
+springboot3_com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.19.2
+springboot3_com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.19.2
+springboot3_com.fasterxml.jackson.module:jackson-module-afterburner;2.19.2
+springboot3_com.fasterxml.jackson.module:jackson-module-parameter-names;2.19.2
 springboot3_com.github.spotbugs:spotbugs-maven-plugin;4.8.2.0
 springboot3_com.google.code.findbugs:jsr305;3.0.2
-springboot3_com.mysql:mysql-connector-j;9.2.0
+springboot3_com.mysql:mysql-connector-j;9.3.0
 springboot3_com.nimbusds:nimbus-jose-jwt;9.37.3
 springboot3_io.lettuce:lettuce-core;6.6.0.RELEASE
-springboot3_io.micrometer:micrometer-core;1.15.1
-springboot3_io.netty:netty-buffer;4.1.122.Final
-springboot3_io.netty:netty-codec-http;4.1.122.Final
-springboot3_io.netty:netty-common;4.1.122.Final
-springboot3_io.netty:netty-handler;4.1.122.Final
-springboot3_io.netty:netty-transport-native-epoll;4.1.122.Final
-springboot3_io.netty:netty-transport-native-kqueue;4.1.122.Final
-springboot3_io.netty:netty-transport;4.1.122.Final
-springboot3_io.projectreactor.netty:reactor-netty;1.2.7
-springboot3_io.projectreactor:reactor-test;3.7.7
+springboot3_io.micrometer:micrometer-core;1.15.2
+springboot3_io.netty:netty-buffer;4.1.123.Final
+springboot3_io.netty:netty-codec-http;4.1.123.Final
+springboot3_io.netty:netty-common;4.1.123.Final
+springboot3_io.netty:netty-handler;4.1.123.Final
+springboot3_io.netty:netty-transport-native-epoll;4.1.123.Final
+springboot3_io.netty:netty-transport-native-kqueue;4.1.123.Final
+springboot3_io.netty:netty-transport;4.1.123.Final
+springboot3_io.projectreactor.netty:reactor-netty;1.2.8
+springboot3_io.projectreactor:reactor-test;3.7.8
 springboot3_jakarta.servlet:jakarta.servlet-api;6.0.0
 springboot3_jakarta.validation:jakarta.validation-api;3.0.2
 springboot3_javax.annotation:javax.annotation-api;1.3.2
@@ -366,54 +366,54 @@ springboot3_org.postgresql:postgresql;42.7.7
 springboot3_org.revapi:revapi-maven-plugin;0.14.6
 springboot3_org.slf4j:slf4j-api;2.0.17
 springboot3_org.slf4j:slf4j-simple;2.0.17
-springboot3_org.springframework.boot:spring-boot-actuator-autoconfigure;3.5.3
-springboot3_org.springframework.boot:spring-boot-actuator;3.5.3
-springboot3_org.springframework.boot:spring-boot-autoconfigure;3.5.3
-springboot3_org.springframework.boot:spring-boot-configuration-metadata;3.5.3
-springboot3_org.springframework.boot:spring-boot-configuration-processor;3.5.3
-springboot3_org.springframework.boot:spring-boot-docker-compose;3.5.3
-springboot3_org.springframework.boot:spring-boot-starter-actuator;3.5.3
-springboot3_org.springframework.boot:spring-boot-starter-data-jdbc;3.5.3
-springboot3_org.springframework.boot:spring-boot-starter-integration;3.5.3
-springboot3_org.springframework.boot:spring-boot-starter-parent;3.5.3
-springboot3_org.springframework.boot:spring-boot-starter-test;3.5.3
-springboot3_org.springframework.boot:spring-boot-starter-web;3.5.3
-springboot3_org.springframework.boot:spring-boot-starter;3.5.3
-springboot3_org.springframework.boot:spring-boot-test;3.5.3
-springboot3_org.springframework.boot:spring-boot-testcontainers;3.5.3
+springboot3_org.springframework.boot:spring-boot-actuator-autoconfigure;3.5.4
+springboot3_org.springframework.boot:spring-boot-actuator;3.5.4
+springboot3_org.springframework.boot:spring-boot-autoconfigure;3.5.4
+springboot3_org.springframework.boot:spring-boot-configuration-metadata;3.5.4
+springboot3_org.springframework.boot:spring-boot-configuration-processor;3.5.4
+springboot3_org.springframework.boot:spring-boot-docker-compose;3.5.4
+springboot3_org.springframework.boot:spring-boot-starter-actuator;3.5.4
+springboot3_org.springframework.boot:spring-boot-starter-data-jdbc;3.5.4
+springboot3_org.springframework.boot:spring-boot-starter-integration;3.5.4
+springboot3_org.springframework.boot:spring-boot-starter-parent;3.5.4
+springboot3_org.springframework.boot:spring-boot-starter-test;3.5.4
+springboot3_org.springframework.boot:spring-boot-starter-web;3.5.4
+springboot3_org.springframework.boot:spring-boot-starter;3.5.4
+springboot3_org.springframework.boot:spring-boot-test;3.5.4
+springboot3_org.springframework.boot:spring-boot-testcontainers;3.5.4
 springboot3_org.springframework.cloud:spring-cloud-bus;4.3.0
 springboot3_org.springframework.cloud:spring-cloud-context;4.3.0
 springboot3_org.springframework.cloud:spring-cloud-starter-bootstrap;4.3.0
 springboot3_org.springframework.cloud:spring-cloud-starter-stream-kafka;4.3.0
 springboot3_org.springframework.cloud:spring-cloud-stream-test-binder;4.3.0
 springboot3_org.springframework.cloud:spring-cloud-stream;4.3.0
-springboot3_org.springframework.data:spring-data-commons;3.5.1
-springboot3_org.springframework.data:spring-data-redis;3.5.1
-springboot3_org.springframework.integration:spring-integration-core;6.5.0
-springboot3_org.springframework.kafka:spring-kafka;3.3.7
+springboot3_org.springframework.data:spring-data-commons;3.5.2
+springboot3_org.springframework.data:spring-data-redis;3.5.2
+springboot3_org.springframework.integration:spring-integration-core;6.5.1
+springboot3_org.springframework.kafka:spring-kafka;3.3.8
 springboot3_org.springframework.retry:spring-retry;2.0.12
-springboot3_org.springframework.security:spring-security-config;6.5.1
-springboot3_org.springframework.security:spring-security-oauth2-client;6.5.1
-springboot3_org.springframework.security:spring-security-oauth2-jose;6.5.1
-springboot3_org.springframework.security:spring-security-oauth2-resource-server;6.5.1
-springboot3_org.springframework.security:spring-security-web;6.5.1
-springboot3_org.springframework:spring-beans;6.2.8
-springboot3_org.springframework:spring-context-support;6.2.8
-springboot3_org.springframework:spring-context;6.2.8
-springboot3_org.springframework:spring-core-test;6.2.8
-springboot3_org.springframework:spring-core;6.2.8
-springboot3_org.springframework:spring-expression;6.2.8
-springboot3_org.springframework:spring-jdbc;6.2.8
-springboot3_org.springframework:spring-jms;6.2.8
-springboot3_org.springframework:spring-messaging;6.2.8
-springboot3_org.springframework:spring-test;6.2.8
-springboot3_org.springframework:spring-tx;6.2.8
-springboot3_org.springframework:spring-web;6.2.8
-springboot3_org.springframework:spring-webmvc;6.2.8
-springboot3_org.testcontainers:junit-jupiter;1.21.2
-springboot3_org.testcontainers:azure;1.21.2
+springboot3_org.springframework.security:spring-security-config;6.5.2
+springboot3_org.springframework.security:spring-security-oauth2-client;6.5.2
+springboot3_org.springframework.security:spring-security-oauth2-jose;6.5.2
+springboot3_org.springframework.security:spring-security-oauth2-resource-server;6.5.2
+springboot3_org.springframework.security:spring-security-web;6.5.2
+springboot3_org.springframework:spring-beans;6.2.9
+springboot3_org.springframework:spring-context-support;6.2.9
+springboot3_org.springframework:spring-context;6.2.9
+springboot3_org.springframework:spring-core-test;6.2.9
+springboot3_org.springframework:spring-core;6.2.9
+springboot3_org.springframework:spring-expression;6.2.9
+springboot3_org.springframework:spring-jdbc;6.2.9
+springboot3_org.springframework:spring-jms;6.2.9
+springboot3_org.springframework:spring-messaging;6.2.9
+springboot3_org.springframework:spring-test;6.2.9
+springboot3_org.springframework:spring-tx;6.2.9
+springboot3_org.springframework:spring-web;6.2.9
+springboot3_org.springframework:spring-webmvc;6.2.9
+springboot3_org.testcontainers:junit-jupiter;1.21.3
+springboot3_org.testcontainers:azure;1.21.3
 # Used for Spring version updates
-springboot3_org.springframework.boot:spring-boot-dependencies;3.5.3
+springboot3_org.springframework.boot:spring-boot-dependencies;3.5.4
 springboot3_org.springframework.cloud:spring-cloud-dependencies;2025.0.0
 
 # Java 7 support