Allow an additional retry for IMDS managed identity requests (#24860)

chlowell · web-flow · commit f2db0f0f2aa8 · 2025-07-02T12:38:16.000-07:00
diff --git a/sdk/azidentity/CHANGELOG.md b/sdk/azidentity/CHANGELOG.md
@@ -13,6 +13,8 @@
 ### Bugs Fixed
 
 ### Other Changes
+- By default, `ManagedIdentityCredential` retries IMDS requests for a maximum of ~70 seconds as recommended
+  in IMDS documentation. In previous versions, it would stop retrying after ~54 seconds by default.
 
 ## 1.10.1 (2025-06-10)
 
diff --git a/sdk/azidentity/managed_identity_client.go b/sdk/azidentity/managed_identity_client.go
@@ -54,10 +54,10 @@ type managedIdentityClient struct {
 // setIMDSRetryOptionDefaults sets zero-valued fields to default values appropriate for IMDS
 func setIMDSRetryOptionDefaults(o *policy.RetryOptions) {
 	if o.MaxRetries == 0 {
-		o.MaxRetries = 5
+		o.MaxRetries = 6
 	}
 	if o.MaxRetryDelay == 0 {
-		o.MaxRetryDelay = 1 * time.Minute
+		o.MaxRetryDelay = 25 * time.Second
 	}
 	if o.RetryDelay == 0 {
 		o.RetryDelay = 2 * time.Second

Original file line number	Diff line number	Diff line change
`@@ -54,10 +54,10 @@ type managedIdentityClient struct {`
`54`	`54`	`// setIMDSRetryOptionDefaults sets zero-valued fields to default values appropriate for IMDS`
`55`	`55`	`func setIMDSRetryOptionDefaults(o *policy.RetryOptions) {`
`56`	`56`	`if o.MaxRetries == 0 {`
`57`		`- o.MaxRetries = 5`
	`57`	`+ o.MaxRetries = 6`
`58`	`58`	`}`
`59`	`59`	`if o.MaxRetryDelay == 0 {`
`60`		`- o.MaxRetryDelay = 1 * time.Minute`
	`60`	`+ o.MaxRetryDelay = 25 * time.Second`
`61`	`61`	`}`
`62`	`62`	`if o.RetryDelay == 0 {`
`63`	`63`	`o.RetryDelay = 2 * time.Second`