Skip to content

Commit fa86806

Browse files
authored
Upgrade azidentity dependencies (#25192)
1 parent feb6e13 commit fa86806

File tree

7 files changed

+99
-148
lines changed

7 files changed

+99
-148
lines changed

sdk/azidentity/cache/go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ go 1.23.0
55
retract v0.1.0
66

77
require (
8-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.2
9-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1
8+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.0
9+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.11.0
1010
github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1
11-
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2
11+
github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0
1212
github.com/google/uuid v1.6.0
13-
github.com/stretchr/testify v1.10.0
14-
golang.org/x/sys v0.34.0
13+
github.com/stretchr/testify v1.11.1
14+
golang.org/x/sys v0.35.0
1515
)
1616

1717
require (
@@ -22,8 +22,8 @@ require (
2222
github.com/kylelemons/godebug v1.1.0 // indirect
2323
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
2424
github.com/pmezard/go-difflib v1.0.0 // indirect
25-
golang.org/x/crypto v0.40.0 // indirect
26-
golang.org/x/net v0.42.0 // indirect
27-
golang.org/x/text v0.27.0 // indirect
25+
golang.org/x/crypto v0.41.0 // indirect
26+
golang.org/x/net v0.43.0 // indirect
27+
golang.org/x/text v0.28.0 // indirect
2828
gopkg.in/yaml.v3 v3.0.1 // indirect
2929
)

sdk/azidentity/cache/go.sum

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
1-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.2 h1:Hr5FTipp7SL07o2FvoVOX9HRiRH3CR3Mj8pxqCcdD5A=
2-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.2/go.mod h1:QyVsSSN64v5TGltphKLQ2sQxe4OBQg0J1eKRcVBnfgE=
3-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1 h1:B+blDbyVIG3WaikNxPnhPiJ1MThR03b3vKGtER95TP4=
4-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1/go.mod h1:JdM5psgjfBf5fo2uWOZhflPWyDBZ/O/CNAH9CtsuZE4=
1+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.0 h1:ci6Yd6nysBRLEodoziB6ah1+YOzZbZk+NYneoA6q+6E=
2+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.0/go.mod h1:QyVsSSN64v5TGltphKLQ2sQxe4OBQg0J1eKRcVBnfgE=
3+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.11.0 h1:MhRfI58HblXzCtWEZCO0feHs8LweePB3s90r7WaR1KU=
4+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.11.0/go.mod h1:okZ+ZURbArNdlJ+ptXoyHNuOETzOl1Oww19rm8I2WLA=
55
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 h1:9iefClla7iYpfYWdzPCRDozdmndjTm8DXdpCzPajMgA=
66
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2/go.mod h1:XtLgD3ZD34DAaVIIAyG3objl5DynM3CQ/vMcbBNJZGI=
77
github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1 h1:WJTmL004Abzc5wDB5VtZG2PJk5ndYDgVacGqfirKxjM=
88
github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1/go.mod h1:tCcJZ0uHAmvjsVYzEFivsRTN00oz5BEsRgQHu5JZ9WE=
9-
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 h1:oygO0locgZJe7PpYPXT5A29ZkwJaPqcva7BVeemZOZs=
10-
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
11-
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
12-
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
9+
github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0 h1:XkkQbfMyuH2jTSjQjSoihryI8GINRcs4xp8lNawg0FI=
10+
github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0/go.mod h1:HKpQxkWaGLJ+D/5H8QRpyQXA1eKjxkFlOMwck5+33Jk=
1311
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
1412
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
15-
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
16-
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
1713
github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
1814
github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
1915
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
@@ -30,21 +26,19 @@ github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmd
3026
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
3127
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
3228
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
33-
github.com/redis/go-redis/v9 v9.8.0 h1:q3nRvjrlge/6UD7eTu/DSg2uYiU2mCL0G/uzBWqhicI=
34-
github.com/redis/go-redis/v9 v9.8.0/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw=
3529
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
3630
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
37-
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
38-
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
39-
golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
40-
golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
41-
golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
42-
golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
31+
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
32+
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
33+
golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
34+
golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
35+
golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
36+
golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
4337
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
44-
golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
45-
golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
46-
golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
47-
golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
38+
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
39+
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
40+
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
41+
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
4842
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
4943
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
5044
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

sdk/azidentity/go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ module github.com/Azure/azure-sdk-for-go/sdk/azidentity
33
go 1.23.0
44

55
require (
6-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.2
6+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.0
77
github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2
88
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2
9-
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2
9+
github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0
1010
github.com/golang-jwt/jwt/v5 v5.3.0
1111
github.com/google/uuid v1.6.0
12-
github.com/stretchr/testify v1.10.0
13-
golang.org/x/crypto v0.40.0
12+
github.com/stretchr/testify v1.11.1
13+
golang.org/x/crypto v0.41.0
1414
)
1515

1616
require (
@@ -20,8 +20,8 @@ require (
2020
github.com/kylelemons/godebug v1.1.0 // indirect
2121
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
2222
github.com/pmezard/go-difflib v1.0.0 // indirect
23-
golang.org/x/net v0.42.0 // indirect
24-
golang.org/x/sys v0.34.0 // indirect
25-
golang.org/x/text v0.27.0 // indirect
23+
golang.org/x/net v0.43.0 // indirect
24+
golang.org/x/sys v0.35.0 // indirect
25+
golang.org/x/text v0.28.0 // indirect
2626
gopkg.in/yaml.v3 v3.0.1 // indirect
2727
)

sdk/azidentity/go.sum

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.2 h1:Hr5FTipp7SL07o2FvoVOX9HRiRH3CR3Mj8pxqCcdD5A=
2-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.2/go.mod h1:QyVsSSN64v5TGltphKLQ2sQxe4OBQg0J1eKRcVBnfgE=
1+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.0 h1:ci6Yd6nysBRLEodoziB6ah1+YOzZbZk+NYneoA6q+6E=
2+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.0/go.mod h1:QyVsSSN64v5TGltphKLQ2sQxe4OBQg0J1eKRcVBnfgE=
33
github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2 h1:yz1bePFlP5Vws5+8ez6T3HWXPmwOK7Yvq8QxDBD3SKY=
44
github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2/go.mod h1:Pa9ZNPuoNu/GztvBSKk9J1cDJW6vk/n0zLtV4mgd8N8=
55
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 h1:9iefClla7iYpfYWdzPCRDozdmndjTm8DXdpCzPajMgA=
66
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2/go.mod h1:XtLgD3ZD34DAaVIIAyG3objl5DynM3CQ/vMcbBNJZGI=
77
github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1 h1:WJTmL004Abzc5wDB5VtZG2PJk5ndYDgVacGqfirKxjM=
88
github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1/go.mod h1:tCcJZ0uHAmvjsVYzEFivsRTN00oz5BEsRgQHu5JZ9WE=
9-
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 h1:oygO0locgZJe7PpYPXT5A29ZkwJaPqcva7BVeemZOZs=
10-
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
9+
github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0 h1:XkkQbfMyuH2jTSjQjSoihryI8GINRcs4xp8lNawg0FI=
10+
github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0/go.mod h1:HKpQxkWaGLJ+D/5H8QRpyQXA1eKjxkFlOMwck5+33Jk=
1111
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
1212
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1313
github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
@@ -28,17 +28,17 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
2828
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
2929
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
3030
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
31-
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
32-
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
33-
golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
34-
golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
35-
golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
36-
golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
31+
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
32+
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
33+
golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
34+
golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
35+
golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
36+
golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
3737
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
38-
golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
39-
golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
40-
golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
41-
golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
38+
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
39+
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
40+
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
41+
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
4242
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
4343
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
4444
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

sdk/azidentity/mock_test.go

Lines changed: 35 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"fmt"
1212
"io"
1313
"net/http"
14+
"net/url"
1415
"strings"
1516
)
1617

@@ -41,9 +42,17 @@ func (m *mockSTS) Do(req *http.Request) (*http.Response, error) {
4142
}
4243
switch s := strings.Split(req.URL.Path, "/"); s[len(s)-1] {
4344
case "instance":
44-
res.Body = io.NopCloser(bytes.NewReader(instanceMetadata(tenant)))
45+
host := req.URL.Host
46+
if ae := req.URL.Query().Get("authorization_endpoint"); ae != "" {
47+
u, err := url.Parse(ae)
48+
if err != nil {
49+
return nil, fmt.Errorf("mockSTS failed to parse an authorization_endpoint query parameter: %w", err)
50+
}
51+
host = u.Host
52+
}
53+
res.Body = io.NopCloser(bytes.NewReader(instanceMetadata(host, tenant)))
4554
case "openid-configuration":
46-
res.Body = io.NopCloser(bytes.NewReader(tenantMetadata(tenant)))
55+
res.Body = io.NopCloser(bytes.NewReader(tenantMetadata(req.URL.Host, tenant)))
4756
case "devicecode":
4857
res.Body = io.NopCloser(strings.NewReader(`{"device_code":"...","expires_in":600,"interval":60}`))
4958
case "token":
@@ -53,7 +62,7 @@ func (m *mockSTS) Do(req *http.Request) (*http.Response, error) {
5362
if grant := req.FormValue("grant_type"); grant == "device_code" || grant == "password" {
5463
// include account info because we're authenticating a user
5564
res.Body = io.NopCloser(bytes.NewReader(
56-
[]byte(fmt.Sprintf(`{"access_token":%q,"expires_in": 3600,"refresh_token":"rt","client_info":%q,"id_token":%q,"token_type":"Bearer"}`, tokenValue, mockClientInfo, mockIDT)),
65+
fmt.Appendf(nil, `{"access_token":%q,"expires_in": 3600,"refresh_token":"rt","client_info":%q,"id_token":%q,"token_type":"Bearer"}`, tokenValue, mockClientInfo, mockIDT),
5766
))
5867
} else {
5968
res.Body = io.NopCloser(bytes.NewReader(accessTokenRespSuccess))
@@ -77,91 +86,29 @@ func (m *mockSTS) Do(req *http.Request) (*http.Response, error) {
7786
return res, nil
7887
}
7988

80-
func instanceMetadata(tenant string) []byte {
81-
return []byte(strings.ReplaceAll(`{
82-
"tenant_discovery_endpoint": "https://login.microsoftonline.com/{tenant}/v2.0/.well-known/openid-configuration",
83-
"api-version": "1.1",
84-
"metadata": [
85-
{
86-
"preferred_network": "login.microsoftonline.com",
87-
"preferred_cache": "login.windows.net",
88-
"aliases": [
89-
"login.microsoftonline.com",
90-
"login.windows.net",
91-
"login.microsoft.com",
92-
"sts.windows.net"
93-
]
94-
}
95-
]
96-
}`, "{tenant}", tenant))
89+
func instanceMetadata(host, tenant string) []byte {
90+
tmpl := `{
91+
"tenant_discovery_endpoint": "https://{host}/{tenant}/v2.0/.well-known/openid-configuration",
92+
"api-version": "1.1",
93+
"metadata": [
94+
{
95+
"preferred_network": "{host}",
96+
"preferred_cache": "{host}",
97+
"aliases": ["{host}"]
98+
}
99+
]
100+
}`
101+
r := strings.NewReplacer("{host}", host, "{tenant}", tenant)
102+
return []byte(r.Replace(tmpl))
97103
}
98104

99-
func tenantMetadata(tenant string) []byte {
100-
return []byte(strings.ReplaceAll(`{
101-
"token_endpoint": "https://login.microsoftonline.com/{tenant}/oauth2/v2.0/token",
102-
"token_endpoint_auth_methods_supported": [
103-
"client_secret_post",
104-
"private_key_jwt",
105-
"client_secret_basic"
106-
],
107-
"jwks_uri": "https://login.microsoftonline.com/{tenant}/discovery/v2.0/keys",
108-
"response_modes_supported": [
109-
"query",
110-
"fragment",
111-
"form_post"
112-
],
113-
"subject_types_supported": [
114-
"pairwise"
115-
],
116-
"id_token_signing_alg_values_supported": [
117-
"RS256"
118-
],
119-
"response_types_supported": [
120-
"code",
121-
"id_token",
122-
"code id_token",
123-
"id_token token"
124-
],
125-
"scopes_supported": [
126-
"openid",
127-
"profile",
128-
"email",
129-
"offline_access"
130-
],
131-
"issuer": "https://login.microsoftonline.com/{tenant}/v2.0",
132-
"request_uri_parameter_supported": false,
133-
"userinfo_endpoint": "https://graph.microsoft.com/oidc/userinfo",
134-
"authorization_endpoint": "https://login.microsoftonline.com/{tenant}/oauth2/v2.0/authorize",
135-
"device_authorization_endpoint": "https://login.microsoftonline.com/{tenant}/oauth2/v2.0/devicecode",
136-
"http_logout_supported": true,
137-
"frontchannel_logout_supported": true,
138-
"end_session_endpoint": "https://login.microsoftonline.com/{tenant}/oauth2/v2.0/logout",
139-
"claims_supported": [
140-
"sub",
141-
"iss",
142-
"cloud_instance_name",
143-
"cloud_instance_host_name",
144-
"cloud_graph_host_name",
145-
"msgraph_host",
146-
"aud",
147-
"exp",
148-
"iat",
149-
"auth_time",
150-
"acr",
151-
"nonce",
152-
"preferred_username",
153-
"name",
154-
"tid",
155-
"ver",
156-
"at_hash",
157-
"c_hash",
158-
"email"
159-
],
160-
"kerberos_endpoint": "https://login.microsoftonline.com/{tenant}/kerberos",
161-
"tenant_region_scope": "NA",
162-
"cloud_instance_name": "microsoftonline.com",
163-
"cloud_graph_host_name": "graph.windows.net",
164-
"msgraph_host": "graph.microsoft.com",
165-
"rbac_url": "https://pas.windows.net"
166-
}`, "{tenant}", tenant))
105+
func tenantMetadata(host, tenant string) []byte {
106+
// real metadata has many more fields; these are the only ones MSAL uses
107+
tmpl := `{
108+
"token_endpoint": "{base}/oauth2/v2.0/token",
109+
"issuer": "{base}/v2.0",
110+
"authorization_endpoint": "{base}/oauth2/v2.0/authorize",
111+
"device_authorization_endpoint": "{base}/oauth2/v2.0/devicecode"
112+
}`
113+
return []byte(strings.ReplaceAll(tmpl, "{base}", "https://"+host+"/"+tenant))
167114
}

sdk/azidentity/testdata/managed-id-test/go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/Azure/azure-sdk-for-go/sdk/azidentity/testdata/managed-id-test
33
go 1.23.0
44

55
require (
6-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.2
7-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1
6+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.0
7+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.11.0
88
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.2
99
)
1010

@@ -13,13 +13,13 @@ replace github.com/Azure/azure-sdk-for-go/sdk/azidentity => ../../
1313

1414
require (
1515
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
16-
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
16+
github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0 // indirect
1717
github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
1818
github.com/google/uuid v1.6.0 // indirect
1919
github.com/kylelemons/godebug v1.1.0 // indirect
2020
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
21-
golang.org/x/crypto v0.40.0 // indirect
22-
golang.org/x/net v0.42.0 // indirect
23-
golang.org/x/sys v0.34.0 // indirect
24-
golang.org/x/text v0.27.0 // indirect
21+
golang.org/x/crypto v0.41.0 // indirect
22+
golang.org/x/net v0.43.0 // indirect
23+
golang.org/x/sys v0.35.0 // indirect
24+
golang.org/x/text v0.28.0 // indirect
2525
)

0 commit comments

Comments
 (0)